SF.net SVN: xmlunit:[448] trunk/xmlunit/src/main

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

Revision: 448
          http://xmlunit.svn.sourceforge.net/xmlunit/?rev=448&view=rev
Author:   bodewig
Date:     2010-08-31 16:17:37 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
don't recurse into Attr nodes

Modified Paths:
--------------
    trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml
    trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml

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-08-31 15:23:42 UTC (rev 447)
+++ trunk/xmlunit/src/main/java-core/net/sf/xmlunit/diff/DOMDifferenceEngine.java.xml	2010-08-31 16:17:37 UTC (rev 448)
@@ -74,19 +74,29 @@
         NodeList controlChildren = control.getChildNodes();
         NodeList testChildren = test.getChildNodes();
 ]]></literal>
+        if (control.getNodeType() != Node.ATTRIBUTE_NODE) {
   <compareExpr type="CHILD_NODELIST_LENGTH"
                controlExpr="controlChildren.getLength()"
                testExpr="testChildren.getLength()"/>
+  <literal><![CDATA[
+         }
+]]></literal>
   <compareMethod method="nodeTypeSpecificComparison"/>
   <literal><![CDATA[
-        controlContext
-            .setChildren(Linqy.map(new IterableNodeList(controlChildren),
-                                   TO_NODE_INFO));
-        testContext
-            .setChildren(Linqy.map(new IterableNodeList(testChildren),
-                                   TO_NODE_INFO));
-        return compareNodeLists(controlChildren, controlContext,
-                                testChildren, testContext);
+        if (control.getNodeType() != Node.ATTRIBUTE_NODE) {
+            controlContext
+                .setChildren(Linqy.map(new IterableNodeList(controlChildren),
+                                       TO_NODE_INFO));
+            testContext
+                .setChildren(Linqy.map(new IterableNodeList(testChildren),
+                                       TO_NODE_INFO));
+]]></literal>
+  <compareMethodExpr method="compareNodeLists"
+                     controlExpr="controlChildren"
+                     testExpr="testChildren"/>
+  <literal><![CDATA[
+        }
+        return lastResult;
     }
 
     /**

Modified: trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml
===================================================================
--- trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml	2010-08-31 15:23:42 UTC (rev 447)
+++ trunk/xmlunit/src/main/net-core/diff/DOMDifferenceEngine.xml	2010-08-31 16:17:37 UTC (rev 448)
@@ -63,24 +63,34 @@
   <literal><![CDATA[
             XmlNodeList controlChildren = control.ChildNodes;
             XmlNodeList testChildren = test.ChildNodes;
+            if (control.NodeType != XmlNodeType.Attribute) {
 ]]></literal>
   <compareExpr type="CHILD_NODELIST_LENGTH"
                controlExpr="controlChildren.Count"
                testExpr="testChildren.Count"/>
+  <literal><![CDATA[
+             }
+]]></literal>
   <compareMethod method="NodeTypeSpecificComparison"/>
   <literal><![CDATA[
-            IEnumerable<XmlNode> cc = Linqy.Cast<XmlNode>(controlChildren);
-            controlContext
-                .SetChildren(Linqy.Map<XmlNode,
-                                       XPathContext.INodeInfo>(cc,
-                                                               TO_NODE_INFO));
-            IEnumerable<XmlNode> tc = Linqy.Cast<XmlNode>(testChildren);
-            testContext
-                .SetChildren(Linqy.Map<XmlNode,
-                                       XPathContext.INodeInfo>(tc,
-                                                               TO_NODE_INFO));
-            return CompareNodeLists(controlChildren, controlContext,
-                                    testChildren, testContext);
+            if (control.NodeType != XmlNodeType.Attribute) {
+                IEnumerable<XmlNode> cc = Linqy.Cast<XmlNode>(controlChildren);
+                controlContext
+                    .SetChildren(Linqy.Map<XmlNode,
+                                           XPathContext.INodeInfo>(cc,
+                                                                   TO_NODE_INFO));
+                IEnumerable<XmlNode> tc = Linqy.Cast<XmlNode>(testChildren);
+                testContext
+                    .SetChildren(Linqy.Map<XmlNode,
+                                           XPathContext.INodeInfo>(tc,
+                                                                   TO_NODE_INFO));
+]]></literal>
+  <compareMethodExpr method="CompareNodeLists"
+                     controlExpr="controlChildren"
+                     testExpr="testChildren"/>
+  <literal><![CDATA[
+            }
+            return lastResult;
         }
 
         /// <summary>


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