Merge pull request #29 from eriknovak/tests

Change unit tests to use pytest

.github/workflows/unittests.yaml

@@ -25,6 +25,5 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -e .[test]
-      - name: Test with unittest
-        run: |
-          python -m unittest discover test
+      - name: Test with pytest
+        run: pytest

anonipy/anonymize/strategies/masking.py

@@ -40,7 +40,7 @@ def __init__(self, substitute_label: str = "*", *args, **kwargs):
         """
 
         super().__init__(*args, **kwargs)
-        self.substitute_label = substitute_label
+        self.substitute_label = substitute_label or "*"
 
     def anonymize(
         self, text: str, entities: List[Entity], *args, **kwargs

anonipy/anonymize/strategies/redaction.py

@@ -39,7 +39,7 @@ def __init__(self, substitute_label: str = "[REDACTED]", *args, **kwargs) -> Non
         """
 
         super().__init__(*args, **kwargs)
-        self.substitute_label = substitute_label
+        self.substitute_label = substitute_label or "[REDACTED]"
 
     def anonymize(
         self, text: str, entities: List[Entity], *args, **kwargs

pyproject.toml

@@ -5,7 +5,10 @@ build-backend = 'setuptools.build_meta'
 [project]
 name = "anonipy"
 description = "The data anonymization package"
-authors=[{ name = "Erik Novak" }]
+authors=[
+    { name = "Erik Novak" },
+    { name = "Nina Kokalj" }
+]
 maintainers = [{ name = "Erik Novak" }]
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -36,8 +39,8 @@ dev = [
     "mkdocstrings[python]",
 ]
 test = [
-    "coverage",
-    "nbmake",
+    "pytest",
+    "pytest-cov",
 ]
 all = ["anonipy[dev,test]"]
 

test/test_anonymize.py

@@ -1,5 +1,3 @@
-import unittest
-
 from anonipy.anonymize import anonymize
 
 # =====================================
@@ -30,18 +28,12 @@
     },
 ]
 
-
 # =====================================
 # Test Anonymize
 # =====================================
 
 
-class TestAnonymize(unittest.TestCase):
-    def test_anonymize(self):
-        anonymized_text, replacements = anonymize(test_text, test_replacements)
-        self.assertEqual(anonymized_text, test_text_anonymized)
-        self.assertEqual(replacements, test_replacements)
-
-
-if __name__ == "__main__":
-    unittest.main()
+def test_anonymize():
+    anonymized_text, replacements = anonymize(test_text, test_replacements)
+    assert anonymized_text == test_text_anonymized
+    assert replacements == test_replacements

test/test_entity.py

@@ -1,48 +1,40 @@
-import unittest
-
 from anonipy.definitions import Entity
 
-
 # =====================================
 # Test Entity
 # =====================================
 
 
-class TestEntity(unittest.TestCase):
-
-    def test_init_default(self):
-        entity = Entity(
-            text="test",
-            label="test",
-            start_index=0,
-            end_index=4,
-        )
-        self.assertEqual(entity.text, "test")
-        self.assertEqual(entity.label, "test")
-        self.assertEqual(entity.start_index, 0)
-        self.assertEqual(entity.end_index, 4)
-        self.assertEqual(entity.score, 1.0)
-        self.assertEqual(entity.type, None)
-        self.assertEqual(entity.regex, ".*")
-
-    def test_init_custom(self):
-        entity = Entity(
-            text="test",
-            label="test",
-            start_index=0,
-            end_index=4,
-            score=0.89,
-            type="test",
-            regex="test",
-        )
-        self.assertEqual(entity.text, "test")
-        self.assertEqual(entity.label, "test")
-        self.assertEqual(entity.start_index, 0)
-        self.assertEqual(entity.end_index, 4)
-        self.assertEqual(entity.score, 0.89)
-        self.assertEqual(entity.type, "test")
-        self.assertEqual(entity.regex, "test")
-
-
-if __name__ == "__main__":
-    unittest.main()
+def test_init_default():
+    entity = Entity(
+        text="test",
+        label="test",
+        start_index=0,
+        end_index=4,
+    )
+    assert entity.text == "test"
+    assert entity.label == "test"
+    assert entity.start_index == 0
+    assert entity.end_index == 4
+    assert entity.score == 1.0
+    assert entity.type is None
+    assert entity.regex == ".*"
+
+
+def test_init_custom():
+    entity = Entity(
+        text="test",
+        label="test",
+        start_index=0,
+        end_index=4,
+        score=0.89,
+        type="test",
+        regex="test",
+    )
+    assert entity.text == "test"
+    assert entity.label == "test"
+    assert entity.start_index == 0
+    assert entity.end_index == 4
+    assert entity.score == 0.89
+    assert entity.type == "test"
+    assert entity.regex == "test"