Refactor tests to common parent folder to better code sharing (#2160)

elyra-ai · Sep 30, 2021 · 9c6e8d9 · 9c6e8d9
1 parent b296405
commit 9c6e8d9
Show file tree

Hide file tree

Showing 109 changed files with 116 additions and 265 deletions.
diff --git a/elyra/metadata/schemas/metadata-test.json b/elyra/metadata/schemas/metadata-test.json
@@ -4,8 +4,8 @@
   "name": "metadata-test",
   "display_name": "Metadata Test",
   "namespace": "metadata-tests",
-  "metadata_class_name": "elyra.metadata.tests.test_utils.MockMetadataTest",
-  "schema_filter_class_name": "elyra.metadata.tests.test_utils.TestSchemaFilter",
+  "metadata_class_name": "elyra.tests.metadata.test_utils.MockMetadataTest",
+  "schema_filter_class_name": "elyra.tests.metadata.test_utils.TestSchemaFilter",
   "properties": {
     "schema_name": {
       "title": "Schema Name",

diff --git a/elyra/metadata/schemas/metadata-test2.json b/elyra/metadata/schemas/metadata-test2.json
@@ -4,7 +4,7 @@
   "name": "metadata-test2",
   "display_name": "Metadata Test2",
   "namespace": "metadata-tests",
-  "metadata_class_name": "elyra.metadata.tests.test_utils.MockMetadataTestRollback",
+  "metadata_class_name": "elyra.tests.metadata.test_utils.MockMetadataTestRollback",
   "properties": {
     "schema_name": {
       "title": "Schema Name",

diff --git a/elyra/pipeline/airflow/tests/__init__.py b/elyra/pipeline/airflow/tests/__init__.py
diff --git a/elyra/pipeline/kfp/tests/__init__.py b/elyra/pipeline/kfp/tests/__init__.py
diff --git a/elyra/pipeline/kfp/tests/conftest.py b/elyra/pipeline/kfp/tests/conftest.py
diff --git a/elyra/pipeline/local/tests/__init__.py b/elyra/pipeline/local/tests/__init__.py
diff --git a/elyra/pipeline/tests/__init__.py b/elyra/pipeline/tests/__init__.py
diff --git a/elyra/pipeline/tests/conftest.py b/elyra/pipeline/tests/conftest.py
diff --git a/elyra/pipeline/tests/resources/__init__.py b/elyra/pipeline/tests/resources/__init__.py
diff --git a/elyra/pipeline/tests/resources/node_util/__init__.py b/elyra/pipeline/tests/resources/node_util/__init__.py
diff --git a/elyra/tests/__init__.py b/elyra/tests/__init__.py
diff --git a/elyra/tests/airflow/__init__.py b/elyra/tests/airflow/__init__.py
diff --git a/elyra/airflow/tests/test_airflow_operator.py → elyra/tests/airflow/test_airflow_operator.py b/elyra/airflow/tests/test_airflow_operator.py → elyra/tests/airflow/test_airflow_operator.py
diff --git a/elyra/tests/cli/__init__.py b/elyra/tests/cli/__init__.py
diff --git a/elyra/cli/tests/test_pipeline_app.py → elyra/tests/cli/test_pipeline_app.py b/elyra/cli/tests/test_pipeline_app.py → elyra/tests/cli/test_pipeline_app.py
@@ -258,8 +258,7 @@ def test_submit_pipeline_with_no_nodes(monkeypatch):
 
         monkeypatch.setattr(pipeline_app, "_get_runtime_type", mock_get_runtime_type)
 
-        result = runner.invoke(pipeline, ['submit', pipeline_file_path,
-                                          '--runtime-config', 'foo'])
+        result = runner.invoke(pipeline, ['submit', pipeline_file_path, '--runtime-config', 'foo'])
         assert "At least one node must exist in the primary pipeline." in result.output
         assert result.exit_code != 0
 

diff --git a/elyra/tests/contents/__init__.py b/elyra/tests/contents/__init__.py
diff --git a/elyra/contents/tests/conftest.py → elyra/tests/contents/conftest.py b/elyra/contents/tests/conftest.py → elyra/tests/contents/conftest.py
@@ -17,13 +17,13 @@
 
 import pytest
 
-from elyra.contents.tests.test_utils import create_dir
-from elyra.contents.tests.test_utils import create_file
-from elyra.contents.tests.test_utils import empty_notebook_content
-from elyra.contents.tests.test_utils import notebook_content
-from elyra.contents.tests.test_utils import python_content
-from elyra.contents.tests.test_utils import r_content
-from elyra.contents.tests.test_utils import text_content
+from elyra.tests.contents.test_utils import create_dir
+from elyra.tests.contents.test_utils import create_file
+from elyra.tests.contents.test_utils import empty_notebook_content
+from elyra.tests.contents.test_utils import notebook_content
+from elyra.tests.contents.test_utils import python_content
+from elyra.tests.contents.test_utils import r_content
+from elyra.tests.contents.test_utils import text_content
 
 
 @pytest.fixture

diff --git a/elyra/tests/contents/resources/__init__.py b/elyra/tests/contents/resources/__init__.py
diff --git a/elyra/contents/tests/resources/parse.py → elyra/tests/contents/resources/parse.py b/elyra/contents/tests/resources/parse.py → elyra/tests/contents/resources/parse.py
diff --git a/elyra/contents/tests/resources/parse.r → elyra/tests/contents/resources/parse.r b/elyra/contents/tests/resources/parse.r → elyra/tests/contents/resources/parse.r
diff --git a/elyra/contents/tests/resources/parse.txt → elyra/tests/contents/resources/parse.txt b/elyra/contents/tests/resources/parse.txt → elyra/tests/contents/resources/parse.txt
diff --git a/...a/contents/tests/resources/parse_empty.py → ...a/tests/contents/resources/parse_empty.py b/...a/contents/tests/resources/parse_empty.py → ...a/tests/contents/resources/parse_empty.py
diff --git a/elyra/contents/tests/resources/parse_empty.r → elyra/tests/contents/resources/parse_empty.r b/elyra/contents/tests/resources/parse_empty.r → elyra/tests/contents/resources/parse_empty.r
diff --git a/...nts/tests/resources/parse_no_kernel.ipynb → .../contents/resources/parse_no_kernel.ipynb b/...nts/tests/resources/parse_no_kernel.ipynb → .../contents/resources/parse_no_kernel.ipynb
diff --git a/...s/tests/resources/parse_no_language.ipynb → ...ontents/resources/parse_no_language.ipynb b/...s/tests/resources/parse_no_language.ipynb → ...ontents/resources/parse_no_language.ipynb
diff --git a/...ntents/tests/resources/parse_python.ipynb → ...sts/contents/resources/parse_python.ipynb b/...ntents/tests/resources/parse_python.ipynb → ...sts/contents/resources/parse_python.ipynb
diff --git a/.../tests/resources/parse_python_empty.ipynb → ...ntents/resources/parse_python_empty.ipynb b/.../tests/resources/parse_python_empty.ipynb → ...ntents/resources/parse_python_empty.ipynb
diff --git a/elyra/contents/tests/resources/parse_r.ipynb → elyra/tests/contents/resources/parse_r.ipynb b/elyra/contents/tests/resources/parse_r.ipynb → elyra/tests/contents/resources/parse_r.ipynb
diff --git a/...tents/tests/resources/parse_r_empty.ipynb → ...ts/contents/resources/parse_r_empty.ipynb b/...tents/tests/resources/parse_r_empty.ipynb → ...ts/contents/resources/parse_r_empty.ipynb
diff --git a/elyra/contents/tests/test_content_parser.py → elyra/tests/contents/test_content_parser.py b/elyra/contents/tests/test_content_parser.py → elyra/tests/contents/test_content_parser.py
diff --git a/elyra/contents/tests/test_handlers.py → elyra/tests/contents/test_handlers.py b/elyra/contents/tests/test_handlers.py → elyra/tests/contents/test_handlers.py
@@ -19,8 +19,8 @@
 import pytest
 from tornado.httpclient import HTTPClientError
 
-from elyra.contents.tests.test_utils import expected_response
-from elyra.contents.tests.test_utils import expected_response_empty
+from elyra.tests.contents.test_utils import expected_response
+from elyra.tests.contents.test_utils import expected_response_empty
 
 
 async def test_file_not_found(jp_fetch):

diff --git a/elyra/contents/tests/test_utils.py → elyra/tests/contents/test_utils.py b/elyra/contents/tests/test_utils.py → elyra/tests/contents/test_utils.py
diff --git a/elyra/tests/kfp/__init__.py b/elyra/tests/kfp/__init__.py
diff --git a/elyra/kfp/tests/resources/test-archive.tgz → elyra/tests/kfp/resources/test-archive.tgz b/elyra/kfp/tests/resources/test-archive.tgz → elyra/tests/kfp/resources/test-archive.tgz
diff --git a/.../kfp/tests/resources/test-bad-archive.tgz → .../tests/kfp/resources/test-bad-archive.tgz b/.../kfp/tests/resources/test-bad-archive.tgz → .../tests/kfp/resources/test-bad-archive.tgz
diff --git a/...kfp/tests/resources/test-bad-archiveB.tgz → ...tests/kfp/resources/test-bad-archiveB.tgz b/...kfp/tests/resources/test-bad-archiveB.tgz → ...tests/kfp/resources/test-bad-archiveB.tgz
diff --git a/.../tests/resources/test-bad-notebookA.ipynb → ...ts/kfp/resources/test-bad-notebookA.ipynb b/.../tests/resources/test-bad-notebookA.ipynb → ...ts/kfp/resources/test-bad-notebookA.ipynb
diff --git a/.../tests/resources/test-bad-notebookB.ipynb → ...ts/kfp/resources/test-bad-notebookB.ipynb b/.../tests/resources/test-bad-notebookB.ipynb → ...ts/kfp/resources/test-bad-notebookB.ipynb
diff --git a/...resources/test-bad-requirements-elyra.txt → ...resources/test-bad-requirements-elyra.txt b/...resources/test-bad-requirements-elyra.txt → ...resources/test-bad-requirements-elyra.txt
diff --git a/.../kfp/tests/resources/test-notebookA.ipynb → .../tests/kfp/resources/test-notebookA.ipynb b/.../kfp/tests/resources/test-notebookA.ipynb → .../tests/kfp/resources/test-notebookA.ipynb
diff --git a/...sts/resources/test-requirements-elyra.txt → ...kfp/resources/test-requirements-elyra.txt b/...sts/resources/test-requirements-elyra.txt → ...kfp/resources/test-requirements-elyra.txt