X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.interop%2Fsrc%2Forg%2Fsimantics%2Finterop%2Ftest%2FGraphChanges.java;h=a68890651f2a38b522ce6ef13066f7b5df89a8fe;hb=e334209213fe36fd7b4f209fa41a15f1e3b9c751;hp=48f43596fe0ce69cd82f85af2a917f31f8b7a247;hpb=328e8a54d282ed4a390e6eb9eda027b3ed599bdf;p=simantics%2Finterop.git

diff --git a/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java b/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java
index 48f4359..a688906 100644
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphChanges.java
@@ -83,6 +83,12 @@ public class GraphChanges {
 			this.rightStm = rightStm;
 		}
 		
+		public Resource getPredicate() {
+		    if (leftStm != null)
+		        return leftStm.getPredicate();
+		    return rightStm.getPredicate();
+		}
+		
 		@Override
 		public boolean equals(Object obj) {
 			if (obj.getClass() != this.getClass())
@@ -151,38 +157,63 @@ public class GraphChanges {
 		StringBuilder sb = new StringBuilder();
 		sb.append("Del:\n");
 		for (Statement stm : deletions) {
-			sb.append(NameUtils.getSafeName(graph, stm.getSubject()) + " "+
-    						   NameUtils.getSafeName(graph, stm.getPredicate()) + " " +
-    						   NameUtils.getSafeName(graph, stm.getObject()) + " (" +
-    						   stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject() + ")\n");
+			sb.append(toString(graph, stm));
+			sb.append("\n");
     	}
 		sb.append("Add:\n");
 		for (Statement stm : additions) {
-			sb.append(NameUtils.getSafeName(graph, stm.getSubject()) + " "+
-					   NameUtils.getSafeName(graph, stm.getPredicate()) + " " +
-				   NameUtils.getSafeName(graph, stm.getObject()) + " (" +
-				   stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject() + ")\n");
+			sb.append(toString(graph, stm));
+			sb.append("\n");
     	}
 		sb.append("Mod:\n");
 		for (Modification mod :modifications) {
-			{
-				Statement stm = mod.getLeftStm();
+			sb.append(toString(graph, mod));
+			sb.append("\n");
+    	}
+		return sb.toString();
+	}
+	
+	public static String toString(ReadGraph graph, Statement stm) throws DatabaseException{
+		return NameUtils.getSafeName(graph, stm.getSubject()) + " "+
+				   NameUtils.getSafeName(graph, stm.getPredicate()) + " " +
+			   NameUtils.getSafeName(graph, stm.getObject()) + " (" +
+			   stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject();
+	}
+	
+	public static String toString(ReadGraph graph, Modification mod) throws DatabaseException{
+		StringBuilder sb = new StringBuilder();
+		{
+			Statement stm = mod.getLeftStm();
+			if (stm != null) {
 				sb.append(NameUtils.getSafeName(graph, mod.getLeftSub()) + " "+
 						   NameUtils.getSafeName(graph, stm.getPredicate()) + " " +
-					   NameUtils.getSafeName(graph, stm.getObject()) + " (" +
-					   stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject() + ")\n");
+						   truncate(NameUtils.getSafeName(graph, stm.getObject())) + " (" +
+						   mod.getLeftSub() + " " + stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject() + ")\n");
+			} else {
+				sb.append(NameUtils.getSafeName(graph, mod.getLeftSub()) + " "+  mod.getLeftSub() + " N/A\n");
 			}
-			{
-				Statement stm = mod.getRightStm();
+		}
+		{
+			Statement stm = mod.getRightStm();
+			if (stm != null) {
 				sb.append(NameUtils.getSafeName(graph, mod.getRightSub()) + " "+
 						   NameUtils.getSafeName(graph, stm.getPredicate()) + " " +
-					   NameUtils.getSafeName(graph, stm.getObject()) + " (" +
-					   stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject() + ")\n");
+						   truncate(NameUtils.getSafeName(graph, stm.getObject())) + " (" +
+						   mod.getRightSub() + " " + stm.getSubject() + " " +stm.getPredicate() + " " + stm.getObject() + ")");
+			} else {
+				sb.append(NameUtils.getSafeName(graph, mod.getRightSub()) + " "+  mod.getRightSub() + " N/A");
 			}
-    	}
+			
+		}
 		return sb.toString();
 	}
 	
+	public static String truncate(String s) {
+		if (s.length() < 100)
+			return s;
+		return s.substring(0, 100)+"...";
+	}
+	
 	public String comparableToString(ReadGraph graph) throws DatabaseException {
 		StringBuilder sb = new StringBuilder();
 		sb.append("Comparable:\n");