Changeset 7987

Timestamp:

09/09/08 13:50:41 (2 years ago)

Author:

tschaub

Message:

Making the xml_eq test method ignore whitespace only nodes by default. This can be configured by setting the ignoreWhiteSpace option. (see #1639)

Files:

• trunk/openlayers/tests/xml_eq.js (modified) (4 diffs)

trunk/openlayers/tests/xml_eq.js

@@ -98 +98 @@
-     * got - {DOMElement}
-     * expected - {DOMElement}
-
-
-
-
+
+
+
+
+
+
+
-     */
-    function assertElementNodesEqual(got, expected, options) {
@@ -191 +194 @@
-            
-            // compare children
+            var gotChildNodes = getChildNodes(got, options);
+            var expChildNodes = getChildNodes(expected, options);
+
-            assertEqual(
-.childNodes.length, expected.c
+ChildNodes.length, expC
-                "Children length mismatch for " + got.nodeName
-            );
-.c
+C
-                try {
-                    assertElementNodesEqual(
-.childNodes[j], expected.childNodes[j]
+ChildNodes[j], expChildNodes[j], options
-                    );
-                } catch(err) {
@@ -207 +213 @@
-        return true;
-    }
+
+    /**
+     * Function getChildNodes
+     * Returns the child nodes of the specified nodes. By default this method
+     *     will ignore child text nodes which are made up of whitespace content.
+     *     The 'includeWhiteSpace' option is used to control this behaviour.
+     * 
+     * Parameters:
+     * node - {DOMElement}
+     * options - {Object} Optional object for test configuration.
+     * 
+     * Valid options:
+     * includeWhiteSpace - {Boolean} Include whitespace only nodes when
+     *     comparing child nodes.  Default is false.
+     * 
+     * Returns:
+     * {Array} of {DOMElement}
+     */
+    function getChildNodes(node, options) {
+        //check whitespace
+        if (options && options.includeWhiteSpace) {
+            return node.childNodes;
+        }
+        else {
+           nodes = [];
+           for (var i = 0; i < node.childNodes.length; i++ ) {
+              var child = node.childNodes[i];
+              if (child.nodeType == 1) {
+                 //element node, add it 
+                 nodes.push(child);
+              }
+              else if (child.nodeType == 3) {
+                 //text node, add if non empty
+                 if (child.nodeValue && 
+                       child.nodeValue.replace(/^\s*(.*?)\s*$/, "$1") != "" ) { 
+
+                    nodes.push(child);
+                 }
+              }
+           }
+  
+           return nodes;
+        }
+    } 
-    
-    /**
@@ -222 +272 @@
-     * expected - {DOMElement | String} The expected DOM node or XML string.
-     * msg - {String} A message to print with test output.
-
-
-
-
+
+
+
+
+
+
+
-     */
-    var proto = Test.AnotherWay._test_object_t.prototype;