X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparator.java;h=9f14ecdebe6fdc75dd76f377fc472e0818731cfa;hb=6dc3a67a70066b374abba65faafca54db79991f6;hp=ba9bdf099397a90a8a2bc423c26d24354a29a2bf;hpb=894fd479af4bd23016e38165b8ba3d6235d27125;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
index ba9bdf0..9f14ecd 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -711,8 +711,23 @@ public class GraphComparator {
 				if (leftPath.getLength() != rightPath.getLength())
 					continue;
 				if (comparableResources.contains(leftPath.getEnd(), rightPath.getEnd())) {
-					map.map(leftPath, rightPath);
-					break;
+					boolean match = true;
+					for (int i = 0; i < leftPath.getLength(); i++) {
+						Statement sl = leftPath.getStatements().get(i);
+						Statement sr = rightPath.getStatements().get(i);
+						if (!sl.getPredicate().equals(sr.getPredicate()) && !comparableResources.contains(sl.getPredicate(), sr.getPredicate())) {
+							match = false;
+							break;
+						}
+						if ((getComparableResources().containsLeft(sl.getObject()) || getComparableResources().containsRight(sr.getObject())) && !getComparableResources().contains(sl.getObject(), sr.getObject())) {
+							match = false;
+							break;
+						}
+					}
+					if (match) {
+						map.map(leftPath, rightPath);
+						break;
+					}
 				}
 			}
 		}