Index: tests/level3/core/nodecomparedocumentposition26.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 nodecomparedocumentposition26.xml
--- tests/level3/core/nodecomparedocumentposition26.xml	7 Jan 2004 04:54:28 -0000	1.4
+++ tests/level3/core/nodecomparedocumentposition26.xml	18 Feb 2004 00:46:52 -0000
@@ -28,29 +28,27 @@
 <date qualifier="created">2003-02-20</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Node3-compareDocumentPosition"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
-<var name="elemList" type="NodeList"/>
-<var name="gender2List" type="NodeList"/>
-<var name="entRefList" type="NodeList"/>
-<var name="elemName" type="Element"/>
+<var name="varList" type="NodeList"/>
+<var name="varElem" type="Element"/>
 <var name="entRef" type="EntityReference"/>
 <var name="entRefChild1" type="Element"/>
 <var name="entRefPosition" type="int"/>
 <var name="entRefChild1Position" type="int"/>
 <load var="doc" href="hc_staff" willBeModified="false"/>
 <if>
-<implementationAttribute name="expandEntityReferences" value="false"/>
-<getElementsByTagNameNS var="elemList" obj="doc" namespaceURI='"*"' localName='"var"' interface="Document"/>
-<item var="elemName" obj="elemList" index="2" interface="NodeList"/>
-<childNodes obj="elemName" var="gender2List"/>
-<item interface="NodeList" obj="gender2List" var="entRef" index="0"/>
-<else>
-<createEntityReference name='"ent4"' obj="doc" var="entRef"/>
-</else>
+	<implementationAttribute name="expandEntityReferences" value="false"/>
+	<getElementsByTagName var="varList" obj="doc" tagname='"var"' interface="Document"/>
+	<item var="varElem" obj="varList" index="2" interface="NodeList"/>
+	<assertNotNull actual="varElem" id="varElemNotNull"/>
+	<firstChild var="entRef" obj="varElem" interface="Node"/>
+	<assertNotNull actual="entRef" id="entRefNotNull"/>
+	<else>
+		<createEntityReference name='"ent4"' obj="doc" var="entRef"/>
+	</else>
 </if>
-<childNodes obj="entRef" var="entRefList"/>
-<item interface="NodeList" obj="entRefList" var="entRefChild1" index="0"  />
+<firstChild var="entRefChild1" obj="entRef" interface="Node"/>
+<assertNotNull actual="entRefChild1" id="entRefChild1NotNull"/>
 <compareDocumentPosition var="entRefPosition" obj="entRef" other="entRefChild1"/>
 <assertEquals  actual="entRefPosition" expected="20" id="nodecomparedocumentpositionIsContainedFollowing26" ignoreCase="false"/>
 <compareDocumentPosition var="entRefChild1Position" obj="entRefChild1" other="entRef"/>
Index: tests/level3/core/nodecomparedocumentposition27.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 nodecomparedocumentposition27.xml
--- tests/level3/core/nodecomparedocumentposition27.xml	7 Jan 2004 04:54:28 -0000	1.4
+++ tests/level3/core/nodecomparedocumentposition27.xml	18 Feb 2004 00:46:52 -0000
@@ -28,27 +28,27 @@
 <date qualifier="created">2003-02-20</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Node3-compareDocumentPosition"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
-<var name="elemList" type="NodeList"/>
-<var name="gender2List" type="NodeList"/>
-<var name="elemName" type="Element"/>
+<var name="varList" type="NodeList"/>
+<var name="varElem" type="Element"/>
 <var name="entRef" type="EntityReference"/>
 <var name="entRefChild1" type="ProcessingInstruction"/>
 <var name="entRefPosition" type="int"/>
 <var name="entRefChild1Position" type="int"/>
 <load var="doc" href="hc_staff" willBeModified="false"/>
 <if>
-<implementationAttribute name="expandEntityReferences" value="false"/>
-<getElementsByTagNameNS var="elemList" obj="doc" namespaceURI='"*"' localName='"var"' interface="Document"/>
-<item var="elemName" obj="elemList" index="2" interface="NodeList"/>
-<childNodes obj="elemName" var="gender2List"/>
-<item interface="NodeList" obj="gender2List" var="entRef" index="0"/>
-<else>
-<createEntityReference name='"ent4"' obj="doc" var="entRef"/>
-</else>
+	<implementationAttribute name="expandEntityReferences" value="false"/>
+	<getElementsByTagName var="varList" obj="doc" tagname='"var"' interface="Document"/>
+	<item var="varElem" obj="varList" index="2" interface="NodeList"/>
+	<assertNotNull actual="varElem" id="varElemNotNull"/>
+	<firstChild var="entRef" obj="varElem" interface="Node"/>
+	<assertNotNull actual="entRef" id="entRefNotNull"/>
+	<else>
+		<createEntityReference name='"ent4"' obj="doc" var="entRef"/>
+	</else>
 </if>
 <lastChild obj="entRef" var="entRefChild1" interface="Node"/>
+<assertNotNull actual="entRefChild1" id="entRefChild1NotNull"/>
 <compareDocumentPosition var="entRefPosition" obj="entRef" other="entRefChild1"/>
 <assertEquals  actual="entRefPosition" expected="20" id="nodecomparedocumentpositionIsContainedFollowing27" ignoreCase="false"/>
 <compareDocumentPosition var="entRefChild1Position" obj="entRefChild1" other="entRef"/>
Index: tests/level3/core/nodecomparedocumentposition28.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 nodecomparedocumentposition28.xml
--- tests/level3/core/nodecomparedocumentposition28.xml	7 Jan 2004 04:54:28 -0000	1.4
+++ tests/level3/core/nodecomparedocumentposition28.xml	18 Feb 2004 00:46:52 -0000
@@ -29,11 +29,9 @@
 <date qualifier="created">2003-02-20</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Node3-compareDocumentPosition"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
-<var name="elemList" type="NodeList"/>
-<var name="gender2List" type="NodeList"/>
-<var name="elemName" type="Element"/>
+<var name="varList" type="NodeList"/>
+<var name="varElem" type="Element"/>
 <var name="entRef" type="EntityReference"/>
 <var name="entRefChild1" type="Element"/>
 <var name="entRefChild2" type="ProcessingInstruction"/>
@@ -41,17 +39,20 @@
 <var name="entRefChild2Position" type="int"/>
 <load var="doc" href="hc_staff" willBeModified="false"/>
 <if>
-<implementationAttribute name="expandEntityReferences" value="false"/>
-<getElementsByTagNameNS var="elemList" obj="doc" namespaceURI='"*"' localName='"var"' interface="Document"/>
-<item var="elemName" obj="elemList" index="2" interface="NodeList"/>
-<childNodes obj="elemName" var="gender2List"/>
-<item interface="NodeList" obj="gender2List" var="entRef" index="0"/>
-<else>
-<createEntityReference name='"ent4"' obj="doc" var="entRef"/>
-</else>
+	<implementationAttribute name="expandEntityReferences" value="false"/>
+	<getElementsByTagName var="varList" obj="doc" tagname='"var"' interface="Document"/>
+	<item var="varElem" obj="varList" index="2" interface="NodeList"/>
+	<assertNotNull actual="varElem" id="varElemNotNull"/>
+	<firstChild var="entRef" obj="varElem" interface="Node"/>
+	<assertNotNull actual="entRef" id="entRefNotNull"/>
+	<else>
+		<createEntityReference name='"ent4"' obj="doc" var="entRef"/>
+	</else>
 </if>
 <firstChild obj="entRef" var="entRefChild1" interface="Node"/>
+<assertNotNull actual="entRefChild1" id="entRefChild1NotNull"/>
 <lastChild obj="entRef" var="entRefChild2" interface="Node"/>
+<assertNotNull actual="entRefChild2" id="entRefChild2NotNull"/>
 <compareDocumentPosition var="entRefChild1Position" obj="entRefChild1" other="entRefChild2"/>
 <assertEquals  actual="entRefChild1Position" expected="4" id="nodecomparedocumentpositionFollowing28" ignoreCase="false"/>
 <compareDocumentPosition var="entRefChild2Position" obj="entRefChild2" other="entRefChild1"/>
Index: tests/level3/core/nodecomparedocumentposition29.xml
===================================================================
retrieving revision 1.5
diff -u -r1.5 nodecomparedocumentposition29.xml
--- tests/level3/core/nodecomparedocumentposition29.xml	7 Jan 2004 04:54:28 -0000	1.5
+++ tests/level3/core/nodecomparedocumentposition29.xml	18 Feb 2004 00:46:52 -0000
@@ -45,7 +45,9 @@
 <appendChild obj="docElem" var="appendedChild" newChild="entRef1"/>
 <appendChild obj="docElem" var="appendedChild" newChild="entRef2"/>
 <firstChild obj="entRef1" var="entRefChild1" interface="Node"/>
+<assertNotNull actual="entRefChild1" id="entRefChild1NotNull"/>
 <lastChild obj="entRef2" var="entRefChild2" interface="Node"/>
+<assertNotNull actual="entRefChild2" id="entRefChild2NotNull"/>
 <compareDocumentPosition var="entRefChild1Position" obj="entRefChild1" other="entRefChild2"/>
 <assertEquals  actual="entRefChild1Position" expected="4" id="nodecomparedocumentpositionFollowing29" ignoreCase="false"/>
 <compareDocumentPosition var="entRefChild2Position" obj="entRefChild2" other="entRefChild1"/>
Index: tests/level3/core/nodegetbaseuri19.xml
===================================================================
retrieving revision 1.1
diff -u -r1.1 nodegetbaseuri19.xml
--- tests/level3/core/nodegetbaseuri19.xml	8 Jan 2004 06:43:12 -0000	1.1
+++ tests/level3/core/nodegetbaseuri19.xml	18 Feb 2004 00:46:52 -0000
@@ -31,7 +31,6 @@
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/infoset-mapping#Infoset2DocumentType"/>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/infoset-mapping#Infoset2EntityReference"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="validating" value="true"/>
 <var name="doc" type="Document"/>
 <var name="baseURI" type="DOMString"/>
@@ -41,18 +40,20 @@
 <var name="pElem" type="Element"/>
 <var name="textNode" type="Text"/>
 <var name="docURI" type="DOMString"/>
-<var name="htmlNS" type="DOMString" value='"http://www.w3.org/1999/xhtml"'/>
 <load var="doc" href="external_barfoo" willBeModified="true"/>
-<getElementsByTagNameNS var="pList" obj="doc" 
-    namespaceURI='htmlNS'
-    localName='"p"' interface="Document"/>
+<getElementsByTagName var="pList" obj="doc" 
+    tagname='"p"' interface="Document"/>
 <item var="pElem" obj="pList" index="0" interface="NodeList"/>
+<assertNotNull actual="pElem" id="pElemNotNull"/>
 <if>
     <implementationAttribute name="expandEntityReferences" value="true"/>
     <firstChild var="textNode" obj="pElem" interface="Node"/>
+    <assertNotNull actual="textNode" id="expansionNotNull"/>
     <else>
 		<lastChild var="entRef" obj="pElem" interface="Node"/>
+		<assertNotNull actual="entRef" id="entRefNotNull"/>
 		<firstChild var="textNode" obj="entRef" interface="Node"/>
+		<assertNotNull actual="textNode" id="entRefTextNotNull"/>
 	</else>
 </if>
 <baseURI var="baseURI" obj="textNode" interface="Node"/>
Index: tests/level3/core/nodegetbaseuri20.xml
===================================================================
retrieving revision 1.1
diff -u -r1.1 nodegetbaseuri20.xml
--- tests/level3/core/nodegetbaseuri20.xml	8 Jan 2004 06:43:12 -0000	1.1
+++ tests/level3/core/nodegetbaseuri20.xml	18 Feb 2004 00:46:52 -0000
@@ -30,19 +30,16 @@
 <subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=419"/>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/infoset-mapping#Infoset2EntityReference"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="validating" value="true"/>
 <var name="doc" type="Document"/>
 <var name="baseURI" type="DOMString"/>
 <var name="pList" type="NodeList"/>
 <var name="pElem" type="Element"/>
-<var name="textNode" type="Text"/>
-<var name="htmlNS" type="DOMString" value='"http://www.w3.org/1999/xhtml"'/>
 <load var="doc" href="external_barfoo" willBeModified="true"/>
-<getElementsByTagNameNS var="pList" obj="doc" 
-    namespaceURI='htmlNS'
-    localName='"p"' interface="Document"/>
+<getElementsByTagName var="pList" obj="doc" 
+    tagname='"p"' interface="Document"/>
 <item var="pElem" obj="pList" index="2" interface="NodeList"/>
+<assertNotNull actual="pElem" id="pElemNotNull"/>
 <baseURI var="baseURI" obj="pElem" interface="Node"/>
 <assertURIEquals actual="baseURI" isAbsolute="true" name='"external_widget"' id="equalsExternalBarFoo"/>
 </test>
Index: tests/level3/core/nodeinsertbefore25.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 nodeinsertbefore25.xml
--- tests/level3/core/nodeinsertbefore25.xml	5 Jan 2004 08:27:13 -0000	1.4
+++ tests/level3/core/nodeinsertbefore25.xml	18 Feb 2004 00:46:52 -0000
@@ -29,26 +29,27 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-952280727"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="expandEntityReferences" value="false"/>
 <var name="doc" type="Document"/>
 <var name="element" type="Element"/>
 <var name="eRef" type="EntityReference"/>
-<var name="parent" type="Element"/>
-<var name="refNode" type="Text"/>
+<var name="span" type="Element"/>
+<var name="spanText" type="Text"/>
 <var name="newNode" type="Element"/>
 <var name="childList" type="NodeList"/>
 <var name="inserted" type="Node"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
-<getElementsByTagNameNS var="childList" obj="doc" namespaceURI='"*"' localName='"var"' interface="Document"/>
+<getElementsByTagName var="childList" obj="doc" tagname='"var"' interface="Document"/>
 <item var="element" obj="childList" index="2" interface="NodeList"/>
 <firstChild var="eRef" obj="element" interface="Node"/>
-<firstChild var="parent" obj="eRef" interface="Node"/>
-<firstChild var="refNode" obj="parent" interface="Node"/>
+<firstChild var="span" obj="eRef" interface="Node"/>
+<assertNotNull actual="span" id="spanNotNull"/>
+<firstChild var="spanText" obj="span" interface="Node"/>
+<assertNotNull actual="spanText" id="spanTextNotNull"/>
 <createElementNS var="newNode" obj="doc" namespaceURI='"http://www.w3.org/1999/xhtml"' qualifiedName='"span"'/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_nodeinsertbefore25">
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
 <NO_MODIFICATION_ALLOWED_ERR>
-<insertBefore obj="parent" var="inserted" refChild="refNode" newChild="newNode"/>
+<insertBefore obj="span" var="inserted" refChild="spanText" newChild="newNode"/>
 </NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/noderemovechild13.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 noderemovechild13.xml
--- tests/level3/core/noderemovechild13.xml	5 Jan 2004 08:27:14 -0000	1.4
+++ tests/level3/core/noderemovechild13.xml	18 Feb 2004 00:46:53 -0000
@@ -21,9 +21,6 @@
 <title>noderemovechild13</title>
 <creator>IBM</creator>
 <description>
-
-
-
 	Using removeChild on a new EntityReference node attempt to remove the first child 
 	of this node and verify if a NO_MODIFICATION_ALLOWED_ERR is thrown.
 </description>
@@ -31,7 +28,6 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-1734834066"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="txt" type="Text"/>
 <var name="eRef" type="EntityReference"/>
@@ -39,9 +35,10 @@
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <createEntityReference var="eRef" obj="doc" name='"alpha"'/>
 <firstChild obj="eRef" var="txt" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_noderemovechild13">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeChild obj="eRef" var="removed" oldChild="txt" />
-</NO_MODIFICATION_ALLOWED_ERR>
+<assertNotNull actual="txt" id="txtNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<removeChild obj="eRef" var="removed" oldChild="txt" />
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/noderemovechild14.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 noderemovechild14.xml
--- tests/level3/core/noderemovechild14.xml	5 Jan 2004 08:27:14 -0000	1.4
+++ tests/level3/core/noderemovechild14.xml	18 Feb 2004 00:46:53 -0000
@@ -28,7 +28,6 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-1734834066"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="removed" type="Node"/>
 <var name="eRef" type="EntityReference"/>
@@ -37,9 +36,10 @@
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <createEntityReference var="eRef" obj="doc" name='"ent4"'/>
 <lastChild obj="eRef" var="pi" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_noderemovechild14">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeChild obj="eRef" var="removed" oldChild="pi" />
-</NO_MODIFICATION_ALLOWED_ERR>
+<assertNotNull actual="pi" id="piNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<removeChild obj="eRef" var="removed" oldChild="pi" />
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/noderemovechild15.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 noderemovechild15.xml
--- tests/level3/core/noderemovechild15.xml	5 Jan 2004 08:27:13 -0000	1.4
+++ tests/level3/core/noderemovechild15.xml	18 Feb 2004 00:46:53 -0000
@@ -28,7 +28,6 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-1734834066"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="eRef" type="EntityReference"/>
 <var name="elem" type="Element"/>
@@ -37,10 +36,10 @@
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <createEntityReference var="eRef" obj="doc" name='"ent4"'/>
 <firstChild obj="eRef" var="elem" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_noderemovechild14">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeChild obj="eRef" var="removed" oldChild="elem" />
-</NO_MODIFICATION_ALLOWED_ERR>
+<assertNotNull actual="elem" id="elemNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<removeChild obj="eRef" var="removed" oldChild="elem" />
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
-
 </test>
Index: tests/level3/core/noderemovechild24.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 noderemovechild24.xml
--- tests/level3/core/noderemovechild24.xml	5 Jan 2004 08:27:14 -0000	1.4
+++ tests/level3/core/noderemovechild24.xml	18 Feb 2004 00:46:53 -0000
@@ -21,9 +21,6 @@
 <title>noderemovechild24</title>
 <creator>IBM</creator>
 <description>
-
-
-
 	Using removeChild on an Entity node attempt to remove a Text child 
 	and verify if a NO_MODIFICATION_ALLOWED_ERR gets thrown.  
 </description>
@@ -31,21 +28,22 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-1734834066"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="docType" type="DocumentType"/>
 <var name="entitiesMap" type="NamedNodeMap"/>
-<var name="parent" type="Entity"/>
-<var name="child" type="Text"/>
+<var name="alphaEntity" type="Entity"/>
+<var name="alphaText" type="Text"/>
 <var name="removed" type="Text"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <doctype var="docType" obj="doc"/>
 <entities var="entitiesMap" obj="docType"/>
-<item var="parent" interface="NamedNodeMap" obj="entitiesMap" index="0"/>
-<firstChild var="child" obj="parent" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_noderemovechild24">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeChild var="removed"  obj="parent" oldChild="child" />
-</NO_MODIFICATION_ALLOWED_ERR>
+<getNamedItem var="alphaEntity" obj="entitiesMap" name='"alpha"' interface="NamedNodeMap"/>
+<assertNotNull actual="alphaEntity" id="alphaEntityNotNull"/>
+<firstChild var="alphaText" obj="alphaEntity" interface="Node"/>
+<assertNotNull actual="alphaText" id="alphaTextNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<removeChild var="removed"  obj="alphaEntity" oldChild="alphaText" />
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/noderemovechild25.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 noderemovechild25.xml
--- tests/level3/core/noderemovechild25.xml	5 Jan 2004 08:27:14 -0000	1.4
+++ tests/level3/core/noderemovechild25.xml	18 Feb 2004 00:46:53 -0000
@@ -21,9 +21,6 @@
 <title>noderemovechild25</title>
 <creator>IBM</creator>
 <description>
-
-
-
 	Using removeChild on an Entity node attempt to remove an Element child 
 	and verify if a NO_MODIFICATION_ALLOWED_ERR gets thrown.  
 </description>
@@ -31,21 +28,22 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-1734834066"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="docType" type="DocumentType"/>
 <var name="entitiesMap" type="NamedNodeMap"/>
-<var name="parent" type="Entity"/>
-<var name="child" type="Element"/>
+<var name="ent4" type="Entity"/>
+<var name="span" type="Element"/>
 <var name="removed" type="Node"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <doctype var="docType" obj="doc"/>
 <entities var="entitiesMap" obj="docType"/>
-<getNamedItem var="parent" interface="NamedNodeMap" obj="entitiesMap" name='"delta"'/>
-<firstChild var="child" obj="parent" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_noderemovechild25">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeChild obj="parent" var="removed" oldChild="child" />
-</NO_MODIFICATION_ALLOWED_ERR>
+<getNamedItem var="ent4" interface="NamedNodeMap" obj="entitiesMap" name='"ent4"'/>
+<assertNotNull actual="ent4" id="ent4NotNull"/>
+<firstChild var="span" obj="ent4" interface="Node"/>
+<assertNotNull actual="span" id="spanNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<removeChild obj="ent4" var="removed" oldChild="span" />
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/noderemovechild26.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 noderemovechild26.xml
--- tests/level3/core/noderemovechild26.xml	5 Jan 2004 08:27:13 -0000	1.4
+++ tests/level3/core/noderemovechild26.xml	18 Feb 2004 00:46:53 -0000
@@ -21,9 +21,6 @@
 <title>noderemovechild26</title>
 <creator>IBM</creator>
 <description>
-
-
-
 	Using removeChild on an Entity node attempt to remove a ProcessingInstruction child 
 	and verify if a NO_MODIFICATION_ALLOWED_ERR gets thrown.  
 </description>
@@ -31,21 +28,22 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-1734834066"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="docType" type="DocumentType"/>
 <var name="entitiesMap" type="NamedNodeMap"/>
-<var name="parent" type="Entity"/>
-<var name="child" type="ProcessingInstruction"/>
+<var name="ent4" type="Entity"/>
+<var name="pi" type="ProcessingInstruction"/>
 <var name="removed" type="Node"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <doctype var="docType" obj="doc"/>
 <entities var="entitiesMap" obj="docType"/>
-<getNamedItem var="parent" interface="NamedNodeMap" obj="entitiesMap" name='"delta"'/>
-<lastChild var="child" obj="parent" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_noderemovechild26">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeChild obj="parent" var="removed" oldChild="child" />
-</NO_MODIFICATION_ALLOWED_ERR>
+<getNamedItem var="ent4" interface="NamedNodeMap" obj="entitiesMap" name='"ent4"'/>
+<assertNotNull actual="ent4" id="ent4NotNull"/>
+<lastChild var="pi" obj="ent4" interface="Node"/>
+<assertNotNull actual="pi" id="piNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<removeChild obj="ent4" var="removed" oldChild="pi" />
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/nodereplacechild28.xml
===================================================================
retrieving revision 1.4
diff -u -r1.4 nodereplacechild28.xml
--- tests/level3/core/nodereplacechild28.xml	5 Jan 2004 08:27:14 -0000	1.4
+++ tests/level3/core/nodereplacechild28.xml	18 Feb 2004 00:46:53 -0000
@@ -21,37 +21,36 @@
 <title>nodereplacechild28</title>
 <creator>IBM</creator>
 <description>
-
-
-
-	Using replaceChild on an Element node that is a child of a read-only EntityReference node
-	attempt to replace a new Element child node with another new Element node and verify if a 
-	NO_MODIFICATION_ALLOWED_ERR gets thrown.
+Attempt to replace a text node with a text node from an
+entity reference. Since the replacing text node should be removed
+from its current location first, a NO_MODIFICATION_ALLOWED_ERR should
+be thrown.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-785887307"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="expandEntityReferences" value="false"/>
 <var name="doc" type="Document"/>
 <var name="childList" type="NodeList"/>
-<var name="elem" type="Element"/>
-<var name="entRef" type="EntityReference"/>
-<var name="oldChild" type="Element"/>
-<var name="newChild" type="Node"/>
+<var name="acronym" type="Element"/>
+<var name="betaRef" type="EntityReference"/>
+<var name="dallas" type="Text"/>
+<var name="betaText" type="Node"/>
 <var name="appendedChild" type="Node"/>
 <var name="replacedChild" type="Node"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
-<getElementsByTagNameNS var="childList" obj="doc" namespaceURI='"*"' localName='"acronym"' interface="Document"/>
-<item var="elem" obj="childList" index="1" interface="NodeList"/>
-<firstChild var="entRef" obj="elem" interface="Node"/>
-<createElementNS var="oldChild" obj="doc" namespaceURI='"http://www.w3.org/DOM"' qualifiedName='"dom3:elem"'/>
-<appendChild obj="elem" var="appendedChild" newChild="oldChild"/>
-<firstChild var="newChild" obj="entRef" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_nodereplacechild28">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="elem" var="replacedChild" oldChild="oldChild" newChild="newChild"/>
-</NO_MODIFICATION_ALLOWED_ERR>
+<getElementsByTagName var="childList" obj="doc" tagname='"acronym"' interface="Document"/>
+<item var="acronym" obj="childList" index="1" interface="NodeList"/>
+<firstChild var="betaRef" obj="acronym" interface="Node"/>
+<assertNotNull actual="betaRef" id="betaRefNotNull"/>
+<firstChild var="betaText" obj="betaRef" interface="Node"/>
+<assertNotNull actual="betaText" id="betaTextNotNull"/>
+<nextSibling var="dallas" obj="betaRef" interface="Node"/>
+<assertNotNull actual="dallas" id="dallasNotNull"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="acronym" var="replacedChild" oldChild="dallas" newChild="betaText"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/nodereplacechild31.xml
===================================================================
retrieving revision 1.5
diff -u -r1.5 nodereplacechild31.xml
--- tests/level3/core/nodereplacechild31.xml	8 Jan 2004 17:36:49 -0000	1.5
+++ tests/level3/core/nodereplacechild31.xml	18 Feb 2004 00:46:53 -0000
@@ -21,9 +21,6 @@
 <title>nodereplacechild31</title>
 <creator>IBM</creator>
 <description>
-
-
-
 	Using replaceChild on an Element node that is the replacement Text of an EntityReference
 	node, attempt to replace its Text child node with a new Element node and verify if 
 	a NO_MODIFICATION_ALLOWED_ERR gets thrown.
@@ -32,28 +29,27 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-785887307"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="expandEntityReferences" value="false"/>
 <var name="doc" type="Document"/>
 <var name="childList" type="NodeList"/>
-<var name="oldchildList" type="NodeList"/>
 <var name="elem" type="Element"/>
-<var name="parent" type="Element"/>
-<var name="entRef" type="EntityReference"/>
-<var name="oldChild" type="Text"/>
+<var name="span" type="Element"/>
+<var name="ent4Ref" type="EntityReference"/>
+<var name="spanText" type="Text"/>
 <var name="newChild" type="Element"/>
 <var name="replaced" type="Node"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
-<getElementsByTagNameNS var="childList" obj="doc" namespaceURI='"*"' localName='"var"' interface="Document"/>
+<getElementsByTagName var="childList" obj="doc" tagname='"var"' interface="Document"/>
 <item var="elem" obj="childList" index="2" interface="NodeList"/>
-<firstChild var="entRef" obj="elem" interface="Node"/>
-<firstChild var="parent" obj="entRef" interface="Node"/>
-<childNodes var="oldchildList" obj="parent"/>
-<item var="oldChild" obj="oldchildList" index="0" interface="NodeList"/>
+<firstChild var="ent4Ref" obj="elem" interface="Node"/>
+<firstChild var="span" obj="ent4Ref" interface="Node"/>
+<assertNotNull actual="span" id="spanNotNull"/>
+<firstChild var="spanText" obj="span" interface="Node"/>
+<assertNotNull actual="spanText" id="spanTextNotNull"/>
 <createElementNS var="newChild" obj="doc" namespaceURI='"http://www.w3.org/1999/xhtml"' qualifiedName='"xhtml:p"'/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_nodereplacechild31">
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
 <NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="parent" var="replaced" oldChild="oldChild" newChild="newChild"/>
+<replaceChild obj="span" var="replaced" oldChild="spanText" newChild="newChild"/>
 </NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/nodereplacechild38.xml
===================================================================
retrieving revision 1.5
diff -u -r1.5 nodereplacechild38.xml
--- tests/level3/core/nodereplacechild38.xml	8 Jan 2004 17:36:49 -0000	1.5
+++ tests/level3/core/nodereplacechild38.xml	18 Feb 2004 00:46:53 -0000
@@ -21,9 +21,6 @@
 <title>nodereplacechild38</title>
 <creator>IBM</creator>
 <description>
-
-
-
 	Using replaceChild on an Entity node attempt to replace its Text child with new Text,
 	Comment, ProcessingInstruction and CDATASection nodes and in each case verify if 
 	a NO_MODIFICATION_ALLOWED_ERR is raised.
@@ -32,7 +29,6 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#ID-785887307"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="expandEntityReferences" value="false"/>
 <var name="doc" type="Document"/>
 <var name="docType" type="DocumentType"/>
@@ -50,41 +46,43 @@
 <doctype var="docType" obj="doc" />
 <entities var="entitiesMap" obj="docType" />
 <getNamedItem var="ent" obj="entitiesMap" name='"alpha"'/>
-<createElementNS var="elem" obj="doc" namespaceURI='"http://www.w3.org/1999/xhtml"' qualifiedName='"xhtml:p"'/>
-<createEntityReference var="entRef" obj="doc" name='"delta"'/>
-<createTextNode var="txt" obj="doc" data='"Text"'/>
-<createComment var="comment" obj="doc" data='"Comment"'/>
+<assertNotNull actual="ent" id="alphaEntity"/>
+<firstChild var="oldChild" obj="ent" interface="Node"/>
+<assertNotNull actual="oldChild" id="alphaText"/>
 <createCDATASection var="cdata" obj="doc" data='"CDATASection"'/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR1">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="cdata"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
+</assertDOMException>
 <createProcessingInstruction var="pi" obj="doc" target='"target"' data='"data"'/>
-<firstChild var="oldChild" obj="ent" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR1_nodereplacechild38_1">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="cdata"/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR2_nodereplacechild38_2">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="pi"/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR3_nodereplacechild38_3">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="comment"/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR4_nodereplacechild38_4">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="txt"/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR5_nodereplacechild38_5">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="elem"/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR5_nodereplacechild38_6">
-<NO_MODIFICATION_ALLOWED_ERR>
-<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="entRef"/>
-</NO_MODIFICATION_ALLOWED_ERR>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR2">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="pi"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
+</assertDOMException>
+<createComment var="comment" obj="doc" data='"Comment"'/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR3">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="comment"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
+</assertDOMException>
+<createTextNode var="txt" obj="doc" data='"Text"'/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR4">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="txt"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
+</assertDOMException>
+<createElementNS var="elem" obj="doc" namespaceURI='"http://www.w3.org/1999/xhtml"' qualifiedName='"xhtml:p"'/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR5">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="elem"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
+</assertDOMException>
+<createEntityReference var="entRef" obj="doc" name='"delta"'/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR5">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceChild obj="ent" var="replaced" oldChild="oldChild" newChild="entRef"/>
+	</NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>
Index: tests/level3/core/nodesetuserdata10.xml
===================================================================
retrieving revision 1.2
diff -u -r1.2 nodesetuserdata10.xml
--- tests/level3/core/nodesetuserdata10.xml	5 Jan 2004 08:27:13 -0000	1.2
+++ tests/level3/core/nodesetuserdata10.xml	18 Feb 2004 00:46:53 -0000
@@ -21,8 +21,6 @@
 <title>nodesetuserdata10</title>
 <creator>IBM</creator>
 <description>
-
-	
 	Invoke setUserData on a CDATASection and EntityReference node to set their 
 	UserData to this Document and DocumentElement node.  Verify if the UserData 
 	object that was set for both nodes is different.
@@ -31,15 +29,13 @@
 <date qualifier="created">2002-06-10</date>
 <subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Node3-setUserData"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
 <implementationAttribute name="expandEntityReferences" value="false"/>
 <var name="doc" type="Document"/>
 <var name="docElem" type="Element"/>
 <var name="entRef" type="EntityReference"/>
 <var name="cData" type="CDATASection"/>
-<var name="elemList" type="NodeList"/>
-<var name="elemName" type="Element"/>
-<var name="gender2List" type="Element"/>
+<var name="varList" type="NodeList"/>
+<var name="varElem" type="Element"/>
 <var name="userData" type="DOMUserData"/>
 <var name="returned1" type="DOMUserData"/>
 <var name="returned2" type="DOMUserData"/>
@@ -48,10 +44,9 @@
 <var name="nullHandler" type="UserDataHandler" isNull="true"/>
 <load var="doc" href="hc_staff" willBeModified="true"/>
 <documentElement var="docElem" obj="doc"/>
-<getElementsByTagNameNS var="elemList" obj="doc" namespaceURI='"*"' localName='"var"' interface="Document"/>
-<item var="elemName" obj="elemList" index="2" interface="NodeList"/>
-<childNodes obj="elemName" var="gender2List"/>
-<item interface="NodeList" obj="gender2List" var="entRef" index="0"/>
+<getElementsByTagName var="varList" obj="doc" tagname='"var"' interface="Document"/>
+<item var="varElem" obj="varList" index="2" interface="NodeList"/>
+<firstChild var="entRef" obj="varElem" interface="Node"/>
 <createCDATASection var="cData" obj="doc" data='"CDATASection"' />
 <setUserData obj="entRef" var="retUserData" key='"Key1"' data="doc" handler="nullHandler"/>
 <setUserData  obj="cData" var="retUserData" key='"Key2"' data="docElem" handler="nullHandler"/>
Index: tests/level3/core/files/hc_staff.xsd
===================================================================
retrieving revision 1.3
diff -u -r1.3 hc_staff.xsd
--- tests/level3/core/files/hc_staff.xsd	16 Jan 2004 05:14:44 -0000	1.3
+++ tests/level3/core/files/hc_staff.xsd	18 Feb 2004 00:46:53 -0000
@@ -57,6 +57,7 @@
   	  	  <xsd:enumeration value="Yes"/>
   	  	  <xsd:enumeration value="No"/>
   	  	  <xsd:enumeration value="Y&#945;"/>
+  	  	  <xsd:enumeration value="Y"/>
   	  </xsd:restriction>
   </xsd:simpleType>
 
@@ -111,13 +112,15 @@
   	  	  <xsd:enumeration value="EMP0001"/>
   	  	  <xsd:enumeration value="EMP0002"/>
   	  	  <xsd:enumeration value="EMP0003"/>
+  	  	  <xsd:enumeration value="EMP0004"/>
+  	  	  <xsd:enumeration value="EMP0005"/>
   	  </xsd:restriction>
   </xsd:simpleType>
   
   <xsd:simpleType name="emp0004_5Type">
   	  <xsd:restriction base="xsd:ID">
-  	  	  <xsd:enumeration value="EMP0004"/>
-  	  	  <xsd:enumeration value="EMP0005"/>
+  	  	  <xsd:enumeration value="EMP0006"/>
+  	  	  <xsd:enumeration value="EMP0007"/>
   	  </xsd:restriction>
   </xsd:simpleType>
   
Index: tests/level3/core/files/Yes
===================================================================
RCS file: tests/level3/core/files/Yes
diff -N tests/level3/core/files/Yes
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level3/core/files/Yes	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,28 @@
+<!--
+
+Copyright (c) 2001-2004 World Wide Web Consortium, 
+(Massachusetts Institute of Technology, Institut National de
+Recherche en Informatique et en Automatique, Keio University).  All 
+Rights Reserved.  This program is distributed under the W3C's Software
+Intellectual Property License.  This program is distributed in the 
+hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+PURPOSE.  
+
+See W3C License http://www.w3.org/Consortium/Legal/ for more details.
+
+-->
+
+<!--
+
+xsi:noNamespaceSchemaLocation="Yes" appears in hc_staff.xml
+but it was not anticipated that "Yes" would be resolved since
+there were no elements without a namespace.  However, since
+at least one processor does attempt to load "Yes", this file
+is here to satisfy that request.
+
+-->
+
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <xsd:element name="bogus" type="xsd:string"/>
+</xsd:schema>