Updates based on discussion in PR #178

* Shift "or None" logic to field methods and update type hinting
* Update unit tests to all use stub records
* Remove unnecessary fixtures from conftest.py

tests/conftest.py

@@ -76,22 +76,6 @@ def datacite_record_all_fields():
     return Datacite("cool-repo", source_records)
 
 
-@pytest.fixture
-def datacite_record_optional_fields_blank():
-    source_records = XMLTransformer.parse_source_file(
-        "tests/fixtures/datacite/datacite_record_optional_fields_blank.xml"
-    )
-    return next(source_records)
-
-
-@pytest.fixture
-def datacite_record_optional_fields_missing():
-    source_records = XMLTransformer.parse_source_file(
-        "tests/fixtures/datacite/datacite_record_optional_fields_missing.xml"
-    )
-    return next(source_records)
-
-
 # marc ##########################
 
 

tests/sources/xml/test_datacite.py

@@ -396,16 +396,16 @@ def test_get_alternate_titles_success():
     ]
 
 
-def test_get_alternate_titles_transforms_correctly_if_fields_blank(
-    datacite_record_optional_fields_blank,
-):
-    assert Datacite.get_alternate_titles(datacite_record_optional_fields_blank) == []
+def test_get_alternate_titles_transforms_correctly_if_fields_blank():
+    source_record = create_datacite_source_record_stub(
+        '<titles><title titleType="AlternativeTitle"></title></titles>'
+    )
+    assert Datacite.get_alternate_titles(source_record) is None
 
 
-def test_get_alternate_titles_transforms_correctly_if_fields_missing(
-    datacite_record_optional_fields_missing,
-):
-    assert Datacite.get_alternate_titles(datacite_record_optional_fields_missing) == []
+def test_get_alternate_titles_transforms_correctly_if_fields_missing():
+    source_record = create_datacite_source_record_stub("")
+    assert Datacite.get_alternate_titles(source_record) is None
 
 
 def test_get_content_type_success():
@@ -417,20 +417,18 @@ def test_get_content_type_success():
     assert Datacite.get_content_type(source_record, "abc123") == ["Dataset"]
 
 
-def test_get_content_type_transforms_correctly_if_fields_blank(
-    datacite_record_optional_fields_blank,
-):
-    assert (
-        Datacite.get_content_type(datacite_record_optional_fields_blank, "abc123") == []
+def test_get_content_type_transforms_correctly_if_fields_blank():
+    source_record = create_datacite_source_record_stub(
+        """
+        <resourceType resourceTypeGeneral=""></resourceType>
+        """
     )
+    assert Datacite.get_content_type(source_record, "abc123") is None
 
 
-def test_get_content_type_transforms_correctly_if_fields_missing(
-    datacite_record_optional_fields_missing,
-):
-    assert (
-        Datacite.get_content_type(datacite_record_optional_fields_missing, "abc123") == []
-    )
+def test_get_content_type_transforms_correctly_if_fields_missing():
+    source_record = create_datacite_source_record_stub("")
+    assert Datacite.get_content_type(source_record, "abc123") is None
 
 
 def test_get_contributors_success():
@@ -498,16 +496,22 @@ def test_get_contributors_success():
     ]
 
 
-def test_get_contributors_transforms_correctly_if_fields_blank(
-    datacite_record_optional_fields_blank,
-):
-    assert Datacite.get_contributors(datacite_record_optional_fields_blank) == []
+def test_get_contributors_transforms_correctly_if_fields_blank():
+    source_record = create_datacite_source_record_stub(
+        """
+        <creators>
+         <creator />
+        <contributors>
+         <contributor />
+        </contributors>
+        """
+    )
+    assert Datacite.get_contributors(source_record) is None
 
 
-def test_get_contributors_transforms_correctly_if_fields_missing(
-    datacite_record_optional_fields_missing,
-):
-    assert Datacite.get_contributors(datacite_record_optional_fields_missing) == []
+def test_get_contributors_transforms_correctly_if_fields_missing():
+    source_record = create_datacite_source_record_stub("")
+    assert Datacite.get_contributors(source_record) is None
 
 
 def test_generate_name_identifier_url_orcid_scheme(datacite_record_all_fields):

transmogrifier/sources/xml/datacite.py

@@ -28,15 +28,13 @@ def get_optional_fields(self, source_record: Tag) -> dict | None:
         source_record_id = self.get_source_record_id(source_record)
 
         # alternate_titles
-        fields["alternate_titles"] = self.get_alternate_titles(source_record) or None
+        fields["alternate_titles"] = self.get_alternate_titles(source_record)
 
         # content_type
-        fields["content_type"] = (
-            self.get_content_type(source_record, source_record_id) or None
-        )
+        fields["content_type"] = self.get_content_type(source_record, source_record_id)
 
         # contributors
-        fields["contributors"] = self.get_contributors(source_record) or None
+        fields["contributors"] = self.get_contributors(source_record)
 
         # dates
         if publication_year := source_record.metadata.find(
@@ -248,7 +246,9 @@ def get_optional_fields(self, source_record: Tag) -> dict | None:
         return fields
 
     @classmethod
-    def get_alternate_titles(cls, source_record: Tag) -> list[timdex.AlternateTitle]:
+    def get_alternate_titles(
+        cls, source_record: Tag
+    ) -> list[timdex.AlternateTitle] | None:
         alternate_titles = []
         alternate_titles.extend(
             [
@@ -261,7 +261,7 @@ def get_alternate_titles(cls, source_record: Tag) -> list[timdex.AlternateTitle]
             ]
         )
         alternate_titles.extend(list(cls._get_additional_titles(source_record)))
-        return alternate_titles
+        return alternate_titles or None
 
     @classmethod
     def _get_additional_titles(
@@ -273,7 +273,9 @@ def _get_additional_titles(
                 yield timdex.AlternateTitle(value=title)
 
     @classmethod
-    def get_content_type(cls, source_record: Tag, source_record_id: str) -> list[str]:
+    def get_content_type(
+        cls, source_record: Tag, source_record_id: str
+    ) -> list[str] | None:
         content_types = []
         if resource_type := source_record.metadata.find("resourceType"):
             if content_type := resource_type.get("resourceTypeGeneral"):
@@ -287,14 +289,14 @@ def get_content_type(cls, source_record: Tag, source_record_id: str) -> list[str
                 "Datacite record %s missing required Datacite field resourceType",
                 source_record_id,
             )
-        return content_types
+        return content_types or None
 
     @classmethod
-    def get_contributors(cls, source_record: Tag) -> list[timdex.Contributor]:
+    def get_contributors(cls, source_record: Tag) -> list[timdex.Contributor] | None:
         contributors = []
         contributors.extend(list(cls._get_creators(source_record)))
         contributors.extend(list(cls._get_contributors(source_record)))
-        return contributors
+        return contributors or None
 
     @classmethod
     def _get_creators(cls, source_record: Tag) -> Iterator[timdex.Contributor]: