EKIR-725 Rename test feed to demarque

Author: natlibfi-kaisa

tests/api/opds/odl/test_odl.py

@@ -21,7 +21,7 @@ def test__get_publication_type() -> None:
 @pytest.mark.parametrize(
     "filename",
     [
-        "feed.json",
+        "demarque_feed.json",
         "feed2.json",
         "auth_token_feed.json",
     ],
@@ -50,7 +50,9 @@ def test_feed_odl_failure(
     The ODL parser should fail to parse an OPDS2 feed with an ODL publication.
     """
     with pytest.raises(ValidationError) as exc_info:
-        Feed.model_validate_json(opds2_with_odl_files_fixture.sample_data("feed.json"))
+        Feed.model_validate_json(
+            opds2_with_odl_files_fixture.sample_data("demarque_feed.json")
+        )
 
     errors = exc_info.value.errors()
     assert len(errors) == 2

tests/api/opds/test_opds2.py

@@ -9,15 +9,15 @@
     "filename, publication_identifiers",
     [
         pytest.param(
-            "feed.json",
+            "demarque_feed.json",
             [
                 "urn:isbn:978-3-16-148410-0",
                 "http://example.org/huckleberry-finn",
                 "urn:proquest.com/document-id/181639",
                 "urn:isbn:9789523565593",
                 "urn:isbn:978-0-06-112008-4",
             ],
-            id="feed.json",
+            id="demarque_feed.json",
         ),
         pytest.param(
             "feed2.json",

tests/api/test_odl2.py

@@ -89,7 +89,7 @@ def test_import(
         )
 
         odl_mock_get.add(moby_dick_license)
-        feed = api_odl_files_fixture.sample_text("feed.json")
+        feed = api_odl_files_fixture.sample_text("demarque_feed.json")
 
         config = odl2_importer.collection.integration_configuration
         odl2_importer.ignored_identifier_types = [IdentifierConstants.URI]
@@ -529,7 +529,7 @@ def test_import_availability(
         odl_mock_get: MockGet,
         api_odl_files_fixture: ODLAPIFilesFixture,
     ) -> None:
-        feed_json = json.loads(api_odl_files_fixture.sample_text("feed.json"))
+        feed_json = json.loads(api_odl_files_fixture.sample_text("demarque_feed.json"))
 
         moby_dick_license_dict = feed_json["publications"][0]["licenses"][0]
         test_book_license_dict = feed_json["publications"][2]["licenses"][0]

tests/core/test_opds2_import.py

@@ -143,7 +143,7 @@ def test_opds2_importer_correctly_imports_valid_opds2_feed(
             opds2_importer_fixture.transaction,
             opds2_importer_fixture.transaction.session,
         )
-        content_server_feed_text = opds2_files_fixture.sample_text("feed.json")
+        content_server_feed_text = opds2_files_fixture.sample_text("demarque_feed.json")
         content_server_feed: str | bytes
 
         if manifest_type == "bytes":
@@ -461,8 +461,7 @@ def test_opds2_importer_skips_publications_with_unsupported_identifier_types(
         data.importer.ignored_identifier_types = [
             t.value for t in ignore_identifier_type
         ]
-        print(data.importer.ignored_identifier_types)
-        content_server_feed = opds2_files_fixture.sample_text("feed.json")
+        content_server_feed = opds2_files_fixture.sample_text("demarque_feed.json")
 
         # Act
         imported_editions, pools, works, failures = data.importer.import_from_feed(
@@ -564,7 +563,10 @@ def test_extract_next_links(
         assert extract_next_links(b"garbage") == []
 
         # No next links
-        assert extract_next_links(opds2_files_fixture.sample_data("feed.json")) == []
+        assert (
+            extract_next_links(opds2_files_fixture.sample_data("demarque_feed.json"))
+            == []
+        )
 
         # One next link
         assert extract_next_links(opds2_files_fixture.sample_data("feed2.json")) == [
@@ -585,7 +587,7 @@ def test_extract_last_update_dates(
 
         # Feed with last update dates
         assert extract_last_update_dates(
-            opds2_files_fixture.sample_data("feed.json")
+            opds2_files_fixture.sample_data("demarque_feed.json")
         ) == [
             (
                 "urn:isbn:978-3-16-148410-0",
@@ -620,7 +622,7 @@ def test_opds2_importer_imports_feeds_with_availability_info(
             opds2_importer_fixture.transaction,
             opds2_importer_fixture.transaction.session,
         )
-        feed_json = json.loads(opds2_files_fixture.sample_text("feed.json"))
+        feed_json = json.loads(opds2_files_fixture.sample_text("demarque_feed.json"))
 
         moby_dick_metadata = feed_json["publications"][0]["metadata"]
         huckleberry_finn_metadata = feed_json["publications"][1]["metadata"]

tests/core/test_opds_validate.py

@@ -53,7 +53,7 @@ class TestOPDS2WithODLValidation:
     @pytest.mark.parametrize(
         "feed_name, fail",
         [
-            ("feed.json", True),
+            ("demarque_feed.json", True),
             ("feed2.json", False),
         ],
     )