From feaa8fe27bcc20ae35b40d9e4691a7f29efeba0f Mon Sep 17 00:00:00 2001 From: luukkainen Date: Mon, 10 Oct 2016 12:57:41 +0000 Subject: [PATCH] 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 --- org.simantics.interop/graph.tg | Bin 2415 -> 2415 bytes .../interop/test/GraphComparator.java | 6 ++++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/org.simantics.interop/graph.tg b/org.simantics.interop/graph.tg index 8e104bc646ecaf7c615629b8d236baa394b90349..1a9703033a41fca525a444577e186c023895b029 100644 GIT binary patch delta 66 zcmaDa^j>I#IlG_=0|SFJ5bFW4IS{LE_F&g%WaOEAgF}Aubq;~a$ANe|5HAPf=|J4h MA;2g<`3FZi0Q46S;s5{u delta 66 zcmaDa^j>I#IlG`L0|SFJ5bFW4IS{LC_F&g%WR#zLgF}Aubq;~a$ANe|5HAPf=|J4h MA;8Ep`3FZi0QO-J;s5{u 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 72a975f..0f61e5d 100644 --- 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 { */ private void compareProps(Resource r1, Resource r2) throws DatabaseException { if (DEBUG) System.out.println("compareProps " + r1 + " " + NameUtils.getSafeName(g, r1) + " " + r2 + " " + NameUtils.getSafeName(g, r2)); - ArrayList ss1 = new ArrayList(); - ArrayList ss2 = new ArrayList(); + List ss1 = new ArrayList(); + List ss2 = new ArrayList(); ss1.addAll(g.getStatements(r1, b.HasProperty)); ss2.addAll(g.getStatements(r2, b.HasProperty)); + ss1 = filterNonTested(ss1); + ss2 = filterNonTested(ss2); sortStatement(ss1, ss2); int i1 = 0; -- 2.45.2