Fixing logic for trim_punctuation and improving tests

Author: bltravis

src/folio_migration_tools/marc_rules_transformation/conditions.py

@@ -170,10 +170,10 @@ def condition_trim_punctuation(self, legacy_id, value, parameter, marc_field: fi
         the period is preceded by a single alpha character (eg. "John D."). Also preserves any
         trailing "-" (eg. "1981-"). This condition was introduced in Poppy.
         """
-        pattern1 = re.compile(r"^(.*?)\\s.[.]$")
-        pattern2 = re.compile(r"^(.*?)\\s.,[.]$")
+        pattern1 = re.compile(r"^(.*?)\s.[.]$")
+        pattern2 = re.compile(r"^(.*?)\s.,[.]$")
         value = value.strip()
-        if pattern1.match(value) or pattern2.match(value):
+        if pattern1.match(value) or value.endswith("-"):
             return value
         elif pattern2.match(value):
             return value.rstrip(",")

tests/test_conditions.py

@@ -15,14 +15,16 @@ def test_condition_trim_period():
 
 def test_condition_trim_punctuation():
     mock = Mock(spec=Conditions)
-    res = Conditions.condition_trim_punctuation(None, mock, "Rockefeller, John D.,", None, None)
+    res = Conditions.condition_trim_punctuation(None, mock, "Rockefeller, John D.", None, None)
     res2 = Conditions.condition_trim_punctuation(
         None, mock, "Rockefeller, John D., 1893-, ", None, None
     )
     res3 = Conditions.condition_trim_punctuation(None, mock, "Rockefeller, John.  ", None, None)
+    res4 = Conditions.condition_trim_punctuation(None, mock, "Rockefeller, John D.,", None, None)
     assert res == "Rockefeller, John D."
     assert res2 == "Rockefeller, John D., 1893-"
     assert res3 == "Rockefeller, John"
+    assert res4 == "Rockefeller, John D."
 
 
 def test_condition_concat_subfields_by_name():