Index: namednodemapgetnameditemns01.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/namednodemapgetnameditemns01.xml,v
retrieving revision 1.3
diff -u -r1.3 namednodemapgetnameditemns01.xml
--- namednodemapgetnameditemns01.xml	30 Jun 2003 05:00:26 -0000	1.3
+++ namednodemapgetnameditemns01.xml	23 Dec 2003 05:34:46 -0000
@@ -20,16 +20,16 @@
 <title>namednodemapgetnameditemns01</title>
 <creator>IBM</creator>
 <description>
-	The method getNamedItemNS retrieves a node specified by local name and namespace URI. 
-	
 	Using the method getNamedItemNS, retreive the entity "ent1" and notation "notation1" 
-	from a NamedNodeMap of this DocumentTypes entities and notations.  Verify if these
-	have been retreived correctly using the nodeName attribute.
+	from a NamedNodeMap of this DocumentTypes entities and notations.
+	Both should be null since entities and notations are not namespaced.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-04-28</date>
 <subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-getNamedItemNS"/>
 <subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=407"/>
+<subject resource="http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html"/>
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
@@ -46,9 +46,7 @@
 <entities var="entities" obj="docType"/>
 <notations var="notations" obj="docType"/>
 <getNamedItemNS var="entity" obj="entities" namespaceURI="nullNS" localName='"ent1"'/>
+<assertNull actual="entity" id="entityNull"/>
 <getNamedItemNS var="notation" obj="notations" namespaceURI="nullNS" localName='"notation1"'/>
-<nodeName var="entityName" obj="entity"/>
-<nodeName var="notationName" obj="notation"/>
-<assertEquals actual="entityName" expected='"ent1"' id="namednodemapgetnameditemns01_entityName" ignoreCase="false"/>
-<assertEquals actual="notationName" expected='"notation1"' id="namednodemapgetnameditemns01_notationName" ignoreCase="false"/>
+<assertNull actual="notation" id="notationNull"/>
 </test>
Index: namednodemapremovenameditemns05.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/namednodemapremovenameditemns05.xml,v
retrieving revision 1.4
diff -u -r1.4 namednodemapremovenameditemns05.xml
--- namednodemapremovenameditemns05.xml	19 Dec 2003 22:00:44 -0000	1.4
+++ namednodemapremovenameditemns05.xml	23 Dec 2003 05:34:46 -0000
@@ -20,9 +20,6 @@
 <title>namednodemapremovenameditemns05</title>
 <creator>IBM</creator>
 <description>
-	The method removeNamedItemNS removes a node using its namespaceURI and localName and 
-	raises a NO_MODIFICATION_ALLOWED_ERR if this map is readonly.
-	
 	Retreive an entity and notation node and remove the first notation from the 
 	entity node map and first entity node from the notation map.  Since both these
 	maps are readonly, a NO_MODIFICATION_ALLOWED_ERR should be raised.
@@ -31,30 +28,34 @@
 <date qualifier="created">2002-04-28</date>
 <subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS"/>
 <subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=407"/>
+<subject resource="http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html"/>
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
 <var name="docType" type="DocumentType"/>
 <var name="entities" type="NamedNodeMap"/>
 <var name="notations" type="NamedNodeMap"/>
-<var name="entity" type="Entity"/>
-<var name="notation" type="Notation"/>
 <var name="removedNode" type="Node"/>
 <var name="nullNS" type="DOMString" isNull="true"/>
 <load var="doc" href="staffNS" willBeModified="true"/>
 <doctype var="docType" obj="doc"/>
 <entities var="entities" obj="docType"/>
 <notations var="notations" obj="docType"/>
-<getNamedItemNS var="entity" obj="entities" namespaceURI="nullNS" localName='"ent1"'/>
-<getNamedItemNS var="notation" obj="notations" namespaceURI="nullNS" localName='"notation1"'/>
-<assertDOMException id="namednodemapremovenameditemns05_entities">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeNamedItemNS var="removedNode" obj="entities"  namespaceURI="nullNS" localName='"notation1"'/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
-<assertDOMException id="namednodemapremovenameditemns05_notations">
-<NO_MODIFICATION_ALLOWED_ERR>
-<removeNamedItemNS var="removedNode" obj="notations"  namespaceURI="nullNS" localName='"ent1"'/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
+<try>
+   <removeNamedItemNS var="removedNode" obj="entities"  namespaceURI="nullNS" localName='"ent1"'/>
+   <fail id="entity_throw_DOMException"/>
+   <catch>
+   		<DOMException code="NOT_FOUND_ERR"/>
+   		<DOMException code="NO_MODIFICATION_ALLOWED_ERR"/>
+   </catch>
+</try>
+<try>
+	<removeNamedItemNS var="removedNode" obj="notations"  namespaceURI="nullNS" localName='"notation1"'/>
+    <fail id="notation_throw_DOMException"/>
+    <catch>
+    	<DOMException code="NOT_FOUND_ERR"/>
+    	<DOMException code="NO_MODIFICATION_ALLOWED_ERR"/>
+    </catch>
+</try>
 </test>
Index: namednodemapsetnameditemns05.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level2/core/namednodemapsetnameditemns05.xml,v
retrieving revision 1.4
diff -u -r1.4 namednodemapsetnameditemns05.xml
--- namednodemapsetnameditemns05.xml	19 Dec 2003 22:00:44 -0000	1.4
+++ namednodemapsetnameditemns05.xml	23 Dec 2003 05:34:46 -0000
@@ -20,17 +20,16 @@
 <title>namednodemapsetnameditemns05</title>
 <creator>IBM</creator>
 <description>
-	The method setNamedItemNS adds a node using its namespaceURI and localName and 
-	raises a NO_MODIFICATION_ALLOWED_ERR if this map is readonly.
-	
 	Retreive an entity and notation node and add the first notation to the 
-	entity node map and first entity node to the notation map.  Since both these
+	notation node map and first entity node to the entity map.  Since both these
 	maps are for readonly node, a NO_MODIFICATION_ALLOWED_ERR should be raised.
 </description>
 <contributor>Neil Delima</contributor>
 <date qualifier="created">2002-04-28</date>
 <subject resource="http://www.w3.org/TR/DOM-Level-2-Core/core#ID-setNamedItemNS"/>
 <subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=259"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=407"/>
+<subject resource="http://lists.w3.org/Archives/Member/w3c-dom-ig/2003Nov/0016.html"/>
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
 <var name="doc" type="Document"/>
@@ -45,16 +44,16 @@
 <doctype var="docType" obj="doc"/>
 <entities var="entities" obj="docType"/>
 <notations var="notations" obj="docType"/>
-<getNamedItemNS var="entity" obj="entities" namespaceURI="nullNS" localName='"ent1"'/>
-<getNamedItemNS var="notation" obj="notations" namespaceURI="nullNS" localName='"notation1"'/>
+<getNamedItem var="entity" obj="entities" name='"ent1"'/>
+<getNamedItem var="notation" obj="notations" name='"notation1"'/>
 <assertDOMException id="namednodemapsetnameditemns05_entities">
 <NO_MODIFICATION_ALLOWED_ERR>
-<setNamedItemNS var="newNode" obj="entities" arg="notation"/>
+<setNamedItemNS var="newNode" obj="entities" arg="entity"/>
 </NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 <assertDOMException id="namednodemapsetnameditemns05_notations">
 <NO_MODIFICATION_ALLOWED_ERR>
-<setNamedItemNS var="newNode" obj="notations" arg="entity"/>
+<setNamedItemNS var="newNode" obj="notations" arg="notation"/>
 </NO_MODIFICATION_ALLOWED_ERR>
 </assertDOMException>
 </test>