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

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

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

Log Message:
-----------
a missing test child node could be signaled after the root element of the control document has been visited

Modified Paths:
--------------
    trunk/xmlunit/src/main/java-legacy/org/custommonkey/xmlunit/NewDifferenceEngine.java
    trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java
    trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Difference.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-13 10:41:11 UTC (rev 467)
+++ trunk/xmlunit/src/main/java-legacy/org/custommonkey/xmlunit/NewDifferenceEngine.java	2010-09-13 10:46:07 UTC (rev 468)
@@ -348,6 +348,12 @@
         }
         if ((comparison.getType() == ComparisonType.CHILD_NODELIST_LENGTH
              && comparison.getControlDetails().getTarget() instanceof Document)
+            ||
+            (comparison.getType() == ComparisonType.CHILD_LOOKUP
+             && comparison.getTestDetails() != null
+             && comparison.getTestDetails().getTarget() instanceof Node
+             && ((Node) comparison.getTestDetails().getTarget()).getParentNode()
+                instanceof Document)
             || checkPrelude.shouldSkip()
             ) {
             return true;

Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java
===================================================================
--- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java	2010-09-13 10:41:11 UTC (rev 467)
+++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Diff.java	2010-09-13 10:46:07 UTC (rev 468)
@@ -1,6 +1,6 @@
 /*
 ******************************************************************
-Copyright (c) 2001-2008, Jeff Martin, Tim Bacon
+Copyright (c) 2001-2008,2010 Jeff Martin, Tim Bacon
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -963,5 +963,19 @@
                                         ElementNameAndAttributeQualifier());
         assertTrue(diff.toString(), diff.similar());
     }
+
+    public void testCocoonXmlTestCase() throws Exception {
+        Document control =
+            XMLUnit.buildTestDocument("<!DOCTYPE skinconfig []>"
+                                      + "<!--abcd--><root></root>");
+        Document test =
+            XMLUnit.buildControlDocument("<!DOCTYPE skinconfig [<!--abcd-->]>"
+                                         + "<root></root>");
+        Diff diff = new Diff(control, test);
+        assertTrue(diff.toString(), diff.identical());
+
+        diff = new Diff(test, control);
+        assertTrue(diff.toString(), diff.identical());
+    }
 }
 

Modified: trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Difference.java
===================================================================
--- trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Difference.java	2010-09-13 10:41:11 UTC (rev 467)
+++ trunk/xmlunit/src/tests/java-legacy/org/custommonkey/xmlunit/test_Difference.java	2010-09-13 10:46:07 UTC (rev 468)
@@ -1,6 +1,6 @@
 /*
 ******************************************************************
-Copyright (c) 2001-2009, Jeff Martin, Tim Bacon
+Copyright (c) 2001-2010, Jeff Martin, Tim Bacon
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without


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