Reviewed by Darin.

author ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Tue, 30 Jan 2007 05:32:43 +0000 (05:32 +0000)

committer ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Tue, 30 Jan 2007 05:32:43 +0000 (05:32 +0000)
author ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jan 2007 05:32:43 +0000 (05:32 +0000)
committer ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 30 Jan 2007 05:32:43 +0000 (05:32 +0000)
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog

index 754d1b7ca9324d757c2049f4cb254ec270f2473b..bba2e76605878f59755106c2fd3af17b48f93f25 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,115 @@
+2007-01-29  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Darin.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12464
+        Fix XPath test suite conversion problems
+
+        * dom/svg/level3/xpath/svgunit.js: Fixed createXPathEvaluator() to work in Firefox (whose
+        document.getFeature returns null for XPath). Changed load() to use XMLHttpRequest, instead of
+        merely cloning the current document.
+
+        * dom/svg/level3/xpath/resources/internaldtd.xml: Added.
+        * dom/svg/level3/xpath/resources/staff.dtd: Added.
+        * dom/svg/level3/xpath/resources/staff.xml: Added.
+        * dom/svg/level3/xpath/resources/staffNS.dtd: Added.
+        * dom/svg/level3/xpath/resources/staffNS.xml: Added.
+        Added external test documents.
+
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR-expected.txt:
+        * dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR-expected.txt:
+        These tests now run, but fail. They also fail in Firefox, but pass in Opera.
+
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR-expected.txt:
+        These now fail, because XPathResult relies on DOMSubtreeModified event for invalidation,
+        but event listeners cannot be registered on nodes in documents that aren't attached (such as
+        XHR.responseXML). Not yet sure what exactly the bug is, but I think it's good to have the tests
+        fail, as it appears to be a genuine issue.
+
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.js:
+        * dom/svg/level3/xpath/XPathResult_numberValue.js:
+        Updated these tests to use /staff instead of /svg paths.
+
+        * dom/svg/level3/xpath/XPathResult_booleanValue_true-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js:
+        * dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE-expected.txt:
+        * dom/svg/level3/xpath/XPathResult_stringValue-expected.txt:
+        These tests now pass.
+
+        * dom/svg/level3/xpath/Attribute_Nodes.svg:
+        * dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg:
+        * dom/svg/level3/xpath/Comment_Nodes.svg:
+        * dom/svg/level3/xpath/Conformance_Expressions.svg:
+        * dom/svg/level3/xpath/Conformance_ID.svg:
+        * dom/svg/level3/xpath/Conformance_hasFeature_3.svg:
+        * dom/svg/level3/xpath/Conformance_hasFeature_empty.svg:
+        * dom/svg/level3/xpath/Conformance_hasFeature_null.svg:
+        * dom/svg/level3/xpath/Conformance_isSupported_3.svg:
+        * dom/svg/level3/xpath/Conformance_isSupported_empty.svg:
+        * dom/svg/level3/xpath/Conformance_isSupported_null.svg:
+        * dom/svg/level3/xpath/Element_Nodes.svg:
+        * dom/svg/level3/xpath/Processing_Instruction_Nodes.svg:
+        * dom/svg/level3/xpath/Text_Nodes.svg:
+        * dom/svg/level3/xpath/XPathEvaluatorCast01.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg:
+        * dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg:
+        * dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg:
+        * dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg:
+        * dom/svg/level3/xpath/XPathExpression_evaluate_document.svg:
+        * dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg:
+        * dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg:
+        * dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg:
+        * dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg:
+        * dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg:
+        * dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg:
+        * dom/svg/level3/xpath/XPathResult_booleanValue_false.svg:
+        * dom/svg/level3/xpath/XPathResult_booleanValue_true.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg:
+        * dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_numberValue.svg:
+        * dom/svg/level3/xpath/XPathResult_resultType.svg:
+        * dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg:
+        * dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg:
+        * dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg:
+        * dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg:
+        * dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg:
+        * dom/svg/level3/xpath/XPathResult_stringValue.svg:
+        Removed unneeded inline test data.
+
  2007-01-29  Graham Dennis  <graham.dennis@gmail.com>
  
          Reviewed by Maciej.
diff --git a/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes.svg b/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes.svg

index 39c24cac7fa5a6739dd7435954f6f641ef835fcc..579e57572e16b010da296ac919d50e20858a8138 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Attribute_Nodes.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg b/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg

index 84aff517767d441061682e71d462fe6e4bf03321..0aa490cddcb7a077435ca8fb79998cac239614c4 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Attribute_Nodes_xmlns.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Comment_Nodes.svg b/LayoutTests/dom/svg/level3/xpath/Comment_Nodes.svg

index 9f1f7bfd801dac2238c6f3ab0ce9b7da07335458..15f13cfe0b6f8436b7430d7def7d5eade949c045 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Comment_Nodes.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Comment_Nodes.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Comment_Nodes.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_Expressions.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_Expressions.svg

index 5593e744144c4e2be4b129beef118a516ea06965..f0fd8da2976dc7d1e19710058f8b24a35f0d9772 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_Expressions.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_Expressions.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_Expressions.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_ID.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_ID.svg

index 96ee30133bdbc2fd3adcb7bab9a9af065176d248..487bb35c15fbc3c6470f8d086664f56a0aaef7bb 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_ID.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_ID.svg
@@ -1,29 +1,5 @@
-<?xml version="1.0"?>\r
-<!DOCTYPE svg [\r
-  <!ELEMENT test (child)+ >\r
-  <!ATTLIST test xmlns CDATA #IMPLIED>\r
-  <!ELEMENT child EMPTY>\r
-  <!ATTLIST child id ID #IMPLIED>\r
-  <!ATTLIST child check CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, test)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_ID.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
-<test xmlns="http://www.example.org">\r
-  <child id="child1" check="child1"/>\r
-  <child id="child2" check="child2"/>\r
-</test>\r
  </svg>\r
  \r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_3.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_3.svg

index 9617497491d8f499ca1171eaa9f3a8256248d5f0..385d0d0f4b3b559a0d40b2eeb0a1e0a9f05185c9 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_3.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_3.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_hasFeature_3.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_empty.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_empty.svg

index 8162c8467a7a6d0382e54d97d6563d759173e598..59e0aeb8f721ed71ac73b44d4f6febdfb2873d88 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_empty.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_empty.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_hasFeature_empty.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_null.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_null.svg

index 62e722137d1420ef9ddbe946e8a4042530bb4e44..1b33206ac8a2579198ef54f2b576b63d6da54a7a 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_null.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_null.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_hasFeature_null.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_3.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_3.svg

index d5212070b86d20293bf50b836dfc4c92f8065d00..2412425557b86fbbbbfbc45232e2f33c2ba1454e 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_3.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_3.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_isSupported_3.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_empty.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_empty.svg

index d622bc77cba6de2985c4c6ad2a92f0f6f7ae2e27..3e45a06321c958e8d223d6d42bc54d6a46dff9a3 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_empty.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_empty.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_isSupported_empty.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_null.svg b/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_null.svg

index 09669837a7aea7cf1f16c5f450ea79de51c0ccb3..62350fdbe096182ba8172e185a4aedc21a8bc9b6 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_null.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_null.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Conformance_isSupported_null.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Element_Nodes.svg b/LayoutTests/dom/svg/level3/xpath/Element_Nodes.svg

index a0fc3d89176272ef2e502d13fa04aa86413fab97..0aa45ed30a3eb3db60d1b6b9fcecfc586de04b80 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Element_Nodes.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Element_Nodes.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Element_Nodes.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Processing_Instruction_Nodes.svg b/LayoutTests/dom/svg/level3/xpath/Processing_Instruction_Nodes.svg

index 4f72aaf453feb8cb5f6ddf0f1f568a2ba3c3c033..3a6ef8eb68eeb173c424c4755fa8971ac292bc19 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Processing_Instruction_Nodes.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Processing_Instruction_Nodes.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Processing_Instruction_Nodes.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/Text_Nodes.svg b/LayoutTests/dom/svg/level3/xpath/Text_Nodes.svg

index 361626441204a9efbd4335e3b5771963f01bd698..1ee9737f366ca8008a0f029bb5873e43024f7ded 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/Text_Nodes.svg
+++ b/LayoutTests/dom/svg/level3/xpath/Text_Nodes.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="Text_Nodes.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluatorCast01.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluatorCast01.svg

index 9a9b37067d9015f6a4fd064c08c93058a365bfbc..95e99b0523b23c067365e17bfa9d6f75d66d61bd 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluatorCast01.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluatorCast01.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluatorCast01.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg

index 467eb6ea8bb09ef93fcc0376517c23009bbd78ae..54fe89bd424c0ed7dad2be35c35286b414514e59 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg

index 71751e737cc3c172639e46b6ea09ae698036f8cf..bd4bd96c625908f83ac4a7d49e266e90ed07971b 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createExpression_NAMESPACE_ERR_01.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg

index 031b4649f4de7d3785eb3c85855a92d6f3abda6e..432f61fe0f44099fa7ba1e3c74ce31cd72010c65 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createExpression_NAMESPACE_ERR_02.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg

index 08710f152f40195d22adba0e28a6232882b21d7d..92447c8d8175a4ea6ae154b013c91eaac41dcd8c 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createExpression_NS.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg

index fdfca3bfa0072c1ce074c0bf332666229aed3c0a..dedff194ee9e042bcb1332e5da32c9afb7905ccc 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createExpression_no_NS.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg

index a9668eaf211439aa6c3c4b7aac2ff9b88d193312..88dfce520fead50f999b82ff8abc91de76b79334 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createNSResolver_all.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg

index 235e45e799cb02658aa423f9086779661836de1c..cf0cd7f5b1e866002893cb974c36dd937321754e 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createNSResolver_document.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg

index de81d5793ff21efa632df50efb15f74465250174..674f53944cf56f57eebcc17d255d841c76fee864 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_createNSResolver_documentElement.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg

index 997479534ec4f3305f38c0d530bfa4b571b97ebe..d1cab31195db67c8c5c93c6576b17c2567b5bd3f 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg

index b2e7cf58544f3b354dc91bb013cc2759db4f0d7f..46605776c7818421aa02f9385a0be42b38a89282 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_NAMESPACE_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg

index 9ead148e9e989ceb1a796740c6816e149033c805..77b8bdc1c6d409596e2ae48420d7be7ce9182e8f 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg

index 7ab6ea6ac9eded89c12281e656aa9ec62c722351..b2674c7184a7d772340d6833d010ee6e39cb0da8 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_TYPE_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR-expected.txt

index df39f72cbcf13bd2f3e21dab109f8a9fd7a85c9c..ce793f2110c05a72057e4489d95d3ec54a5719a0 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR-expected.txt
@@ -1,2 +1,2 @@
-Tests with multiple loads of different documents are not currently supported
  XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR
+throw_WRONG_DOCUMENT_ERR: assertTrue failed
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg

index 657179ec4ec2cb8c9a1232de7616e126341db32d..b5d5962de47e36b48d32a674fbec93eae54e72d9 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg

index b7f9fc66ac4e73fed64b8c4d38b6ced17364ad3d..551872eaaa29aecde2bfd73645d44c83d50904e9 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_document.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg

index 3b47143f1e306829675db5fde8cc1c8dd1543aa7..b35fa218e4c504477797e97813f5be010fd59031 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathEvaluator_evaluate_documentElement.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg

index c2fc5c406f0d3e83c33d7c93efdfbcbe0cd60d26..af86d750a39daaf46cb04d9f13a270cf255cccf6 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathExpression_evaluate_NOT_SUPPORTED_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR-expected.txt

index 7e663cbb084b35e16e32663f2fd23bbc5b8bc8f3..371ce8bfb973fecf40dc12e913c2c73145dae8b6 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR-expected.txt
@@ -1,2 +1,2 @@
-Tests with multiple loads of different documents are not currently supported
  XPathExpression_evaluate_WRONG_DOCUMENT_ERR
+throw_WRONG_DOCUMENT_ERR: assertTrue failed
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg

index 7a48331b61a1ebf60d5e9a1a972bf5a4f9f4a61c..96ab574848baf622d5f7583a860acef56c53e03e 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathExpression_evaluate_WRONG_DOCUMENT_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_document.svg b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_document.svg

index 0076d91c1e42eb404bdad83d17dfdad488ef17e7..66b1d4048c1bd388505e0d15315747c8398b04fe 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_document.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_document.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathExpression_evaluate_document.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg

index 6af68c05f46a0b0ee48d228e6038d43d543df884..a6a3c2b1fcae3199f090094231b2559f53a89442 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathExpression_evaluate_documentElement.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg

index 0c1dd070a80802f57d00aab390a3c6ae26045481..635241b2fa923a7c15755c5216c474fd7c13e21d 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathNSResolver_lookupNamespaceURI_nist_dmstc.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg

index 4e9c0f80f0db10c5089f2492ab7b03aaa7c23835..f9fc23c9f180a04626b6c79cb79f06366fdc43e9 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathNSResolver_lookupNamespaceURI_null.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg

index fa72a3b43d086068239e39a81a797a23a7e90e2c..f03a0b7dcc22ba581f8d28e45a2fd39cf77779f2 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathNSResolver_lookupNamespaceURI_prefix.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg

index c63cc71a54a0f838216e6a4cf4b44e309d8e1575..770637598a5602a19a0e78045509376b02decd54 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg
@@ -1,74 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg PUBLIC "STAFF" "staffNS.dtd" \r
-[\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement1 xmlns:local1='www.xyz.com'>Element data</entElement1><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent6 PUBLIC "uri" "file" NDATA notation2>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ELEMENT svg (rect, script, employee+, emp:employee, employee*)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg" xmlns:nist="http://www.nist.gov"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathNSResolver_lookupNamespaceURI_xml.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.nist.gov" xmlns:dmstc="http://www.usa.com">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.usa.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds\r
-<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address dmstc:domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns:dmstc="http://www.netzero.com" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>\r
-  <nm:name>Jeny Oconnor</nm:name>\r
-  <emp:position>Personnel Director</emp:position>\r
-  <emp:salary>95,000</emp:salary>\r
-  <emp:gender>Female</emp:gender>\r
-  <emp:address emp:domestic="Yes" street="Y&ent1;" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>\r
- </emp:employee>\r
- <employee xmlns:emp2="http://www.nist.gov" xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-2/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
- \r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg

index cf3962ecb0cd0a9917bb68d97c1615c62045552c..8c4a9b20fcd69dd59f3ac7db31f66a55cddd1b17 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_TYPE_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_false.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_false.svg

index 5cb8c5a57640556f3c28c20d5c2e5aeee669eaef..b643f0aae79321352a8bbebcb88239dcbc95ac94 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_false.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_false.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_booleanValue_false.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true-expected.txt

index abb68bc3db443e9b208cedde16eb84466cc0fa65..07dab84e07c3e8568e9c4b2f359f531c0cef8ddb 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true-expected.txt
@@ -1,2 +1 @@
-XPathResult_booleanValue_true
-true: assertTrue failed
+XPathResult_booleanValue_true: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true.svg

index a02aa6f2fbc9e4a772af5bbcc49d4e374a79727e..f13aca82514aaa32bf44b56d23febc696fd96567 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_booleanValue_true.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE-expected.txt

index 999a3460d4ad22613a15229bec888cd2f64e272d..062d02b98f23b4d717d3397155411cc6b62bfc21 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE-expected.txt
@@ -1 +1,2 @@
-XPathResult_invalidIteratorState_ANY_TYPE: Success
+XPathResult_invalidIteratorState_ANY_TYPE
+true: assertTrue failed
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.js b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.js

index 3d755aa947f29fc4f34fac0211e1eb261c42bbec..fa5e302b6174d1df8e78dc578228002d05339afb 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.js
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.js
@@ -49,7 +49,7 @@ function setUpPage() {
            setUpPage = 'complete';
         }
      } catch(ex) {
-       catchInitializationError(builder, ex);
+        catchInitializationError(builder, ex);
          setUpPage = 'complete';
      }
  }
@@ -104,7 +104,7 @@ function XPathResult_invalidIteratorState_ANY_TYPE() {
  
        var outresult = null;
  
-      var expression = "/svg/employee";
+      var expression = "/staff/employee";
        var xpathType = ANY_TYPE;
        var employee;
        var docElement;
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg

index c19c0b46de221ac5d4510694d1fe2d59a0bc32df..1f4f9f7215ff0b20d5d18927576b5c02b844cd55 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_ANY_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg

index 0bf349d7a23e0e419e62a82315da12cee9770154..fabf923e3bb4b4d33c47dab6abf4319c79676f47 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg

index f01383a1c106358d39037bc0986bfa5aa3af3871..da8327b29ee61ab82f0c9149c57f0013af8b370a 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_BOOLEAN_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg

index ca5d9bf2ca1f14c26e61e106c7a5b48439a51717..a89b4ad532e0f16246507399aff20ee8a4d36fd9 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg

index b68a4fbe47f378a17b95abcfefe858a553d3066d..8bd0288848c5f8960617e3352517249d124a466e 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_NUMBER_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE-expected.txt

index bbac09d920c23d0a963cc420a4939d3aa52e8aa2..a611384ae90b13a63b02fe49123f4f6e9e8372cf 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE-expected.txt
@@ -1 +1,2 @@
-XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE: Success
+XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE
+true: assertTrue failed
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg

index 61a1a499f4144f3facb7290ae8fbb45e715f984c..6c4bb545f579a0f65d76cde8a86f3a0dc962c84f 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg

index fc94197dcbc422edf43b7cd8bd1a4cfa1d65ffcd..2204b2d2a53195841cac99bd36ed2222c3032281 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg

index 6e19072cafd5aebdee93f2dfae6ee862092447f2..e3cead6629e1654fa9ff009e7e0bf62b63600b6f 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_STRING_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE-expected.txt

index 4fe31d0387ea6855b42cc33c77dd698be07d098c..4fb3519be52a833791d01d8615968b3edd2141ac 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE-expected.txt
@@ -1 +1,2 @@
-XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE: Success
+XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE
+true: assertTrue failed
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg

index ccf7768bdb33a9269e9ba1b12eac326945de916a..9f0ee90855666e9ef8761e91e4684b67d5844f0e 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg

index 3994ab2b63b6cb500dc61fd6ecad23a46ae86b9c..ba86635270b27e7e58e294d239e69346862c01e7 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR-expected.txt

index 8acfd12cfdf3f3d534319399bfb6057b6cee26f7..51f90acb92f5204395c24e8d87ccc8ffeb682fea 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR-expected.txt
@@ -1 +1,2 @@
-XPathResult_iterateNext_INVALID_STATE_ERR: Success
+XPathResult_iterateNext_INVALID_STATE_ERR
+throw_INVALID_STATE_ERR: assertTrue failed
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg

index 7055abd8efbea000777d2816666a6dafaed63215..992be3a9689cf1f953768f175bab3d1e67db2aa8 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_iterateNext_INVALID_STATE_ERR.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE-expected.txt

index ae81413ff7ccb3976560de8dc8349041e2c65c60..0ee91a5450b4ab3f696cc864d8b400db5e343bd7 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE-expected.txt
@@ -1,2 +1 @@
-XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE
-count: assertEquals failed, actual 0, expected 5.
+XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg

index a021066f2c2826367b1ce081d1afa9f8aa154723..3f39d14fdc17744a0625960bc84c7abe0e998b47 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.js b/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.js

index aa3c4e75e5cb45f7f365da92ded25037eb1f3e7d..2c4775d30a35c7e9ce9ea4d6781f18ff02061b91 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.js
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.js
@@ -49,7 +49,7 @@ function setUpPage() {
            setUpPage = 'complete';
         }
      } catch(ex) {
-       catchInitializationError(builder, ex);
+        catchInitializationError(builder, ex);
          setUpPage = 'complete';
      }
  }
@@ -103,7 +103,7 @@ function XPathResult_numberValue() {
  
        var outresult = null;
  
-      var expression = "substring-before(/svg/employee/salary[text() = '56,000'], ',')";
+      var expression = "substring-before(/staff/employee/salary[text() = '56,000'], ',')";
        var xpathType = NUMBER_TYPE;
        var numberValue;
        
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.svg

index 6e87699a42fe7a2cad4195aa1ce405b392be0ef8..a02dba8f2f576036179d8aca19ab89fd2233f388 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_numberValue.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_resultType.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_resultType.svg

index 14fd23b00193a4dbfc8188b29975a61ac12d5e68..28b7df0d2fdf35d35852c150f6026ccb74565021 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_resultType.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_resultType.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_resultType.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js

index c52053028c874fa9927c9c8052ef3dc52128f48d..ada6b657f225b6e4e61cb3727b262245a79c5708 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js
@@ -49,7 +49,7 @@ function setUpPage() {
            setUpPage = 'complete';
         }
      } catch(ex) {
-       catchInitializationError(builder, ex);
+        catchInitializationError(builder, ex);
          setUpPage = 'complete';
      }
  }
@@ -100,7 +100,7 @@ function XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE() {
  
        var outresult = null;
  
-      var expression = "/svg/employee/employeeId";
+      var expression = "/staff/employee/employeeId";
        var xpathType = ANY_UNORDERED_NODE_TYPE;
        var outNode;
        var employeeId;
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg

index 4b8b1a625f1b7a97318ce55885f27fdb503fb4d8..7b3b7bd0d928ae2d60f6f399d5c7ce71840b5de2 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE-expected.txt

index 4199abada18bf56dda4e8368c965f758d0f411ad..7d9af22f96b5d3e9886a5ddad899c7b57e596eae 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE-expected.txt
@@ -1,2 +1 @@
-XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE
-TypeError: Null value
+XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg

index 5b99e34dac854f1330682af5db1ac417b4b7a839..fe5cf1c02ea62ac5062443a00d3db5dc71b37b9a 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg

index 8620830372aefa709721b3de5f16b231198c5b5c..83637036895b05bfd4420bb6960839b6d4a08e29 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order-expected.txt

index 0aebb6a1fca2768bcf011f9bf1f661ede5703b17..9b28322188349a6062765ac496186598948cf795 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order-expected.txt
@@ -1,2 +1 @@
-XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order
-TypeError: Null value
+XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg

index dc62d7b6e765e9362570d94274a2989e7b4e9418..e838b587cab2dd9bc460a7ffbf1bbcfac5026c51 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count-expected.txt

index 24e5cf82201da68cbf44b3550883a988c9cedd81..b4ec27ba71cd7ed45faebdcf037af61c7b5d0421 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count-expected.txt
@@ -1,2 +1 @@
-XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count
-notnull: assertNotNull failed
+XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg

index f385d23717d269fd2282e454a1236330fd37a815..5909ea484bdd0ea8c97cdeaaba15eb487a3ff3a6 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg

index da55c09cb37220da73f210e7065d33771c636159..2e73ebfcdecfd3bde601187c5d488e2dd620ea91 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE-expected.txt

index 4dc55c67eb66dc49b8a1d18a6eca1045fd3886c7..6ef78d39b3c4d07c37e76e6c9cc84be655843cc1 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE-expected.txt
@@ -1,2 +1 @@
-XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE
-same: assertEquals failed, actual 0, expected 5.
+XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg

index 136a0700493abe88cea18c3ab5d288a7b39b8faf..0112f86329fd245f1d14270e721ac0e01b94cd6b 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE-expected.txt

index 6db692c6e18ee2934a2419936b53f2554bf618d7..c235c2b6a834ef70c842d503da4694a97198d5b3 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE-expected.txt
@@ -1,2 +1 @@
-XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE
-same: assertEquals failed, actual 0, expected 5.
+XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg

index fe1fa75f0b0441001acf0967ab793ebfc21643d2..47cedd0d61d0050a3b0aa0e34e4dec0fb33ff73d 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue-expected.txt b/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue-expected.txt

index 71025ae9c95a96b9bafd378b8e242248303893c8..caad6814920a6a6bf666a3b1d5c5f05e299d5559 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue-expected.txt
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue-expected.txt
@@ -1,2 +1 @@
-XPathResult_stringValue
-same: assertEquals failed, actual , expected 56,000.
+XPathResult_stringValue: Success
diff --git a/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue.svg b/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue.svg

index 18db8e43c7da1c9c8a53e7d153a1ef4cf2180947..da11e9b6f5573702bb257499d842def58e92295e 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue.svg
+++ b/LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue.svg
@@ -1,72 +1,4 @@
-<?xml version="1.0"?><?TEST-STYLE PIDATA?>\r
-<!DOCTYPE svg SYSTEM "staff.dtd" [\r
-   <!ENTITY ent1 "es">\r
-   <!ENTITY ent2 "1900 Dallas Road">\r
-   <!ENTITY ent3 "Texas">\r
-   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">\r
-   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>\r
-   <!ENTITY ent1 "This entity should be discarded">\r
-   <!NOTATION notation1 PUBLIC "notation1File">\r
-   <!NOTATION notation2 SYSTEM "notation2File">\r
-   <!ATTLIST employee xmlns CDATA #IMPLIED>\r
-   <!ELEMENT svg (rect, script, employee+)>\r
-   <!ATTLIST svg \r
-      xmlns CDATA #FIXED "http://www.w3.org/2000/svg"\r
-      name CDATA #IMPLIED>\r
-   <!ELEMENT rect EMPTY>\r
-   <!ATTLIST rect \r
-      x CDATA #REQUIRED\r
-      y CDATA #REQUIRED\r
-      width CDATA #REQUIRED\r
-      height CDATA #REQUIRED>\r
-  <!ELEMENT script (#PCDATA)>\r
-  <!ATTLIST script type CDATA #IMPLIED>      \r
-]>\r
-<!-- This is comment number 1.-->\r
  <svg xmlns="http://www.w3.org/2000/svg"><rect x="0" y="0" width="100" height="100"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="XPathResult_stringValue.js"/>\r
  <script xmlns="http://www.w3.org/1999/xhtml" src="svgunit.js"/>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0001</employeeId>\r
-  <name>Margaret Martin</name>\r
-  <position>Accountant</position>           \r
-  <salary>56,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0002</employeeId>\r
-  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>\r
-<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>\r
-  <position>Secretary</position>\r
-  <salary>35,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;\r
- 98554</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0003</employeeId>\r
-  <name>Roger\r
- Jones</name>\r
-  <position>Department Manager</position>\r
-  <salary>100,000</salary>\r
-  <gender>&ent4;</gender>\r
-  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0004</employeeId>\r
-  <name>Jeny Oconnor</name>\r
-  <position>Personnel Director</position>\r
-  <salary>95,000</salary>\r
-  <gender>Female</gender>\r
-  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>\r
- </employee>\r
- <employee xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-1/Files">\r
-  <employeeId>EMP0005</employeeId>\r
-  <name>Robert Myers</name>\r
-  <position>Computer Specialist</position>\r
-  <salary>90,000</salary>\r
-  <gender>male</gender>\r
-  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>\r
- </employee>\r
- </svg>\r
+</svg>\r
diff --git a/LayoutTests/dom/svg/level3/xpath/resources/internaldtd.xml b/LayoutTests/dom/svg/level3/xpath/resources/internaldtd.xml

new file mode 100644 (file)

index 0000000..0844f5c
--- /dev/null
+++ b/LayoutTests/dom/svg/level3/xpath/resources/internaldtd.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE test [
+  <!ELEMENT test (child)+ >
+  <!ELEMENT child EMPTY>
+  <!ATTLIST child id ID #IMPLIED>
+  <!ATTLIST child check CDATA #IMPLIED>
+]>
+<test>
+  <child id="child1" check="child1"/>
+  <child id="child2" check="child2"/>
+</test>
+
diff --git a/LayoutTests/dom/svg/level3/xpath/resources/staff.dtd b/LayoutTests/dom/svg/level3/xpath/resources/staff.dtd

new file mode 100644 (file)

index 0000000..02a994d
--- /dev/null
+++ b/LayoutTests/dom/svg/level3/xpath/resources/staff.dtd
@@ -0,0 +1,17 @@
+<!ELEMENT employeeId (#PCDATA)>
+<!ELEMENT name (#PCDATA)>
+<!ELEMENT position (#PCDATA)>
+<!ELEMENT salary (#PCDATA)>
+<!ELEMENT address (#PCDATA)>
+<!ELEMENT entElement ( #PCDATA ) >
+<!ELEMENT gender ( #PCDATA | entElement )* >
+<!ELEMENT employee (employeeId, name, position, salary, gender, address) >
+<!ELEMENT staff (employee)+>
+<!ATTLIST entElement 
+          attr1 CDATA "Attr">
+<!ATTLIST address
+          domestic CDATA #IMPLIED 
+          street CDATA "Yes">
+<!ATTLIST entElement 
+          domestic CDATA "MALE" >
+
diff --git a/LayoutTests/dom/svg/level3/xpath/resources/staff.xml b/LayoutTests/dom/svg/level3/xpath/resources/staff.xml

new file mode 100644 (file)

index 0000000..f89c510
--- /dev/null
+++ b/LayoutTests/dom/svg/level3/xpath/resources/staff.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff SYSTEM "staff.dtd" [
+   <!ENTITY ent1 "es">
+   <!ENTITY ent2 "1900 Dallas Road">
+   <!ENTITY ent3 "Texas">
+   <!ENTITY ent4 "<entElement domestic='Yes'>Element data</entElement><?PItarget PIdata?>">
+   <!ENTITY ent5 PUBLIC "entityURI" "entityFile" NDATA notation1>
+   <!ENTITY ent1 "This entity should be discarded">
+   <!NOTATION notation1 PUBLIC "notation1File">
+   <!NOTATION notation2 SYSTEM "notation2File">
+]>
+<!-- This is comment number 1.-->
+<staff>
+ <employee>
+  <employeeId>EMP0001</employeeId>
+  <name>Margaret Martin</name>
+  <position>Accountant</position>           
+  <salary>56,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0002</employeeId>
+  <name>Martha Raynolds<![CDATA[This is a CDATASection with EntityReference number 2 &ent2;]]>
+<![CDATA[This is an adjacent CDATASection with a reference to a tab &tab;]]></name>
+  <position>Secretary</position>
+  <salary>35,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes" street="Yes">&ent2; Dallas, &ent3;
+ 98554</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0003</employeeId>
+  <name>Roger
+ Jones</name>
+  <position>Department Manager</position>
+  <salary>100,000</salary>
+  <gender>&ent4;</gender>
+  <address domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0004</employeeId>
+  <name>Jeny Oconnor</name>
+  <position>Personnel Director</position>
+  <salary>95,000</salary>
+  <gender>Female</gender>
+  <address domestic="Yes" street="Y&ent1;">27 South Road. Dallas, Texas 98556</address>
+ </employee>
+ <employee>
+  <employeeId>EMP0005</employeeId>
+  <name>Robert Myers</name>
+  <position>Computer Specialist</position>
+  <salary>90,000</salary>
+  <gender>male</gender>
+  <address street="Yes">1821 Nordic. Road, Irving Texas 98558</address>
+ </employee>
+ </staff>
diff --git a/LayoutTests/dom/svg/level3/xpath/resources/staffNS.dtd b/LayoutTests/dom/svg/level3/xpath/resources/staffNS.dtd

new file mode 100644 (file)

index 0000000..877a943
--- /dev/null
+++ b/LayoutTests/dom/svg/level3/xpath/resources/staffNS.dtd
@@ -0,0 +1,47 @@
+<!ELEMENT staff (employee+,emp:employee,employee) >
+<!ATTLIST staff xmlns CDATA #IMPLIED>
+<!ATTLIST staff xmlns:nist CDATA #IMPLIED>
+<!ELEMENT employee (employeeId,name,position,salary,gender,address) >
+<!ATTLIST employee xmlns CDATA #IMPLIED>
+<!ATTLIST employee xmlns:dmstc CDATA #IMPLIED>
+<!ATTLIST employee xmlns:emp2 CDATA #IMPLIED>
+
+<!ELEMENT employeeId (#PCDATA) >
+
+<!ELEMENT name (#PCDATA) >
+
+<!ELEMENT position (#PCDATA) >
+
+<!ELEMENT salary (#PCDATA) >
+
+<!ELEMENT entElement1 (#PCDATA) >
+<!ELEMENT gender (#PCDATA | entElement1)* >
+<!ATTLIST entElement1 xmlns:local1 CDATA #IMPLIED >
+
+<!ELEMENT address (#PCDATA) >
+<!ATTLIST address dmstc:domestic CDATA #IMPLIED>
+<!ATTLIST address street CDATA #IMPLIED>
+<!ATTLIST address domestic CDATA #IMPLIED>
+<!ATTLIST address xmlns CDATA #IMPLIED>
+
+<!ELEMENT emp:employee (emp:employeeId,nm:name,emp:position,emp:salary,emp:gender,emp:address) >
+<!ATTLIST emp:employee xmlns:emp CDATA #IMPLIED>
+<!ATTLIST emp:employee xmlns:nm CDATA #IMPLIED>
+<!ATTLIST emp:employee defaultAttr CDATA 'defaultVal'>
+
+<!ELEMENT emp:employeeId (#PCDATA) >
+
+<!ELEMENT nm:name (#PCDATA) >
+
+<!ELEMENT emp:position (#PCDATA) >
+
+<!ELEMENT emp:salary (#PCDATA) >
+
+<!ELEMENT emp:gender (#PCDATA) >
+
+<!ELEMENT emp:address (#PCDATA) >
+<!ATTLIST emp:address emp:domestic CDATA #IMPLIED>
+<!ATTLIST emp:address street CDATA #IMPLIED>
+<!ATTLIST emp:address emp:zone ID #IMPLIED>
+<!ATTLIST emp:address emp:district CDATA 'DISTRICT'>
+<!ATTLIST emp:address emp:local1 CDATA 'FALSE'>
diff --git a/LayoutTests/dom/svg/level3/xpath/resources/staffNS.xml b/LayoutTests/dom/svg/level3/xpath/resources/staffNS.xml

new file mode 100644 (file)

index 0000000..e46a7c5
--- /dev/null
+++ b/LayoutTests/dom/svg/level3/xpath/resources/staffNS.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?><?TEST-STYLE PIDATA?>
+<!DOCTYPE staff PUBLIC "STAFF" "staffNS.dtd">
+<staff xmlns="http://www.nist.gov" xmlns:nist="http://www.nist.gov">
+ <employee xmlns:dmstc="http://www.usa.com">
+  <employeeId>EMP0001</employeeId>
+  <name>Margaret Martin</name>
+  <position>Accountant</position>           
+  <salary>56,000</salary>
+  <gender>Female</gender>
+  <address dmstc:domestic="Yes">1230 North Ave. Dallas, Texas 98551</address>
+ </employee>
+ <employee xmlns:dmstc="http://www.usa.com">
+  <employeeId>EMP0002</employeeId>
+  <name>Martha Raynolds</name>
+  <position>Secretary</position>
+  <salary>35,000</salary>
+  <gender>Female</gender>
+  <address dmstc:domestic="Yes" street="Yes">1900 Dallas Road Dallas, Texas 98554</address>
+ </employee>
+ <employee xmlns:dmstc="http://www.netzero.com">
+  <employeeId>EMP0003</employeeId>
+  <name>Roger
+ Jones</name>
+  <position>Department Manager</position>
+  <salary>100,000</salary>
+  <gender>Male</gender>
+  <address dmstc:domestic="Yes" street="No">PO Box 27 Irving, texas 98553</address>
+ </employee>
+ <emp:employee xmlns:emp="http://www.nist.gov" xmlns:nm="http://www.altavista.com" >    <emp:employeeId>EMP0004</emp:employeeId>
+  <nm:name>Jeny Oconnor</nm:name>
+  <emp:position>Personnel Director</emp:position>
+  <emp:salary>95,000</emp:salary>
+  <emp:gender>Female</emp:gender>
+  <emp:address emp:domestic="Yes" street="Yes" emp:zone="CANADA" emp:local1="TRUE">27 South Road. Dallas, texas 98556</emp:address>
+ </emp:employee>
+ <employee xmlns:emp2="http://www.nist.gov">
+  <employeeId>EMP0005</employeeId>
+  <name>Robert Myers</name>
+  <position>Computer Specialist</position>
+  <salary>90,000</salary>
+  <gender>male</gender>
+  <address street="Yes" xmlns="http://www.nist.gov">1821 Nordic. Road, Irving Texas 98558</address>
+ </employee>
+</staff>
diff --git a/LayoutTests/dom/svg/level3/xpath/svgunit.js b/LayoutTests/dom/svg/level3/xpath/svgunit.js

index 534c25792201897ffbd9a792fdae0bf51b37d643..b4e5847d52c5adcec398b1cf4c8426a6107c2c95 100644 (file)
--- a/LayoutTests/dom/svg/level3/xpath/svgunit.js
+++ b/LayoutTests/dom/svg/level3/xpath/svgunit.js
@@ -22,15 +22,15 @@ if (window.layoutTestController)
    }
  
    function assertEqualsAutoCase(context, descr, expected, actual) {
-       if (builder.contentType == "text/html") {
-           if(context == "attribute") {
-               assertEquals(descr, expected.toLowerCase(), actual.toLowerCase());
-           } else {
-               assertEquals(descr, expected.toUpperCase(), actual);
-           }
-       } else {
-               assertEquals(descr, expected, actual); 
-       }
+      if (builder.contentType == "text/html") {
+          if(context == "attribute") {
+              assertEquals(descr, expected.toLowerCase(), actual.toLowerCase());
+          } else {
+              assertEquals(descr, expected.toUpperCase(), actual);
+          }
+      } else {
+          assertEquals(descr, expected, actual); 
+      }
    }
    
  
@@ -52,19 +52,19 @@ if (window.layoutTestController)
          matches = 0;
          expectedValue = expected[i];
          for(j = 0; j < actualLen; j++) {
-               if (builder.contentType == "text/html") {
-                       if (context == "attribute") {
-                               if (expectedValue.toLowerCase() == actual[j].toLowerCase()) {
-                                       matches++;
-                               }
-                       } else {
-                               if (expectedValue.toUpperCase() == actual[j]) {
-                                       matches++;
-                               }
-                       }
-               } else {
-               if(expectedValue == actual[j]) {
-                       matches++;
+            if (builder.contentType == "text/html") {
+                if (context == "attribute") {
+                    if (expectedValue.toLowerCase() == actual[j].toLowerCase()) {
+                        matches++;
+                    }
+                } else {
+                    if (expectedValue.toUpperCase() == actual[j]) {
+                        matches++;
+                    }
+                }
+            } else {
+                if(expectedValue == actual[j]) {
+                    matches++;
                  }
              }
          }
@@ -109,13 +109,13 @@ if (window.layoutTestController)
  
  
    function assertEqualsListAutoCase(context, descr, expected, actual) {
-       var minLength = expected.length;
-       if (actual.length < minLength) {
-           minLength = actual.length;
-       }
+    var minLength = expected.length;
+    if (actual.length < minLength) {
+        minLength = actual.length;
+    }
      //
      for(var i = 0; i < minLength; i++) {
-               assertEqualsAutoCase(context, descr, expected[i], actual[i]);
+        assertEqualsAutoCase(context, descr, expected[i], actual[i]);
      }
      //
      //  if they aren't the same size, they aren't equal
@@ -124,14 +124,14 @@ if (window.layoutTestController)
  
  
    function assertEqualsList(descr, expected, actual) {
-       var minLength = expected.length;
-       if (actual.length < minLength) {
-           minLength = actual.length;
-       }
+    var minLength = expected.length;
+    if (actual.length < minLength) {
+        minLength = actual.length;
+    }
      //
      for(var i = 0; i < minLength; i++) {
          if(expected[i] != actual[i]) {
-                       assertEquals(descr, expected[i], actual[i]);
+            assertEquals(descr, expected[i], actual[i]);
          }
      }
      //
@@ -249,19 +249,19 @@ function getSuffix(contentType) {
  }
  
  function equalsAutoCase(context, expected, actual) {
-       if (builder.contentType == "text/html") {
-               if (context == "attribute") {
-                       return expected.toLowerCase() == actual;
-               }
-               return expected.toUpperCase() == actual;
-       }
-       return expected == actual;
+    if (builder.contentType == "text/html") {
+        if (context == "attribute") {
+            return expected.toLowerCase() == actual;
+        }
+        return expected.toUpperCase() == actual;
+    }
+    return expected == actual;
  }
  
  
  function createTempURI(scheme) {
     if (scheme == "http") {
-         return "http://localhost:8080/webdav/tmp" + Math.floor(Math.random() * 100000) + ".xml";
+         return "http://localhost:8080/webdav/tmp" + Math.floor(Math.random() * 100000) + ".xml";
     }
     return "file:///tmp/domts" + Math.floor(Math.random() * 100000) + ".xml";
  }
@@ -328,7 +328,7 @@ function UserDataNotification(operation, key, data, src, dst) {
  }
  
  function UserDataMonitor() {
-       this.allNotifications = new Array();
+    this.allNotifications = new Array();
  }
  
  UserDataMonitor.prototype.handle = function(operation, key, data, src, dst) {
@@ -380,6 +380,7 @@ SVGBuilder.prototype.preload = function(frame, varname, url) {
    var i;
    this.documentVarnames[this.documentVarnames.length] = varname;
    this.documentURLs[this.documentURLs.length] = url;
+/*
    if (this.documentURLs.length > 1) {
       //
       //   if all the urls are not the same
@@ -390,6 +391,7 @@ SVGBuilder.prototype.preload = function(frame, varname, url) {
           }
       }
    }
+*/
    return 1;
  }
  
@@ -441,66 +443,10 @@ SVGBuilder.prototype.cloneNode = function(srcNode, doc) {
  
  
  SVGBuilder.prototype.load = function(frame, varname, url) {
-  if (this.documentVarnames[0] == varname) {
-       return document;
-  }
-  //
-  //
-  //  not a perfect way to do this
-  //    Document.cloneNode is implementation dependent but exists in L1
-  //       and implemented in IE.  The alternative brute force copy
-  //       only works in L2 or higher implementations and can't copy
-  //       entity and notation definitions, etc.
-  var clone = null;
-  try {
-      clone = document.cloneNode(true);
-  } catch(ex) {
-  }
-  if (clone == null) {
-      clone = document.implementation.createDocument(
-          document.documentElement.namespaceURI,
-          document.documentElement.nodeName,
-          null);
-      //
-      //   Work-around since
-      //   Safari does not create document element 
-      //      create document.      
-      if (clone.documentElement == null) {
-           clone.appendChild(clone.createElementNS(
-              document.documentElement.namespaceURI, 
-              document.documentElement.nodeName));
-      }
-      var attrs = document.documentElement.attributes;
-      for(var i = 0; i < attrs.length; i++) {
-          var srcAttr = attrs.item(i);
-          clone.documentElement.setAttributeNS(
-             srcAttr.namespaceURI, srcAttr.nodeName, srcAttr.nodeValue);
-      }
-
-      var srcNode = document.firstChild;
-      while(srcNode != null && srcNode.nodeType != 1) {
-          if (srcNode.nodeType != 10) {
-                var cloneNode = this.cloneNode(srcNode, clone);
-             clone.insertBefore(cloneNode, clone.documentElement);
-           }
-           srcNode = srcNode.nextSibling; 
-      }
-      srcNode = document.documentElement.nextSibling;
-      while(srcNode != null) {
-          var cloneNode = this.cloneNode(srcNode, clone);
-          clone.appendChild(cloneNode);
-          srcNode = srcNode.nextSibling;
-      }
-      srcNode = document.documentElement.firstChild;
-      while(srcNode != null) {
-          var cloneNode = this.cloneNode(srcNode, clone);
-          if (cloneNode != null) {
-             clone.documentElement.appendChild(cloneNode);
-          }
-          srcNode = srcNode.nextSibling;
-      }
-  }
-  return clone;
+  req = new XMLHttpRequest;
+  req.open("GET", "resources/" + url + ".xml", false);
+  req.send(null);
+  return req.responseXML;
  }
  
  SVGBuilder.prototype.getImplementationAttribute = function(attr) {
@@ -590,11 +536,6 @@ function setImplementationAttribute(attribute, value) {
  }
  
  function createXPathEvaluator(doc) {
-    try {
-        return doc.getFeature("XPath", null);
-    }
-    catch(ex) {
-    }
      return doc;
  }
  
@@ -675,30 +616,30 @@ function getResourceURI(name, scheme, contentType) {
      if (base == null) {
         base = "";
      } else {
-          base = base.substring(0, base.lastIndexOf('/') + 1) + "files/";
+       base = base.substring(0, base.lastIndexOf('/') + 1) + "files/";
      }
      return base + name + getSuffix(contentType);
  }
  
  function onloadHandler() {
-       //
-       //   invoke test setup
-       //
-       setUpPage();
-
-       try {
-               runTest();
-               if (builder.initializationError == null) {
-                       changeColor("green");
-                       addMessage("0", "120", exposeTestFunctionNames()[0] + ": Success");
-               } else {
-                       addMessage("0", "120", exposeTestFunctionNames()[0]);
-               }
-       } catch(ex) {
-               addMessage("0", "120", exposeTestFunctionNames()[0]);
-       changeColor("red");
-       addMessage("0", "140", ex);    
-       }       
+    //
+    //   invoke test setup
+    //
+    setUpPage();
+
+    try {
+        runTest();
+        if (builder.initializationError == null) {
+               changeColor("green");
+               addMessage("0", "120", exposeTestFunctionNames()[0] + ": Success");
+        } else {
+            addMessage("0", "120", exposeTestFunctionNames()[0]);
+        }
+    } catch(ex) {
+        addMessage("0", "120", exposeTestFunctionNames()[0]);
+        changeColor("red");
+        addMessage("0", "140", ex);    
+    }    
  }
  // Add loader
  window.addEventListener('load', onloadHandler, false)
author	ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Tue, 30 Jan 2007 05:32:43 +0000 (05:32 +0000)
committer	ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Tue, 30 Jan 2007 05:32:43 +0000 (05:32 +0000)
LayoutTests/ChangeLog		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Attribute_Nodes.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Attribute_Nodes_xmlns.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Comment_Nodes.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_Expressions.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_ID.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_3.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_empty.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_hasFeature_null.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_3.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_empty.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Conformance_isSupported_null.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Element_Nodes.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Processing_Instruction_Nodes.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/Text_Nodes.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluatorCast01.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_INVALID_EXPRESSION_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_01.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NAMESPACE_ERR_02.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_NS.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createExpression_no_NS.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_all.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_document.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_createNSResolver_documentElement.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_INVALID_EXPRESSION_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NAMESPACE_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_NOT_SUPPORTED_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_TYPE_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_WRONG_DOCUMENT_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_document.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathEvaluator_evaluate_documentElement.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_NOT_SUPPORTED_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_WRONG_DOCUMENT_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_document.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathExpression_evaluate_documentElement.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_nist_dmstc.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_null.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_prefix.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathNSResolver_lookupNamespaceURI_xml.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_TYPE_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_false.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_booleanValue_true.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.js		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ANY_UNORDERED_NODE_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_BOOLEAN_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_FIRST_ORDERED_NODE_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_NUMBER_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_ITERATOR_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_ORDERED_NODE_SNAPSHOT_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_STRING_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_ITERATOR_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_invalidIteratorState_UNORDERED_NODE_SNAPSHOT_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_iterateNext_INVALID_STATE_ERR.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_iteratorNext_ORDERED_NODE_ITERATOR_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.js		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_numberValue.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_resultType.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.js		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_ANY_UNORDERED_NODE_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_singleNodeValue_FIRST_ORDERED_NODE_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_null.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_ORDERED_NODE_SNAPSHOT_TYPE_order.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_count.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotItem_UNORDERED_NODE_SNAPSHOT_TYPE_null.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_ORDERED_NODE_SNAPSHOT_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_snapshotLength_UNORDERED_NODE_SNAPSHOT_TYPE.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue-expected.txt		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/XPathResult_stringValue.svg		patch \| blob \| history
LayoutTests/dom/svg/level3/xpath/resources/internaldtd.xml	[new file with mode: 0644]	patch \| blob
LayoutTests/dom/svg/level3/xpath/resources/staff.dtd	[new file with mode: 0644]	patch \| blob
LayoutTests/dom/svg/level3/xpath/resources/staff.xml	[new file with mode: 0644]	patch \| blob
LayoutTests/dom/svg/level3/xpath/resources/staffNS.dtd	[new file with mode: 0644]	patch \| blob
LayoutTests/dom/svg/level3/xpath/resources/staffNS.xml	[new file with mode: 0644]	patch \| blob
LayoutTests/dom/svg/level3/xpath/svgunit.js		patch \| blob \| history