Skip to content
Snippets Groups Projects
Commit f8ad701c authored by Henrik tom Wörden's avatar Henrik tom Wörden Committed by I. Nüske
Browse files

TST: fix tests where they assumed that entity a is changed when values are considered equal

parent af946269
Branches
Tags
2 merge requests!159Release 0.16.o,!155Review filter lists and compare_entities
...@@ -595,13 +595,12 @@ def test_merge_id_with_resolved_entity(): ...@@ -595,13 +595,12 @@ def test_merge_id_with_resolved_entity():
# Overwrite from right to left in both cases # Overwrite from right to left in both cases
merge_entities(recA, recB, merge_id_with_resolved_entity=True) merge_entities(recA, recB, merge_id_with_resolved_entity=True)
assert recA.get_property(rtname).value == ref_id assert recA.get_property(rtname).value == ref_rec
assert recA.get_property(rtname).value == recB.get_property(rtname).value
recA = db.Record().add_property(name=rtname, value=ref_rec) recA = db.Record().add_property(name=rtname, value=ref_rec)
merge_entities(recB, recA, merge_id_with_resolved_entity=True) merge_entities(recB, recA, merge_id_with_resolved_entity=True)
assert recB.get_property(rtname).value == ref_rec assert recB.get_property(rtname).value == ref_id
assert recA.get_property(rtname).value == recB.get_property(rtname).value assert recA.get_property(rtname).value == ref_rec
# id mismatches # id mismatches
recB = db.Record().add_property(name=rtname, value=ref_id*2) recB = db.Record().add_property(name=rtname, value=ref_id*2)
...@@ -620,5 +619,5 @@ def test_merge_id_with_resolved_entity(): ...@@ -620,5 +619,5 @@ def test_merge_id_with_resolved_entity():
recB = db.Record().add_property( recB = db.Record().add_property(
name=rtname, datatype=db.LIST(rtname), value=[ref_id, ref_id*2]) name=rtname, datatype=db.LIST(rtname), value=[ref_id, ref_id*2])
merge_entities(recA, recB, merge_id_with_resolved_entity=True) merge_entities(recA, recB, merge_id_with_resolved_entity=True)
assert recA.get_property(rtname).value == [ref_id, ref_id*2] assert recA.get_property(rtname).value == [ref_rec, ref_id*2]
assert recA.get_property(rtname).value == recB.get_property(rtname).value assert recB.get_property(rtname).value == [ref_id, ref_id*2]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment