add tests and small merge improvements

scripts/merge.py

@@ -18,6 +18,9 @@ def __eq__(self, other):
     def __str__(self):
         return f"{self.key_name}: append {dict(self.list_item)}"
 
+    def __repr__(self):
+        return f"Append({self.key_name}, {self.list_item})"
+
 
 class Replace:
     def __init__(self, key_name, value_one, value_two):
@@ -35,6 +38,9 @@ def __eq__(self, other):
     def __str__(self):
         return f"{self.key_name}: {self.value_one} => {self.value_two}"
 
+    def __repr__(self):
+        return f"Append({self.key_name}, {self.value_one}, {self.value_two})"
+
 
 def compute_merge(obj1, obj2, prefix="", keep_both_ids=False):
     combined_keys = set(obj1) | set(obj2)

scripts/tests/test_merge.py

@@ -55,6 +55,31 @@ def test_compute_merge_list(a, b, output):
     assert compute_merge(a, b) == output
 
 
+@pytest.mark.parametrize(
+    "a, b, keep_both, output",
+    [
+        # discard id
+        ({"id": "1"}, {"id": "2"}, False, []),
+        # keep id
+        (
+            {"id": "1"},
+            {"id": "2"},
+            True,
+            [Append("other_identifiers", {"identifier": "2", "scheme": "openstates"})],
+        ),
+        # append name
+        (
+            {"name": "A"},
+            {"name": "B"},
+            True,
+            [Append("other_names", {"name": "A"}), Replace("name", "A", "B")],
+        ),
+    ],
+)
+def test_compute_merge_special_cases(a, b, keep_both, output):
+    assert compute_merge(a, b, keep_both_ids=keep_both) == output
+
+
 @pytest.mark.parametrize(
     "old, new, expected",
     [