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

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

Revision: 477
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=477&view=rev
Author:   bodewig
Date:     2010-09-14 10:23:36 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
the legacy DifferenceEngine doesn't only match Elements

Modified Paths:
--------------
    trunk/xmlunit/src/main/java-legacy/org/custommonkey/xmlunit/NewDifferenceEngine.java
    trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_NewDifferenceEngine.java

Modified: trunk/xmlunit/src/main/java-legacy/org/custommonkey/xmlunit/NewDifferenceEngine.java
===================================================================
--- trunk/xmlunit/src/main/java-legacy/org/custommonkey/xmlunit/NewDifferenceEngine.java	2010-09-14 10:10:30 UTC (rev 476)
+++ trunk/xmlunit/src/main/java-legacy/org/custommonkey/xmlunit/NewDifferenceEngine.java	2010-09-14 10:23:36 UTC (rev 477)
@@ -547,12 +547,11 @@
             for (Node n : controlNodes) {
                 if (map.containsKey(n)) {
                     result.add(new Entry(n, map.get(n)));
-                } else if (n instanceof Element) {
+                } else {
                     Iterable<Node> unmatchedTestElements =
                         Linqy.filter(testNodes, new Linqy.Predicate<Node>() {
                                 public boolean matches(Node t) {
-                                    return t instanceof Element
-                                        && !map.containsValue(t);
+                                    return !map.containsValue(t);
                                 }
                             });
                     Iterator<Node> it = unmatchedTestElements.iterator();

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-14 10:10:30 UTC (rev 476)
+++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_NewDifferenceEngine.java	2010-09-14 10:23:36 UTC (rev 477)
@@ -205,9 +205,8 @@
         listenToDifferences(control, test);
         assertEquals("11th control xpath", "/stuff[1]/list[1]/item[1]", 
                      listener.controlXpath);
-        // this is different from DifferenceEngine - the test node is null
-        // if there is no match
-        assertNull("11th test xpath", listener.testXpath);
+        assertEquals("11th test xpath", "/stuff[1]/list[1]/text()[1]", 
+                     listener.testXpath);       
     }
 
     public void testXpathLocation12() throws Exception {
@@ -227,13 +226,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 PI in test
+        // mutiple Differences, we only see the last one, missing second element
         assertEquals("13 difference type",
                      DifferenceConstants.CHILD_NODE_NOT_FOUND_ID,
                      listener.comparingWhat);
-        assertNull("13th control xpath", listener.controlXpath);
-        assertEquals("13th test xpath", "/stuff[1]/processing-instruction()[1]", 
-                     listener.testXpath);
+        assertEquals("13th control xpath", "/stuff[1]/item[2]", 
+                     listener.controlXpath);
+        assertNull("13th test xpath", 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.