Merge pull request saw-leipzig#74 from rettinghaus/fix/tests

Clean up tests

Author: rettinghaus

csv2cmi.py

@@ -442,11 +442,12 @@ def generate_id(id_prefix: str) -> str:
         generated_id = f"{id_prefix.strip()}-{token_hex(4)}"
         return generated_id
 
-    def generate_uuid(self) -> str:
+    @staticmethod
+    def generate_uuid() -> str:
         """Generate a UUID of type xs:ID."""
         generated_uuid = str(UUID(bytes=bytes(random.getrandbits(8) for _ in range(16)), version=4))
         if generated_uuid[0].isdigit():
-            return self.generate_uuid()
+            return CMI.generate_uuid()
         return generated_uuid
 
     def process_date(self, letter: dict, correspondent: Correspondents) -> Optional[Element]:

tests/test_cmi_methods.py

@@ -1,46 +1,40 @@
 import pytest
 
-import csv2cmi
-
-
-@pytest.fixture
-def table():
-    table
+from csv2cmi import CMI
 
 
 def test_create_date_valid():
-    assert csv2cmi.CMI.create_date("2016-04-01").attrib["when"] == "2016-04-01"
-    assert csv2cmi.CMI.create_date("1673-05").attrib["when"] == "1673-05"
-    assert csv2cmi.CMI.create_date("[..1760-12-03]").attrib["notAfter"] == "1760-12-03"
-    assert csv2cmi.CMI.create_date("[1760-12..]").attrib["notBefore"] == "1760-12"
-    assert csv2cmi.CMI.create_date("1979-10-12/").attrib["from"] == "1979-10-12"
-    assert csv2cmi.CMI.create_date("/1985-04-12").attrib["to"] == "1985-04-12"
-    assert csv2cmi.CMI.create_date("{-0400,-0390,-0370}") is not None
+    assert CMI.create_date("2016-04-01").attrib["when"] == "2016-04-01"
+    assert CMI.create_date("1673-05").attrib["when"] == "1673-05"
+    assert CMI.create_date("[..1760-12-03]").attrib["notAfter"] == "1760-12-03"
+    assert CMI.create_date("[1760-12..]").attrib["notBefore"] == "1760-12"
+    assert CMI.create_date("1979-10-12/").attrib["from"] == "1979-10-12"
+    assert CMI.create_date("/1985-04-12").attrib["to"] == "1985-04-12"
+    assert CMI.create_date("{-0400,-0390,-0370}") is not None
 
 
 def test_create_date_invalid():
     with pytest.raises(ValueError):
-        csv2cmi.CMI.create_date("not-a-date")
+        CMI.create_date("not-a-date")
 
 
 def test_create_place_name():
-    tei_placename = csv2cmi.CMI.create_place_name("Berlin")
+    tei_placename = CMI.create_place_name("Berlin")
     assert tei_placename.tag == "placeName"
     assert tei_placename.text == "Berlin"
 
 
 def test_create_place_name_with_uri():
-    tei_placename = csv2cmi.CMI.create_place_name("Mokhdān", "https://www.geonames.org/123456")
+    tei_placename = CMI.create_place_name("Mokhdān", "https://www.geonames.org/123456")
     assert tei_placename.tag == "placeName"
     assert tei_placename.attrib["ref"] == "https://www.geonames.org/123456"
     assert tei_placename.text == "Mokhdān"
 
 
 def test_generate_id_and_uuid():
-    id1 = csv2cmi.CMI.generate_id("test")
-    id2 = csv2cmi.CMI.generate_id("test")
+    id1 = CMI.generate_id("test")
+    id2 = CMI.generate_id("test")
     assert id1 != id2
-    cmi = csv2cmi.CMI()
-    uuid1 = cmi.generate_uuid()
-    uuid2 = cmi.generate_uuid()
+    uuid1 = CMI.generate_uuid()
+    uuid2 = CMI.generate_uuid()
     assert uuid1 != uuid2

tests/test_csv2cmi.py

@@ -33,6 +33,4 @@ def test_missing_file(monkeypatch: pytest.MonkeyPatch):
     sys_argv = ["csv2cmi.py", "nonexistent.csv"]
     monkeypatch.setattr(sys, "argv", sys_argv)
     with pytest.raises(SystemExit):
-        import runpy
-
         runpy.run_module("csv2cmi", run_name="__main__")