SF.net SVN: xmlunit:[474] trunk/xmlunit/src

[<bo...@us...>]

Revision: 474
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=474&view=rev
Author:   bodewig
Date:     2010-09-14 07:26:52 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
minor cleanup

Modified Paths:
--------------
    trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs
    trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_DetailedDiff.java

Modified: trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs
===================================================================
--- trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs	2010-09-14 06:55:50 UTC (rev 473)
+++ trunk/xmlunit/src/main/net-core/diff/AbstractDifferenceEngine.cs	2010-09-14 07:26:52 UTC (rev 474)
@@ -26,8 +26,7 @@
         public event ComparisonListener MatchListener;
         public event ComparisonListener DifferenceListener;
 
-        private INodeMatcher nodeMatcher =
-            new DefaultNodeMatcher(ElementSelectors.Default);
+        private INodeMatcher nodeMatcher = new DefaultNodeMatcher();
         public virtual INodeMatcher NodeMatcher {
             set {
                 if (value == null) {

Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_DetailedDiff.java
===================================================================
--- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_DetailedDiff.java	2010-09-14 06:55:50 UTC (rev 473)
+++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_DetailedDiff.java	2010-09-14 07:26:52 UTC (rev 474)
@@ -417,15 +417,13 @@
             assertEquals("/Fruits[1]",
                          diff.getTestNodeDetail().getXpathLocation());
 
-            // didn't find the second Apple element
-            diff = (Difference) l.get(3);
-            assertEquals(DifferenceConstants.CHILD_NODE_NOT_FOUND_ID,
-                         diff.getId());
-            assertEquals("Apple", diff.getControlNodeDetail().getValue());
-            assertEquals("null", diff.getTestNodeDetail().getValue());
-            assertEquals("/Fruits[1]/Apple[2]",
+            // Banana is the third child in control but the second one in test
+            diff = (Difference) l.get(1);
+            assertEquals("2", diff.getControlNodeDetail().getValue());
+            assertEquals("1", diff.getTestNodeDetail().getValue());
+            assertEquals("/Fruits[1]/Banana[1]",
                          diff.getControlNodeDetail().getXpathLocation());
-            assertEquals(null,
+            assertEquals("/Fruits[1]/Banana[1]",
                          diff.getTestNodeDetail().getXpathLocation());
 
             // Banana's size attribute doesn't match
@@ -439,14 +437,17 @@
             assertEquals("/Fruits[1]/Banana[1]/@size",
                          diff.getTestNodeDetail().getXpathLocation());
 
-            // Banana is the third child in control but the second one in test
-            diff = (Difference) l.get(1);
-            assertEquals("2", diff.getControlNodeDetail().getValue());
-            assertEquals("1", diff.getTestNodeDetail().getValue());
-            assertEquals("/Fruits[1]/Banana[1]",
+            // didn't find the second Apple element
+            diff = (Difference) l.get(3);
+            assertEquals(DifferenceConstants.CHILD_NODE_NOT_FOUND_ID,
+                         diff.getId());
+            assertEquals("Apple", diff.getControlNodeDetail().getValue());
+            assertEquals("null", diff.getTestNodeDetail().getValue());
+            assertEquals("/Fruits[1]/Apple[2]",
                          diff.getControlNodeDetail().getXpathLocation());
-            assertEquals("/Fruits[1]/Banana[1]",
+            assertEquals(null,
                          diff.getTestNodeDetail().getXpathLocation());
+
         } finally {
             XMLUnit.clearCompareUnmatched();
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.