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

unittests/test_apiutils.py

@@ -121,6 +121,8 @@ def test_compare_entities():
     r2.add_property("entity_mix_e", value=db.Entity(id=2))
     r1.add_property("entity_mix_d", value=22)
     r2.add_property("entity_mix_d", value=db.Entity(id=2))
+    r1.add_property("entity_mix_w", value=22)
+    r2.add_property("entity_mix_w", value=db.Entity())
     r1.add_property("entity_Ent_e", value=db.Entity(id=2))
     r2.add_property("entity_Ent_e", value=db.Entity(id=2))
     r1.add_property("entity_Ent_d", value=db.Entity(id=2))
@@ -130,8 +132,8 @@ def test_compare_entities():
 
     assert len(diff_r1["parents"]) == 1
     assert len(diff_r2["parents"]) == 0
-    assert len(diff_r1["properties"]) == 10
-    assert len(diff_r2["properties"]) == 10
+    assert len(diff_r1["properties"]) == 11
+    assert len(diff_r2["properties"]) == 11
 
     assert "test" not in diff_r1["properties"]
     assert "test" not in diff_r2["properties"]
@@ -163,6 +165,8 @@ def test_compare_entities():
 
     assert "entity_mix_d" in diff_r1["properties"]
     assert "entity_mix_d" in diff_r2["properties"]
+    assert "entity_mix_w" in diff_r1["properties"]
+    assert "entity_mix_w" in diff_r2["properties"]
     assert "entity_Ent_d" in diff_r1["properties"]
     assert "entity_Ent_d" in diff_r2["properties"]
 
@@ -170,14 +174,16 @@ def test_compare_entities():
 
     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 len(diff_r1["properties"]) == 10
+    assert len(diff_r2["properties"]) == 10
 
     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_mix_w" in diff_r1["properties"]
+    assert "entity_mix_w" in diff_r2["properties"]
     assert "entity_Ent_e" not in diff_r1["properties"]
     assert "entity_Ent_e" not in diff_r2["properties"]