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=8ce5a9d66c0b4248a8c3b496bc8ce88e8a16cff3;hb=eb02811bb777a87c279370f42e9a1b68d2de7314;hp=82320753c7a8eb81e8e1473b1b95954838e6d475;hpb=752a36aca7c905ac07f65799509925e4cb252ab1;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 8232075..8ce5a9d 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -790,6 +790,14 @@ public class GraphComparator {
 		return new GraphChanges(r1,r2,changes1,changes2,modifications,comparableResources);
 	}
 	
+	public List<Statement> getChanges1() {
+		return changes1;
+	}
+	
+	public List<Statement> getChanges2() {
+		return changes2;
+	}
+	
 	private void addComparable(Statement left, Statement right) throws DatabaseException {
 		addComparable(left.getObject(), right.getObject());
 		comparableStatements.map(left, right);
@@ -826,7 +834,7 @@ public class GraphComparator {
 				out.add(s);
 			else {
 				boolean has = false;
-				if (i > 1 && in.get(i-1).getPredicate().equals(s.getPredicate()))
+				if (i > 0 && in.get(i-1).getPredicate().equals(s.getPredicate()))
 					has = true;
 				else if (i < in.size()-1 && in.get(i+1).getPredicate().equals(s.getPredicate()))
 					has = true;
@@ -834,11 +842,6 @@ public class GraphComparator {
 					out.add(s);
 			}
 			
-		}
-		for (Statement s : in) {
-			if (!s.isAsserted(r))
-				out.add(s);
-			
 		}
 		return out;
 	}
@@ -1294,14 +1297,18 @@ public class GraphComparator {
 				}
 				case -1:{
 					if (DEBUG) System.out.println("Compare Prop diff1s " + printStatement(g,s1));
-					addDeletion(s1);
+					// Use modification, since deletions do not support asserted statements
+					addModification(r1,s1,r2,null);
+					//addDeletion(s1);
 					i1++;
 					break;
 				}
 					
 				case 1:{
 					if (DEBUG) System.out.println("Compare Prop diff2s " + printStatement(g,s2));
-					addAddition(s2);
+					// Use modification, since additions do not support asserted statements
+					addModification(r1,null,r2,s2);
+					//addAddition(s2);
 					i2++;
 					break;
 				}