Move continuation token vespa search tests to separate file

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "navigator_backend"
-version = "1.14.20"
+version = "1.14.19"
 description = ""
 authors = ["CPR-dev-team <[email protected]>"]
 packages = [{ include = "app" }, { include = "tests" }]

tests/search/vespa/test_vespa_search_cont_tokens.py

@@ -0,0 +1,116 @@
+from typing import Mapping
+
+import pytest
+
+from app.api.api_v1.routers import search
+from tests.search.vespa.setup_search_tests import _populate_db_families
+
+SEARCH_ENDPOINT = "/api/v1/searches"
+
+
+def _make_search_request(client, params: Mapping[str, str]):
+    response = client.post(SEARCH_ENDPOINT, json=params)
+    assert response.status_code == 200, response.text
+    return response.json()
+
+
+@pytest.mark.search
+def test_continuation_token__families(test_vespa, data_db, monkeypatch, data_client):
+    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
+
+    _populate_db_families(data_db)
+
+    params = {"query_string": "the", "limit": 2, "page_size": 1}
+    response = _make_search_request(data_client, params)
+    continuation = response["continuation_token"]
+    first_family_ids = [f["family_slug"] for f in response["families"]]
+
+    # Confirm we have grabbed a subset of all results
+    assert len(response["families"]) < response["total_family_hits"]
+
+    # Get next results set
+    params = {"query_string": "the", "continuation_tokens": [continuation]}
+    response = _make_search_request(data_client, params)
+    second_family_ids = [f["family_slug"] for f in response["families"]]
+
+    # Confirm we actually got different results
+    assert sorted(first_family_ids) != sorted(second_family_ids)
+
+    # Go back to prev and confirm its what we had initially
+    params = {
+        "query_string": "the",
+        "continuation_tokens": [response["prev_continuation_token"]],
+        "limit": 2,
+        "page_size": 1,
+    }
+    response = _make_search_request(data_client, params)
+    prev_family_ids = [f["family_slug"] for f in response["families"]]
+
+    assert sorted(first_family_ids) == sorted(prev_family_ids)
+
+
+@pytest.mark.search
+def test_continuation_token__passages(test_vespa, data_db, monkeypatch, data_client):
+    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
+
+    _populate_db_families(data_db)
+
+    # Get second set of families
+    params = {
+        "query_string": "the",
+        "document_ids": ["CCLW.executive.10246.4861", "CCLW.executive.4934.1571"],
+        "limit": 1,
+        "page_size": 1,
+    }
+    first_family = _make_search_request(data_client, params)
+    params["continuation_tokens"] = [first_family["continuation_token"]]
+    second_family_first_passages = _make_search_request(data_client, params)
+    second_family_first_passages_ids = [
+        h["text_block_id"]
+        for h in second_family_first_passages["families"][0]["family_documents"][0][
+            "document_passage_matches"
+        ]
+    ]
+
+    # Get next set of passages
+    this_family_continuation = second_family_first_passages["this_continuation_token"]
+    next_passages_continuation = second_family_first_passages["families"][0][
+        "continuation_token"
+    ]
+    params["continuation_tokens"] = [
+        this_family_continuation,
+        next_passages_continuation,
+    ]
+    second_family_second_passages = _make_search_request(data_client, params)
+    second_family_second_passages_ids = [
+        h["text_block_id"]
+        for h in second_family_second_passages["families"][0]["family_documents"][0][
+            "document_passage_matches"
+        ]
+    ]
+
+    # Confirm we actually got different results
+    assert sorted(second_family_first_passages_ids) != sorted(
+        second_family_second_passages_ids
+    )
+
+    # Go to previous set and confirm its the same
+    prev_passages_continuation = second_family_second_passages["families"][0][
+        "prev_continuation_token"
+    ]
+
+    params["continuation_tokens"] = [
+        this_family_continuation,
+        prev_passages_continuation,
+    ]
+    response = _make_search_request(data_client, params)
+    second_family_prev_passages_ids = [
+        h["text_block_id"]
+        for h in response["families"][0]["family_documents"][0][
+            "document_passage_matches"
+        ]
+    ]
+
+    assert sorted(second_family_second_passages_ids) != sorted(
+        second_family_prev_passages_ids
+    )

tests/search/vespa/test_vespa_search_result_order.py

@@ -0,0 +1,61 @@
+from typing import Mapping
+
+import pytest
+
+from app.api.api_v1.routers import search
+from tests.search.vespa.setup_search_tests import (
+    VESPA_FIXTURE_COUNT,
+    _populate_db_families,
+)
+
+SEARCH_ENDPOINT = "/api/v1/searches"
+
+
+def _make_search_request(client, params: Mapping[str, str]):
+    response = client.post(SEARCH_ENDPOINT, json=params)
+    assert response.status_code == 200, response.text
+    return response.json()
+
+
+@pytest.mark.search
+@pytest.mark.parametrize("label, query", [("search", "the"), ("browse", "")])
+def test_result_order_score(
+    label, query, test_vespa, data_db, monkeypatch, data_client
+):
+    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
+    _populate_db_families(data_db)
+
+    params = {
+        "query_string": query,
+        "sort_field": "date",
+        "sort_order": "asc",
+    }
+    asc_date_body = _make_search_request(data_client, params)
+    asc_dates = [f["family_date"] for f in asc_date_body["families"]]
+
+    params["sort_order"] = "desc"
+    desc_date_body = _make_search_request(data_client, params)
+    desc_dates = [f["family_date"] for f in desc_date_body["families"]]
+
+    assert VESPA_FIXTURE_COUNT == len(asc_dates) == len(desc_dates)
+    assert asc_dates == list(reversed(desc_dates))
+    assert asc_dates[0] < desc_dates[0]
+    assert asc_dates[-1] > desc_dates[-1]
+
+
+@pytest.mark.search
+@pytest.mark.parametrize("label, query", [("search", "the"), ("browse", "")])
+def test_result_order_title(
+    label, query, test_vespa, data_db, monkeypatch, data_client
+):
+    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
+    _populate_db_families(data_db)
+
+    params = {
+        "query_string": query,
+        "sort_field": "title",
+        "sort_order": "asc",
+    }
+
+    # Scope of test is to confirm this does not cause a failure
+    _ = _make_search_request(data_client, params)

tests/search/vespa/test_vespasearch.py

@@ -434,152 +434,6 @@ def test_multiple_filters(label, query, test_vespa, data_db, monkeypatch, data_c
     _ = _make_search_request(data_client, params)
 
 
-@pytest.mark.search
-@pytest.mark.parametrize("label, query", [("search", "the"), ("browse", "")])
-def test_result_order_score(
-    label, query, test_vespa, data_db, monkeypatch, data_client
-):
-    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
-    _populate_db_families(data_db)
-
-    params = {
-        "query_string": query,
-        "sort_field": "date",
-        "sort_order": "asc",
-    }
-    asc_date_body = _make_search_request(data_client, params)
-    asc_dates = [f["family_date"] for f in asc_date_body["families"]]
-
-    params["sort_order"] = "desc"
-    desc_date_body = _make_search_request(data_client, params)
-    desc_dates = [f["family_date"] for f in desc_date_body["families"]]
-
-    assert VESPA_FIXTURE_COUNT == len(asc_dates) == len(desc_dates)
-    assert asc_dates == list(reversed(desc_dates))
-    assert asc_dates[0] < desc_dates[0]
-    assert asc_dates[-1] > desc_dates[-1]
-
-
-@pytest.mark.search
-@pytest.mark.parametrize("label, query", [("search", "the"), ("browse", "")])
-def test_result_order_title(
-    label, query, test_vespa, data_db, monkeypatch, data_client
-):
-    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
-    _populate_db_families(data_db)
-
-    params = {
-        "query_string": query,
-        "sort_field": "title",
-        "sort_order": "asc",
-    }
-
-    # Scope of test is to confirm this does not cause a failure
-    _ = _make_search_request(data_client, params)
-
-
-@pytest.mark.search
-def test_continuation_token__families(test_vespa, data_db, monkeypatch, data_client):
-    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
-
-    _populate_db_families(data_db)
-
-    params = {"query_string": "the", "limit": 2, "page_size": 1}
-    response = _make_search_request(data_client, params)
-    continuation = response["continuation_token"]
-    first_family_ids = [f["family_slug"] for f in response["families"]]
-
-    # Confirm we have grabbed a subset of all results
-    assert len(response["families"]) < response["total_family_hits"]
-
-    # Get next results set
-    params = {"query_string": "the", "continuation_tokens": [continuation]}
-    response = _make_search_request(data_client, params)
-    second_family_ids = [f["family_slug"] for f in response["families"]]
-
-    # Confirm we actually got different results
-    assert sorted(first_family_ids) != sorted(second_family_ids)
-
-    # Go back to prev and confirm its what we had initially
-    params = {
-        "query_string": "the",
-        "continuation_tokens": [response["prev_continuation_token"]],
-        "limit": 2,
-        "page_size": 1,
-    }
-    response = _make_search_request(data_client, params)
-    prev_family_ids = [f["family_slug"] for f in response["families"]]
-
-    assert sorted(first_family_ids) == sorted(prev_family_ids)
-
-
-@pytest.mark.search
-def test_continuation_token__passages(test_vespa, data_db, monkeypatch, data_client):
-    monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)
-
-    _populate_db_families(data_db)
-
-    # Get second set of families
-    params = {
-        "query_string": "the",
-        "document_ids": ["CCLW.executive.10246.4861", "CCLW.executive.4934.1571"],
-        "limit": 1,
-        "page_size": 1,
-    }
-    first_family = _make_search_request(data_client, params)
-    params["continuation_tokens"] = [first_family["continuation_token"]]
-    second_family_first_passages = _make_search_request(data_client, params)
-    second_family_first_passages_ids = [
-        h["text_block_id"]
-        for h in second_family_first_passages["families"][0]["family_documents"][0][
-            "document_passage_matches"
-        ]
-    ]
-
-    # Get next set of passages
-    this_family_continuation = second_family_first_passages["this_continuation_token"]
-    next_passages_continuation = second_family_first_passages["families"][0][
-        "continuation_token"
-    ]
-    params["continuation_tokens"] = [
-        this_family_continuation,
-        next_passages_continuation,
-    ]
-    second_family_second_passages = _make_search_request(data_client, params)
-    second_family_second_passages_ids = [
-        h["text_block_id"]
-        for h in second_family_second_passages["families"][0]["family_documents"][0][
-            "document_passage_matches"
-        ]
-    ]
-
-    # Confirm we actually got different results
-    assert sorted(second_family_first_passages_ids) != sorted(
-        second_family_second_passages_ids
-    )
-
-    # Go to previous set and confirm its the same
-    prev_passages_continuation = second_family_second_passages["families"][0][
-        "prev_continuation_token"
-    ]
-
-    params["continuation_tokens"] = [
-        this_family_continuation,
-        prev_passages_continuation,
-    ]
-    response = _make_search_request(data_client, params)
-    second_family_prev_passages_ids = [
-        h["text_block_id"]
-        for h in response["families"][0]["family_documents"][0][
-            "document_passage_matches"
-        ]
-    ]
-
-    assert sorted(second_family_second_passages_ids) != sorted(
-        second_family_prev_passages_ids
-    )
-
-
 @pytest.mark.search
 def test_case_insensitivity(test_vespa, data_db, monkeypatch, data_client):
     monkeypatch.setattr(search, "_VESPA_CONNECTION", test_vespa)