From f8ad701cccf1d905c0930c8eab8cc0652e398087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Wed, 30 Oct 2024 11:41:57 +0100
Subject: [PATCH] TST: fix tests where they assumed that entity a is changed
when values are considered equal
---
unittests/test_apiutils.py | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py
index 6f80f1df..fe2155e5 100644
--- a/unittests/test_apiutils.py
+++ b/unittests/test_apiutils.py
@@ -595,13 +595,12 @@ def test_merge_id_with_resolved_entity():
# Overwrite from right to left in both cases
merge_entities(recA, recB, merge_id_with_resolved_entity=True)
- assert recA.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
recA = db.Record().add_property(name=rtname, value=ref_rec)
merge_entities(recB, recA, merge_id_with_resolved_entity=True)
- assert recB.get_property(rtname).value == ref_rec
- assert recA.get_property(rtname).value == recB.get_property(rtname).value
+ assert recB.get_property(rtname).value == ref_id
+ assert recA.get_property(rtname).value == ref_rec
# id mismatches
recB = db.Record().add_property(name=rtname, value=ref_id*2)
@@ -620,5 +619,5 @@ def test_merge_id_with_resolved_entity():
recB = db.Record().add_property(
name=rtname, datatype=db.LIST(rtname), value=[ref_id, ref_id*2])
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 == recB.get_property(rtname).value
+ assert recA.get_property(rtname).value == [ref_rec, ref_id*2]
+ assert recB.get_property(rtname).value == [ref_id, ref_id*2]
--
GitLab