Changeset 6344

Timestamp:

02/22/08 15:08:28 (9 months ago)

Author:

tschaub

Message:

Modifying xml_eq so that prefixes for element and attribute nodes are not tested by default. Namespace URI is always tested for both. If you also want to confirm that prefixes are equal, test with options.prefix true. Modifying tests for the XML format to use xml_eq. (see #1383)

Files:

• trunk/openlayers/tests/Format/test_XML.html (modified) (3 diffs)
• trunk/openlayers/tests/xml_eq.js (modified) (11 diffs)

trunk/openlayers/tests/Format/test_XML.html

@@ -44 +44 @@
-        
-        var format = new OpenLayers.Format.XML();
-1 : 10
+0 : 9
-
-        var doc = format.read(text);
@@ -53 +53 @@
-        t.ok(doc.documentElement,
-             "ok to access doc.documentElement");
-
-
-
-
+
+
-        
-        // read can also be called on the prototype directly
@@ -66 +64 @@
-        t.ok(doc.documentElement,
-             "ok to access doc.documentElement");
-
-
-
-
+
+
-        
-        // where appropriate, make sure doc is loaded into xmldom property
-        if(format.xmldom) {
-
-
-
+
+
-        }
+        
+        // test equivalence with different namespace alias
+        var pre1 = 
+            "<pre1:parent xmlns:pre1='http://namespace'>" +
+                "<pre1:child1>value2</pre1:child1>" +
+                "<pre1:child2 pre1:attr1='foo'>value2</pre1:child2>" +
+                "<pre1:child3 chicken:attr='hot' xmlns:chicken='http://soup'/>" +
+            "</pre1:parent>";
+        var pre2 = 
+            "<pre2:parent xmlns:pre2='http://namespace'>" +
+                "<pre2:child1>value2</pre2:child1>" +
+                "<pre2:child2 pre2:attr1='foo'>value2</pre2:child2>" +
+                "<pre2:child3 pea:attr='hot' xmlns:pea='http://soup'/>" +
+            "</pre2:parent>";
+        var doc1 = format.read(pre1);
+        t.xml_eq(doc1.documentElement, pre2, "read correctly sets namespaces");
+        
-    }
-

trunk/openlayers/tests/xml_eq.js

@@ -3 +3 @@
- * Adds a xml_eq method to AnotherWay test objects.
- *
- * Function: Test.AnotherWay._test_object_t.xml_eq
- * Test if two XML nodes are equivalent.  Tests for same node types, same
- *     node names, same namespace prefix and URI, same attributes, and
- *     recursively tests child nodes.
- *
- * (code)
- * t.xml_eq(got, expected, message);
- * (end)
- * 
- * Parameters:
- * got - {DOMElement | String} A DOM node or XML string to test.
- * expected - {DOMElement | String} The expected DOM node or XML string.
- * msg - {String} A message to print with test output.
- * 
- */
-
-(function() {
-    
-    /**
-     * Function: stringFormat
-     * Given a string with tokens in the form ${token}, return a string
-     *     with tokens replaced with properties from the given context
-     *     object.  Represent a literal "${" by doubling it, e.g. "${${".
-     *
-     * Parameters:
-     * template - {String} A string with tokens to be replaced.  A template
-     *     has the form "literal ${token}" where the token will be replaced
-     *     by the value of context["token"].
-     * context - {Object} An optional object with properties corresponding
-     *     to the tokens in the format string.  If no context is sent, the
-     *     window object will be used.
-     *
-     * Returns:
-     * {String} A string with tokens replaced from the context object.
-     */
-    function formatString(template, context) {
-        if(!context) {
-            context = window;
-        }
-        var tokens = template.split("${");
-        var item, last;
-        for(var i=1; i<tokens.length; i++) {
-            item = tokens[i];
-            last = item.indexOf("}"); 
-            if(last > 0) { 
-                tokens[i] = context[item.substring(0, last)] +
-                            item.substring(++last); 
-            } else {
-                tokens[i] = "${" + item;
-            }
-        }
-        return tokens.join("");
-    }
-
-    /**
@@ -118 +68 @@
-     * got - {Object}
-     * expected - {Object}
-Can be formatted for use with
-formatString where got and expected (cast to string) will b
-substituted
+This message will be appended
+with ": got {got} but expected {expected}" where got and expected ar
+replaced with string representations of the above arguments
-     */
-    function assertEqual(got, expected, msg) {
@@ -133 +83 @@
-            expected = "null";
-        }
-        if(!msg) {
-            msg = "got ${got} but expected ${expected}";
-        }
-        if(got != expected) {
-formatString(msg, {got: got, expected: expected})
+msg + ": got " + got + " but expected " + expected
-        }
-    }
@@ -151 +98 @@
-     * got - {DOMElement}
-     * expected - {DOMElement}
-
-
+
+
+
+
+
+
+
+
-        // compare types
-
-
-
-
+
-        
-        // compare names
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        // for element type nodes compare namespace, attributes, and children
-
+else 
-            
-            // test namespace alias and uri
-            if(got.prefix || expected.prefix) {
-
-
-
-
-
+
+
+
+
+
+
-            }
-            if(got.namespaceURI || expected.namespaceURI) {
-                assertEqual(
-                    got.namespaceURI, expected.namespaceURI,
-
-
+
-                );
-            }
@@ -187 +144 @@
-            var gotAttrLen = 0;
-            var gotAttr = {};
-ected
-ected
-
+
+
+, gn, en
-            for(var i=0; i<got.attributes.length; ++i) {
-                ga = got.attributes[i];
-
-
-
+
+
+
+
+
+
-                }
-            }
-            for(var i=0; i<expected.attributes.length; ++i) {
-                ea = expected.attributes[i];
-
-
-
+
+
+
+
+
+
-                }
-            }
-            assertEqual(
-
-
-
+
+
-            );
-            var gv, ev;
-            for(var name in gotAttr) {
+                if(expAttr[name] == undefined) {
+                    throw "Attribute name " + gotAttr[name].name + " expected for element " + got.nodeName;
+                }
+                // test attribute namespace
-                assertEqual(
-
+
+
+
+
+
+
+
-                    "Attribute value mismatch for element " + got.nodeName +
-" + name + ": got ${got} but expected ${expected}"
+name " + gotAttr[name].name
-                );
-            }
@@ -221 +193 @@
-            assertEqual(
-                got.childNodes.length, expected.childNodes.length,
-
-
+
-            );
-            for(var j=0; j<got.childNodes.length; ++j) {
@@ -230 +201 @@
-                    );
-                } catch(err) {
-node
+element
-                }
-            }
@@ -237 +208 @@
-    }
-    
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        // convert arguments to nodes if string
-        if(typeof got == "string") {
@@ -245 +234 @@
-                got = createNode(got);
-            } catch(err) {
-"
+msg + ": 
-                return;
-            }
@@ -253 +242 @@
-                expected = createNode(expected);
-            } catch(err) {
-"
+msg + ": 
-                return;
-            }
@@ -260 +249 @@
-        // test nodes for equivalence
-        try {
-
+, options
-            this.ok(true, msg);
-        } catch(err) {
-
+msg + ": " + 
-        }
-    }