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

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

Revision: 466
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=466&view=rev
Author:   bodewig
Date:     2010-09-13 09:49:28 +0000 (Mon, 13 Sep 2010)

Log Message:
-----------
DIFFERENT is different enough to make nodes not match

Modified Paths:
--------------
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml
    trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml
    trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_NewDifferenceEngine.java

Modified: trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml
===================================================================
--- trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml	2010-09-13 08:29:05 UTC (rev 465)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml	2010-09-13 09:49:28 UTC (rev 466)
@@ -484,7 +484,7 @@
             compareDontFire(new Comparison(ComparisonType.NODE_TYPE,
                                            n1, null, n1.getNodeType(),
                                            n2, null, n2.getNodeType()));
-        return r != ComparisonResult.CRITICAL;
+        return r != ComparisonResult.CRITICAL && r != ComparisonResult.DIFFERENT;
     }
 
     private class Match {

Modified: trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml
===================================================================
--- trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml	2010-09-13 08:29:05 UTC (rev 465)
+++ trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml	2010-09-13 09:49:28 UTC (rev 466)
@@ -515,7 +515,8 @@
                 CompareDontFire(new Comparison(ComparisonType.NODE_TYPE,
                                                n1, null, n1.NodeType,
                                                n2, null, n2.NodeType));
-            return r != ComparisonResult.CRITICAL;
+            return r != ComparisonResult.CRITICAL
+                && r != ComparisonResult.DIFFERENT;
         }
 
         internal class Match {

Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_NewDifferenceEngine.java
===================================================================
--- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_NewDifferenceEngine.java	2010-09-13 08:29:05 UTC (rev 465)
+++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_NewDifferenceEngine.java	2010-09-13 09:49:28 UTC (rev 466)
@@ -227,13 +227,13 @@
         String control = "<stuff><item id=\"1\"/><item id=\"2\"/></stuff>";
         String test = "<stuff><?item data?></stuff>";
         listenToDifferences(control, test);
-        // mutiple Differences, we only see the last one, missing second element
+        // mutiple Differences, we only see the last one, missing PI in test
         assertEquals("13 difference type",
                      DifferenceConstants.CHILD_NODE_NOT_FOUND_ID,
                      listener.comparingWhat);
-        assertEquals("13th control xpath", "/stuff[1]/item[2]", 
-                     listener.controlXpath);
-        assertNull("13th test xpath", listener.testXpath);
+        assertNull("13th control xpath", listener.controlXpath);
+        assertEquals("13th test xpath", "/stuff[1]/processing-instruction()[1]", 
+                     listener.testXpath);
     }
 
     public void testXpathLocation14() throws Exception {


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