test: change pytest fixture to SearchAPIQuery #260

ral-facilities · Dec 21, 2021 · 9937c36 · 9937c36
1 parent 6845659
commit 9937c36
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/test/search_api/conftest.py b/test/search_api/conftest.py
@@ -3,6 +3,7 @@
 import pytest
 
 from datagateway_api.src.common.config import Config
+from datagateway_api.src.search_api.query import SearchAPIQuery
 
 
 @pytest.fixture(scope="package")
@@ -18,5 +19,15 @@ def icat_client():
 
 
 @pytest.fixture()
-def icat_query(icat_client):
-    return Query(icat_client, "Investigation")
+def search_api_query_dataset():
+    return SearchAPIQuery("Dataset")
+
+
+@pytest.fixture()
+def search_api_query_document():
+    return SearchAPIQuery("Document")
+
+
+@pytest.fixture()
+def search_api_query_instrument():
+    return SearchAPIQuery("Instrument")
diff --git a/test/search_api/filters/test_search_api_limit_filter.py b/test/search_api/filters/test_search_api_limit_filter.py
@@ -14,12 +14,11 @@ class TestSearchAPILimitFilter:
             pytest.param(9999, id="high boundary"),
         ],
     )
-    def test_valid_limit_value(self, limit_value):
+    def test_valid_limit_value(self, limit_value, search_api_query_document):
         test_filter = SearchAPILimitFilter(limit_value)
-        test_query = SearchAPIQuery("Document")
-        test_filter.apply_filter(test_query)
+        test_filter.apply_filter(search_api_query_document)
 
-        assert test_query.icat_query.query.limit == (0, limit_value)
+        assert search_api_query_document.icat_query.query.limit == (0, limit_value)
 
     @pytest.mark.parametrize(
         "limit_value",

diff --git a/test/search_api/filters/test_search_api_skip_filter.py b/test/search_api/filters/test_search_api_skip_filter.py
@@ -11,15 +11,11 @@ class TestSearchAPISkipFilter:
     @pytest.mark.parametrize(
         "skip_value", [pytest.param(10, id="typical"), pytest.param(0, id="boundary")],
     )
-    # TODO - needs to be changed to `SearchAPIQuery`
-    def test_valid_skip_value(self, icat_query, skip_value):
+    def test_valid_skip_value(self, search_api_query_document, skip_value):
         test_filter = SearchAPISkipFilter(skip_value)
-        # TODO - probably could make this a fixture? Might need different ones for each
-        # entity name entrypoint because you can't have args that aren't other fixtures
-        test_query = SearchAPIQuery("Document")
-        test_filter.apply_filter(test_query)
+        test_filter.apply_filter(search_api_query_document)
 
-        assert test_query.icat_query.query.limit == (
+        assert search_api_query_document.icat_query.query.limit == (
             skip_value,
             get_icat_properties(
                 Config.config.search_api.icat_url,