From 4485800e2118f8bc1424bdf67d2200eb5f0056ac Mon Sep 17 00:00:00 2001
From: Daniel Vaz Gaspar <danielvazgaspar@gmail.com>
Date: Wed, 8 Apr 2020 08:44:35 +0100
Subject: [PATCH] [tests] refactor, change datasets and charts to it's own
 folder (#9487)

---
 tests/charts/__init__.py                         | 16 ++++++++++++++++
 .../{chart_api_tests.py => charts/api_tests.py}  |  8 ++++----
 tests/datasets/__init__.py                       | 16 ++++++++++++++++
 .../api_tests.py}                                |  2 +-
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 tests/charts/__init__.py
 rename tests/{chart_api_tests.py => charts/api_tests.py} (99%)
 create mode 100644 tests/datasets/__init__.py
 rename tests/{dataset_api_tests.py => datasets/api_tests.py} (99%)

diff --git a/tests/charts/__init__.py b/tests/charts/__init__.py
new file mode 100644
index 0000000000000..13a83393a9124
--- /dev/null
+++ b/tests/charts/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/tests/chart_api_tests.py b/tests/charts/api_tests.py
similarity index 99%
rename from tests/chart_api_tests.py
rename to tests/charts/api_tests.py
index e14183fbb9672..d885e0b8321d1 100644
--- a/tests/chart_api_tests.py
+++ b/tests/charts/api_tests.py
@@ -21,13 +21,13 @@
 import prison
 from sqlalchemy.sql import func
 
-from superset import db, security_manager
+import tests.test_app
 from superset.connectors.connector_registry import ConnectorRegistry
+from superset.extensions import db, security_manager
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
-
-from .base_api_tests import ApiOwnersTestCaseMixin
-from .base_tests import SupersetTestCase
+from tests.base_api_tests import ApiOwnersTestCaseMixin
+from tests.base_tests import SupersetTestCase
 
 
 class ChartApiTests(SupersetTestCase, ApiOwnersTestCaseMixin):
diff --git a/tests/datasets/__init__.py b/tests/datasets/__init__.py
new file mode 100644
index 0000000000000..13a83393a9124
--- /dev/null
+++ b/tests/datasets/__init__.py
@@ -0,0 +1,16 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
diff --git a/tests/dataset_api_tests.py b/tests/datasets/api_tests.py
similarity index 99%
rename from tests/dataset_api_tests.py
rename to tests/datasets/api_tests.py
index 77e056680c8aa..c1c3ddf5aa705 100644
--- a/tests/dataset_api_tests.py
+++ b/tests/datasets/api_tests.py
@@ -23,13 +23,13 @@
 import yaml
 from sqlalchemy.sql import func
 
-from superset import db, security_manager
 from superset.connectors.sqla.models import SqlaTable, SqlMetric, TableColumn
 from superset.dao.exceptions import (
     DAOCreateFailedError,
     DAODeleteFailedError,
     DAOUpdateFailedError,
 )
+from superset.extensions import db, security_manager
 from superset.models.core import Database
 from superset.utils.core import get_example_database
 from superset.utils.dict_import_export import export_to_dict