X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphComparator.java;h=9f14ecdebe6fdc75dd76f377fc472e0818731cfa;hb=6dc3a67a70066b374abba65faafca54db79991f6;hp=6f8c4d1b15e13d10a652dac5551abbb7d0a329e1;hpb=c2a5b7657db18e6de715f9559ddc4335b953f203;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 6f8c4d1..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,16 +711,20 @@ public class GraphComparator { if (leftPath.getLength() != rightPath.getLength()) continue; if (comparableResources.contains(leftPath.getEnd(), rightPath.getEnd())) { - boolean preds = true; + 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())) { - preds = false; + match = false; + break; + } + if ((getComparableResources().containsLeft(sl.getObject()) || getComparableResources().containsRight(sr.getObject())) && !getComparableResources().contains(sl.getObject(), sr.getObject())) { + match = false; break; } } - if (preds) { + if (match) { map.map(leftPath, rightPath); break; }