Use nonTested filter with property comparison

fixes #6749

git-svn-id: https://www.simantics.org/svn/simantics/interoperability/trunk@33320 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.interop/graph.tg b/org.simantics.interop/graph.tg
index 8e104bc646ecaf7c615629b8d236baa394b90349..1a9703033a41fca525a444577e186c023895b029 100644 (file)
Binary files a/org.simantics.interop/graph.tg and b/org.simantics.interop/graph.tg differ

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 72a975f790789e1d3f2971683b4fed07fd15a9fd..0f61e5d523fd7447b81ae733fb19ece42f2b7997 100644 (file)
--- a/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
+++ b/org.simantics.interop/src/org/simantics/interop/test/GraphComparator.java
@@ -1063,10 +1063,12 @@ public class GraphComparator {
         */\r
        private void compareProps(Resource r1, Resource r2) throws DatabaseException {\r
                if (DEBUG) System.out.println("compareProps " + r1 + " " + NameUtils.getSafeName(g, r1) + " " + r2 + " " + NameUtils.getSafeName(g, r2));\r
-               ArrayList<Statement> ss1 = new ArrayList<Statement>();\r
-               ArrayList<Statement> ss2 = new ArrayList<Statement>();\r
+               List<Statement> ss1 = new ArrayList<Statement>();\r
+               List<Statement> ss2 = new ArrayList<Statement>();\r
                ss1.addAll(g.getStatements(r1, b.HasProperty));\r
                ss2.addAll(g.getStatements(r2, b.HasProperty));\r
+               ss1 = filterNonTested(ss1);\r
+               ss2 = filterNonTested(ss2);\r
                sortStatement(ss1, ss2);\r
                \r
                int i1 = 0; \r