Merge branch 'expands-search-api-structure' into add-datagateway-and-…

…panosc-modes-#256
ral-facilities · Nov 4, 2021 · b57c127 · b57c127
2 parents 59eca6e + f51a7b3
commit b57c127
Show file tree

Hide file tree

Showing 38 changed files with 9 additions and 9 deletions.
diff --git a/test/datagateway_api/__init__.py b/test/datagateway_api/__init__.py
diff --git a/test/db/conftest.py → test/datagateway_api/db/conftest.py b/test/db/conftest.py → test/datagateway_api/db/conftest.py
diff --git a/...b/endpoints/test_count_with_filters_db.py → ...b/endpoints/test_count_with_filters_db.py b/...b/endpoints/test_count_with_filters_db.py → ...b/endpoints/test_count_with_filters_db.py
diff --git a/test/db/endpoints/test_findone_db.py → ...teway_api/db/endpoints/test_findone_db.py b/test/db/endpoints/test_findone_db.py → ...teway_api/db/endpoints/test_findone_db.py
diff --git a/test/db/endpoints/test_get_by_id_db.py → ...way_api/db/endpoints/test_get_by_id_db.py b/test/db/endpoints/test_get_by_id_db.py → ...way_api/db/endpoints/test_get_by_id_db.py
diff --git a/test/db/endpoints/test_get_with_filters.py → ...api/db/endpoints/test_get_with_filters.py b/test/db/endpoints/test_get_with_filters.py → ...api/db/endpoints/test_get_with_filters.py
diff --git a/test/db/endpoints/test_ping_db.py → ...agateway_api/db/endpoints/test_ping_db.py b/test/db/endpoints/test_ping_db.py → ...agateway_api/db/endpoints/test_ping_db.py
diff --git a/test/db/endpoints/test_table_endpoints_db.py → ...i/db/endpoints/test_table_endpoints_db.py b/test/db/endpoints/test_table_endpoints_db.py → ...i/db/endpoints/test_table_endpoints_db.py
diff --git a/test/db/test_database_filter_utilities.py → ..._api/db/test_database_filter_utilities.py b/test/db/test_database_filter_utilities.py → ..._api/db/test_database_filter_utilities.py
diff --git a/test/db/test_entity_helper.py → .../datagateway_api/db/test_entity_helper.py b/test/db/test_entity_helper.py → .../datagateway_api/db/test_entity_helper.py
diff --git a/test/db/test_query_filter_factory.py → ...teway_api/db/test_query_filter_factory.py b/test/db/test_query_filter_factory.py → ...teway_api/db/test_query_filter_factory.py
diff --git a/test/db/test_requires_session_id.py → ...ateway_api/db/test_requires_session_id.py b/test/db/test_requires_session_id.py → ...ateway_api/db/test_requires_session_id.py
diff --git a/test/icat/conftest.py → test/datagateway_api/icat/conftest.py b/test/icat/conftest.py → test/datagateway_api/icat/conftest.py
@@ -13,8 +13,8 @@
     create_api_endpoints,
     create_app_infrastructure,
 )
-from test.icat.endpoints.test_create_icat import TestICATCreateData
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.endpoints.test_create_icat import TestICATCreateData
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 @pytest.fixture(scope="package")

diff --git a/...endpoints/test_count_with_filters_icat.py → ...endpoints/test_count_with_filters_icat.py b/...endpoints/test_count_with_filters_icat.py → ...endpoints/test_count_with_filters_icat.py
diff --git a/test/icat/endpoints/test_create_icat.py → ...ay_api/icat/endpoints/test_create_icat.py b/test/icat/endpoints/test_create_icat.py → ...ay_api/icat/endpoints/test_create_icat.py
@@ -1,6 +1,6 @@
 import pytest
 
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestICATCreateData:

diff --git a/.../icat/endpoints/test_delete_by_id_icat.py → .../icat/endpoints/test_delete_by_id_icat.py b/.../icat/endpoints/test_delete_by_id_icat.py → .../icat/endpoints/test_delete_by_id_icat.py
diff --git a/test/icat/endpoints/test_findone_icat.py → ...y_api/icat/endpoints/test_findone_icat.py b/test/icat/endpoints/test_findone_icat.py → ...y_api/icat/endpoints/test_findone_icat.py
@@ -1,4 +1,4 @@
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestICATFindone:

diff --git a/test/icat/endpoints/test_get_by_id_icat.py → ...api/icat/endpoints/test_get_by_id_icat.py b/test/icat/endpoints/test_get_by_id_icat.py → ...api/icat/endpoints/test_get_by_id_icat.py
@@ -1,4 +1,4 @@
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestICATGetByID:

diff --git a/...t/endpoints/test_get_with_filters_icat.py → ...t/endpoints/test_get_with_filters_icat.py b/...t/endpoints/test_get_with_filters_icat.py → ...t/endpoints/test_get_with_filters_icat.py
@@ -1,6 +1,6 @@
 import pytest
 
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestICATGetWithFilters:

diff --git a/test/icat/endpoints/test_ping_icat.py → ...eway_api/icat/endpoints/test_ping_icat.py b/test/icat/endpoints/test_ping_icat.py → ...eway_api/icat/endpoints/test_ping_icat.py
diff --git a/...at/endpoints/test_table_endpoints_icat.py → ...at/endpoints/test_table_endpoints_icat.py b/...at/endpoints/test_table_endpoints_icat.py → ...at/endpoints/test_table_endpoints_icat.py
@@ -1,4 +1,4 @@
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestICATableEndpoints:

diff --git a/.../icat/endpoints/test_update_by_id_icat.py → .../icat/endpoints/test_update_by_id_icat.py b/.../icat/endpoints/test_update_by_id_icat.py → .../icat/endpoints/test_update_by_id_icat.py
@@ -1,4 +1,4 @@
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestUpdateByID:

diff --git a/...at/endpoints/test_update_multiple_icat.py → ...at/endpoints/test_update_multiple_icat.py b/...at/endpoints/test_update_multiple_icat.py → ...at/endpoints/test_update_multiple_icat.py
@@ -1,6 +1,6 @@
 import pytest
 
-from test.icat.test_query import prepare_icat_data_for_assertion
+from test.datagateway_api.icat.test_query import prepare_icat_data_for_assertion
 
 
 class TestUpdateMultipleEntities:

diff --git a/test/icat/filters/test_distinct_filter.py → ..._api/icat/filters/test_distinct_filter.py b/test/icat/filters/test_distinct_filter.py → ..._api/icat/filters/test_distinct_filter.py
diff --git a/test/icat/filters/test_include_filter.py → ...y_api/icat/filters/test_include_filter.py b/test/icat/filters/test_include_filter.py → ...y_api/icat/filters/test_include_filter.py
diff --git a/test/icat/filters/test_limit_filter.py → ...way_api/icat/filters/test_limit_filter.py b/test/icat/filters/test_limit_filter.py → ...way_api/icat/filters/test_limit_filter.py
diff --git a/test/icat/filters/test_order_filter.py → ...way_api/icat/filters/test_order_filter.py b/test/icat/filters/test_order_filter.py → ...way_api/icat/filters/test_order_filter.py
diff --git a/test/icat/filters/test_skip_filter.py → ...eway_api/icat/filters/test_skip_filter.py b/test/icat/filters/test_skip_filter.py → ...eway_api/icat/filters/test_skip_filter.py
diff --git a/test/icat/filters/test_where_filter.py → ...way_api/icat/filters/test_where_filter.py b/test/icat/filters/test_where_filter.py → ...way_api/icat/filters/test_where_filter.py
diff --git a/test/icat/test_filter_order_handler.py → ...way_api/icat/test_filter_order_handler.py b/test/icat/test_filter_order_handler.py → ...way_api/icat/test_filter_order_handler.py
diff --git a/test/icat/test_helpers.py → test/datagateway_api/icat/test_helpers.py b/test/icat/test_helpers.py → test/datagateway_api/icat/test_helpers.py
diff --git a/test/icat/test_icat_client.py → .../datagateway_api/icat/test_icat_client.py b/test/icat/test_icat_client.py → .../datagateway_api/icat/test_icat_client.py
diff --git a/test/icat/test_lru_cache.py → test/datagateway_api/icat/test_lru_cache.py b/test/icat/test_lru_cache.py → test/datagateway_api/icat/test_lru_cache.py
diff --git a/test/icat/test_query.py → test/datagateway_api/icat/test_query.py b/test/icat/test_query.py → test/datagateway_api/icat/test_query.py
diff --git a/test/icat/test_session_handling.py → ...gateway_api/icat/test_session_handling.py b/test/icat/test_session_handling.py → ...gateway_api/icat/test_session_handling.py
diff --git a/test/test_backends.py → test/datagateway_api/test_backends.py b/test/test_backends.py → test/datagateway_api/test_backends.py
diff --git a/test/test_openapi.py → test/datagateway_api/test_openapi.py b/test/test_openapi.py → test/datagateway_api/test_openapi.py
diff --git a/test/search_api/__init__.py b/test/search_api/__init__.py