Merge branch 'f-test-merge' into f-review-lists-and-compare

unittests/test_apiutils.py

@@ -166,6 +166,27 @@ def test_compare_entities():
     assert "entity_Ent_d" in diff_r1["properties"]
     assert "entity_Ent_d" in diff_r2["properties"]
 
+    diff_r1, diff_r2 = compare_entities(r1, r2, compare_referenced_records=True)
+
+    assert len(diff_r1["parents"]) == 1
+    assert len(diff_r2["parents"]) == 0
+    assert len(diff_r1["properties"]) == 9
+    assert len(diff_r2["properties"]) == 9
+
+    assert "entity_id" in diff_r1["properties"]
+    assert "entity_id" in diff_r2["properties"]
+
+    assert "entity_mix_e" in diff_r1["properties"]
+    assert "entity_mix_e" in diff_r2["properties"]
+    assert "entity_Ent_e" not in diff_r1["properties"]
+    assert "entity_Ent_e" not in diff_r2["properties"]
+
+    assert "entity_mix_d" in diff_r1["properties"]
+    assert "entity_mix_d" in diff_r2["properties"]
+    assert "entity_Ent_d" in diff_r1["properties"]
+    assert "entity_Ent_d" in diff_r2["properties"]
+
+
 def test_compare_entities_units():
     r1 = db.Record()
     r2 = db.Record()
@@ -786,8 +807,6 @@ B: something else"""
     # unchanged
     assert recB.get_property("propA").unit == "cm"
 
-
-
     # test whether an id is correctly overwritten by an entity without id
     recA = db.Record().add_parent("A").add_property(name="B", value=112)
     newRec = db.Record().add_parent("B").add_property("c")