JENA-808 : correct order of assertIsomorphic arguments. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/7c987169 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/7c987169 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/7c987169
Branch: refs/heads/hadoop-rdf Commit: 7c987169f3dc49480a872f075e61ace1d7694775 Parents: 9e69b39 Author: Andy Seaborne <[email protected]> Authored: Fri Nov 21 13:24:09 2014 +0000 Committer: Andy Seaborne <[email protected]> Committed: Fri Nov 21 13:24:09 2014 +0000 ---------------------------------------------------------------------- .../jena/graph/compose/test/TestDifference.java | 60 ++++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/7c987169/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java ---------------------------------------------------------------------- diff --git a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java index 0da6e70..6b08b6c 100755 --- a/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java +++ b/jena-core/src/test/java/com/hp/hpl/jena/graph/compose/test/TestDifference.java @@ -37,79 +37,79 @@ public class TestDifference extends TestDyadic Graph gBase = graphWith( "" ), g1 = graphWith( "" ); return new Difference( gBase, g1 ); } - + public Difference differenceOf(String s1, String s2) { return new Difference( graphWith( s1 ), graphWith( s2 ) ); } public void testStaticDifference() { - assertIsomorphic( differenceOf( "", "" ), graphWith( "" ) ); - assertIsomorphic( differenceOf( "x R y", "" ), graphWith( "x R y" ) ); - assertIsomorphic( differenceOf( "", "x R y" ), graphWith( "" ) ); - assertIsomorphic( differenceOf( "x R y", "x R y" ), graphWith( "" ) ); - assertIsomorphic( differenceOf( "x R y; p R q", "r A s; x R y" ), graphWith( "p R q" ) ); + assertIsomorphic( graphWith( "" ), differenceOf( "", "" ) ); + assertIsomorphic( graphWith( "x R y" ), differenceOf( "x R y", "" ) ); + assertIsomorphic( graphWith( "" ), differenceOf( "", "x R y" ) ); + assertIsomorphic( graphWith( "" ), differenceOf( "x R y", "x R y" ) ); + assertIsomorphic( graphWith( "p R q" ), differenceOf( "x R y; p R q", "r A s; x R y" ) ); } public void testDifferenceReflectsChangesToOperands() { Graph l = graphWith( "x R y" ); Graph r = graphWith( "x R y" ); Difference diff = new Difference( l, r ); - assertIsomorphic( diff, graphWith( "" ) ); + assertIsomorphic(graphWith( "" ), diff); r.delete( triple( "x R y" ) ); - assertIsomorphic( diff, graphWith( "x R y" ) ); + assertIsomorphic( graphWith( "x R y" ), diff ); l.add( triple( "x R z" ) ); - assertIsomorphic( diff, graphWith( "x R y; x R z" ) ); + assertIsomorphic( graphWith( "x R y; x R z" ), diff ); r.add( triple( "x R z" ) ); - assertIsomorphic( diff, graphWith( "x R y" ) ); + assertIsomorphic( graphWith( "x R y" ), diff ); } public void testAdd() { Graph l = graphWith( "x R y" ); Graph r = graphWith( "x R y; x R z" ); Difference diff = new Difference( l, r ); - assertIsomorphic( diff, graphWith( "" ) ); + assertIsomorphic( graphWith( "" ), diff ); // case 1: add to the left operand diff.add( triple( "p S q" ) ); - assertIsomorphic( diff, graphWith( "p S q" ) ); - assertIsomorphic( l, graphWith( "x R y; p S q" ) ); - assertIsomorphic( r, graphWith( "x R y; x R z" ) ); + assertIsomorphic( graphWith( "p S q" ), diff ); + assertIsomorphic( graphWith( "x R y; p S q" ), l ); + assertIsomorphic( graphWith( "x R y; x R z" ), r ); // case 2: remove from the right, and add to the left operand diff.add( triple( "x R z" ) ); - assertIsomorphic( diff, graphWith( "x R z; p S q" ) ); - assertIsomorphic( l, graphWith( "x R y; x R z; p S q" ) ); - assertIsomorphic( r, graphWith( "x R y" ) ); + assertIsomorphic( graphWith( "x R z; p S q" ), diff ); + assertIsomorphic( graphWith( "x R y; x R z; p S q" ), l ); + assertIsomorphic( graphWith( "x R y" ), r ); // case 3: remove from the right operand diff.add( triple( "x R y" ) ); - assertIsomorphic( diff, graphWith( "x R y; x R z; p S q" ) ); - assertIsomorphic( l, graphWith( "x R y; x R z; p S q" ) ); - assertIsomorphic( r, graphWith( "" ) ); + assertIsomorphic( graphWith( "x R y; x R z; p S q" ), diff ); + assertIsomorphic( graphWith( "x R y; x R z; p S q" ), l ); + assertIsomorphic( graphWith( "" ), r ); } public void testDelete() { Graph l = graphWith( "x R y; x R z" ); Graph r = graphWith( "x R y" ); Difference diff = new Difference( l, r ); - assertIsomorphic( diff, graphWith( "x R z" ) ); + assertIsomorphic( graphWith( "x R z" ), diff ); // case 1: remove non-existent triple is a no-op diff.delete( triple( "p S q" ) ); - assertIsomorphic( diff, graphWith( "x R z" ) ); - assertIsomorphic( l, graphWith( "x R y; x R z" ) ); - assertIsomorphic( r, graphWith( "x R y" ) ); + assertIsomorphic( graphWith( "x R z" ), diff ); + assertIsomorphic( graphWith( "x R y; x R z" ), l ); + assertIsomorphic( graphWith( "x R y" ), r ); // case 2: remove triple that exists in both - removes from left diff.delete( triple( "x R y" ) ); - assertIsomorphic( diff, graphWith( "x R z" ) ); - assertIsomorphic( l, graphWith( "x R z" ) ); - assertIsomorphic( r, graphWith( "x R y" ) ); + assertIsomorphic( graphWith( "x R z" ), diff ); + assertIsomorphic( graphWith( "x R z" ), l ); + assertIsomorphic( graphWith( "x R y" ), r ); // case 3: remove triple that exists in left is removed diff.delete( triple( "x R z" ) ); - assertIsomorphic( diff, graphWith( "" ) ); - assertIsomorphic( l, graphWith( "" ) ); - assertIsomorphic( r, graphWith( "x R y" ) ); + assertIsomorphic( graphWith( "" ), diff ); + assertIsomorphic( graphWith( "" ), l ); + assertIsomorphic( graphWith( "x R y" ), r ); } }
