diff --git a/test/datagateway_api/__init__.py b/test/datagateway_api/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/test/db/conftest.py b/test/datagateway_api/db/conftest.py similarity index 100% rename from test/db/conftest.py rename to test/datagateway_api/db/conftest.py diff --git a/test/db/endpoints/test_count_with_filters_db.py b/test/datagateway_api/db/endpoints/test_count_with_filters_db.py similarity index 100% rename from test/db/endpoints/test_count_with_filters_db.py rename to test/datagateway_api/db/endpoints/test_count_with_filters_db.py diff --git a/test/db/endpoints/test_findone_db.py b/test/datagateway_api/db/endpoints/test_findone_db.py similarity index 100% rename from test/db/endpoints/test_findone_db.py rename to test/datagateway_api/db/endpoints/test_findone_db.py diff --git a/test/db/endpoints/test_get_by_id_db.py b/test/datagateway_api/db/endpoints/test_get_by_id_db.py similarity index 100% rename from test/db/endpoints/test_get_by_id_db.py rename to test/datagateway_api/db/endpoints/test_get_by_id_db.py diff --git a/test/db/endpoints/test_get_with_filters.py b/test/datagateway_api/db/endpoints/test_get_with_filters.py similarity index 100% rename from test/db/endpoints/test_get_with_filters.py rename to test/datagateway_api/db/endpoints/test_get_with_filters.py diff --git a/test/db/endpoints/test_ping_db.py b/test/datagateway_api/db/endpoints/test_ping_db.py similarity index 100% rename from test/db/endpoints/test_ping_db.py rename to test/datagateway_api/db/endpoints/test_ping_db.py diff --git a/test/db/endpoints/test_table_endpoints_db.py b/test/datagateway_api/db/endpoints/test_table_endpoints_db.py similarity index 100% rename from test/db/endpoints/test_table_endpoints_db.py rename to test/datagateway_api/db/endpoints/test_table_endpoints_db.py diff --git a/test/db/test_database_filter_utilities.py b/test/datagateway_api/db/test_database_filter_utilities.py similarity index 100% rename from test/db/test_database_filter_utilities.py rename to test/datagateway_api/db/test_database_filter_utilities.py diff --git a/test/db/test_entity_helper.py b/test/datagateway_api/db/test_entity_helper.py similarity index 100% rename from test/db/test_entity_helper.py rename to test/datagateway_api/db/test_entity_helper.py diff --git a/test/db/test_query_filter_factory.py b/test/datagateway_api/db/test_query_filter_factory.py similarity index 100% rename from test/db/test_query_filter_factory.py rename to test/datagateway_api/db/test_query_filter_factory.py diff --git a/test/db/test_requires_session_id.py b/test/datagateway_api/db/test_requires_session_id.py similarity index 100% rename from test/db/test_requires_session_id.py rename to test/datagateway_api/db/test_requires_session_id.py diff --git a/test/icat/conftest.py b/test/datagateway_api/icat/conftest.py similarity index 97% rename from test/icat/conftest.py rename to test/datagateway_api/icat/conftest.py index f1a0deea..ba7f2165 100644 --- a/test/icat/conftest.py +++ b/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/test/icat/endpoints/test_count_with_filters_icat.py b/test/datagateway_api/icat/endpoints/test_count_with_filters_icat.py similarity index 100% rename from test/icat/endpoints/test_count_with_filters_icat.py rename to test/datagateway_api/icat/endpoints/test_count_with_filters_icat.py diff --git a/test/icat/endpoints/test_create_icat.py b/test/datagateway_api/icat/endpoints/test_create_icat.py similarity index 98% rename from test/icat/endpoints/test_create_icat.py rename to test/datagateway_api/icat/endpoints/test_create_icat.py index 031eaf3f..140f0f77 100644 --- a/test/icat/endpoints/test_create_icat.py +++ b/test/datagateway_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/test/icat/endpoints/test_delete_by_id_icat.py b/test/datagateway_api/icat/endpoints/test_delete_by_id_icat.py similarity index 100% rename from test/icat/endpoints/test_delete_by_id_icat.py rename to test/datagateway_api/icat/endpoints/test_delete_by_id_icat.py diff --git a/test/icat/endpoints/test_findone_icat.py b/test/datagateway_api/icat/endpoints/test_findone_icat.py similarity index 92% rename from test/icat/endpoints/test_findone_icat.py rename to test/datagateway_api/icat/endpoints/test_findone_icat.py index 778c7ebb..66b149b3 100644 --- a/test/icat/endpoints/test_findone_icat.py +++ b/test/datagateway_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 b/test/datagateway_api/icat/endpoints/test_get_by_id_icat.py similarity index 95% rename from test/icat/endpoints/test_get_by_id_icat.py rename to test/datagateway_api/icat/endpoints/test_get_by_id_icat.py index c57ea838..94238a8f 100644 --- a/test/icat/endpoints/test_get_by_id_icat.py +++ b/test/datagateway_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/test/icat/endpoints/test_get_with_filters_icat.py b/test/datagateway_api/icat/endpoints/test_get_with_filters_icat.py similarity index 96% rename from test/icat/endpoints/test_get_with_filters_icat.py rename to test/datagateway_api/icat/endpoints/test_get_with_filters_icat.py index daf31f88..951c6e71 100644 --- a/test/icat/endpoints/test_get_with_filters_icat.py +++ b/test/datagateway_api/icat/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 b/test/datagateway_api/icat/endpoints/test_ping_icat.py similarity index 100% rename from test/icat/endpoints/test_ping_icat.py rename to test/datagateway_api/icat/endpoints/test_ping_icat.py diff --git a/test/icat/endpoints/test_table_endpoints_icat.py b/test/datagateway_api/icat/endpoints/test_table_endpoints_icat.py similarity index 97% rename from test/icat/endpoints/test_table_endpoints_icat.py rename to test/datagateway_api/icat/endpoints/test_table_endpoints_icat.py index 38960e47..4f2a7da7 100644 --- a/test/icat/endpoints/test_table_endpoints_icat.py +++ b/test/datagateway_api/icat/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/test/icat/endpoints/test_update_by_id_icat.py b/test/datagateway_api/icat/endpoints/test_update_by_id_icat.py similarity index 94% rename from test/icat/endpoints/test_update_by_id_icat.py rename to test/datagateway_api/icat/endpoints/test_update_by_id_icat.py index d1c8227b..e6e100d0 100644 --- a/test/icat/endpoints/test_update_by_id_icat.py +++ b/test/datagateway_api/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/test/icat/endpoints/test_update_multiple_icat.py b/test/datagateway_api/icat/endpoints/test_update_multiple_icat.py similarity index 98% rename from test/icat/endpoints/test_update_multiple_icat.py rename to test/datagateway_api/icat/endpoints/test_update_multiple_icat.py index 050dd88e..3de4b621 100644 --- a/test/icat/endpoints/test_update_multiple_icat.py +++ b/test/datagateway_api/icat/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 b/test/datagateway_api/icat/filters/test_distinct_filter.py similarity index 100% rename from test/icat/filters/test_distinct_filter.py rename to test/datagateway_api/icat/filters/test_distinct_filter.py diff --git a/test/icat/filters/test_include_filter.py b/test/datagateway_api/icat/filters/test_include_filter.py similarity index 100% rename from test/icat/filters/test_include_filter.py rename to test/datagateway_api/icat/filters/test_include_filter.py diff --git a/test/icat/filters/test_limit_filter.py b/test/datagateway_api/icat/filters/test_limit_filter.py similarity index 100% rename from test/icat/filters/test_limit_filter.py rename to test/datagateway_api/icat/filters/test_limit_filter.py diff --git a/test/icat/filters/test_order_filter.py b/test/datagateway_api/icat/filters/test_order_filter.py similarity index 100% rename from test/icat/filters/test_order_filter.py rename to test/datagateway_api/icat/filters/test_order_filter.py diff --git a/test/icat/filters/test_skip_filter.py b/test/datagateway_api/icat/filters/test_skip_filter.py similarity index 100% rename from test/icat/filters/test_skip_filter.py rename to test/datagateway_api/icat/filters/test_skip_filter.py diff --git a/test/icat/filters/test_where_filter.py b/test/datagateway_api/icat/filters/test_where_filter.py similarity index 100% rename from test/icat/filters/test_where_filter.py rename to test/datagateway_api/icat/filters/test_where_filter.py diff --git a/test/icat/test_filter_order_handler.py b/test/datagateway_api/icat/test_filter_order_handler.py similarity index 100% rename from test/icat/test_filter_order_handler.py rename to test/datagateway_api/icat/test_filter_order_handler.py diff --git a/test/icat/test_helpers.py b/test/datagateway_api/icat/test_helpers.py similarity index 100% rename from test/icat/test_helpers.py rename to test/datagateway_api/icat/test_helpers.py diff --git a/test/icat/test_icat_client.py b/test/datagateway_api/icat/test_icat_client.py similarity index 100% rename from test/icat/test_icat_client.py rename to test/datagateway_api/icat/test_icat_client.py diff --git a/test/icat/test_lru_cache.py b/test/datagateway_api/icat/test_lru_cache.py similarity index 100% rename from test/icat/test_lru_cache.py rename to test/datagateway_api/icat/test_lru_cache.py diff --git a/test/icat/test_query.py b/test/datagateway_api/icat/test_query.py similarity index 100% rename from test/icat/test_query.py rename to test/datagateway_api/icat/test_query.py diff --git a/test/icat/test_session_handling.py b/test/datagateway_api/icat/test_session_handling.py similarity index 100% rename from test/icat/test_session_handling.py rename to test/datagateway_api/icat/test_session_handling.py diff --git a/test/test_backends.py b/test/datagateway_api/test_backends.py similarity index 100% rename from test/test_backends.py rename to test/datagateway_api/test_backends.py diff --git a/test/test_openapi.py b/test/datagateway_api/test_openapi.py similarity index 100% rename from test/test_openapi.py rename to test/datagateway_api/test_openapi.py diff --git a/test/search_api/__init__.py b/test/search_api/__init__.py new file mode 100644 index 00000000..e69de29b