Index: alltests.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/alltests.xml,v
retrieving revision 1.4
diff -u -r1.4 alltests.xml
--- alltests.xml	16 Dec 2003 07:05:15 -0000	1.4
+++ alltests.xml	18 Dec 2003 09:25:47 -0000
@@ -491,6 +491,7 @@
 	<suite.member href="textreplacewholetext04.xml"/>
 	<suite.member href="textreplacewholetext05.xml"/>
 	<suite.member href="textreplacewholetext07.xml"/>	
+	<suite.member href="textreplacewholetext08.xml"/>	
 
 	
 	<!-- TypeInfo -->
Index: nodecomparedocumentposition29.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/nodecomparedocumentposition29.xml,v
retrieving revision 1.1
diff -u -r1.1 nodecomparedocumentposition29.xml
--- nodecomparedocumentposition29.xml	9 Dec 2003 20:29:08 -0000	1.1
+++ nodecomparedocumentposition29.xml	18 Dec 2003 09:25:47 -0000
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 2001 World Wide Web Consortium, 
+Copyright (c) 2001-2003 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
@@ -30,10 +30,8 @@
 </description>
 <contributor>Jenny Hsu</contributor>
 <date qualifier="created">2003-02-20</date>
-<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core.html#Node3-compareDocumentPosition"/>
+<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Node3-compareDocumentPosition"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
-<implementationAttribute name="expandEntityReferences" value="true"/>
 <var name="doc" type="Document"/>
 <var name="docElem" type="Element"/>
 <var name="entRef1" type="EntityReference"/>
@@ -43,7 +41,7 @@
 <var name="entRefChild1Position" type="int"/>
 <var name="entRefChild2Position" type="int"/>
 <var name="appendedChild" type="Node"/>
-<load var="doc" href="staffNS" willBeModified="false"/>
+<load var="doc" href="staffNS" willBeModified="true"/>
 <createEntityReference name='"ent4"' obj="doc" var="entRef1"/>
 <createEntityReference name='"ent4"' obj="doc" var="entRef2"/>
 <documentElement var="docElem" obj="doc"/>
Index: nodegettextcontent17.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/nodegettextcontent17.xml,v
retrieving revision 1.1
diff -u -r1.1 nodegettextcontent17.xml
--- nodegettextcontent17.xml	9 Dec 2003 20:29:09 -0000	1.1
+++ nodegettextcontent17.xml	18 Dec 2003 09:25:47 -0000
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 2001 World Wide Web Consortium, 
+Copyright (c) 2001-2003 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
@@ -28,16 +28,14 @@
 </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.html#Node3-textContent"/>
+<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Node3-textContent"/>
 </metadata>
-<implementationAttribute name="namespaceAware" value="true"/>
-<implementationAttribute name="expandEntityReferences" value="true"/>
 <var name="doc" type="Document"/>
 <var name="elem" type="Element"/>
 <var name="entRef" type="EntityReference"/>
 <var name="textContent" type="DOMString"/>
 <var name="appendedChild" type="Node"/>
-<load var="doc" href="staffNS" willBeModified="false"/>
+<load var="doc" href="staffNS" willBeModified=""/>
 <documentElement var="elem" obj="doc"/>
 <createEntityReference var="entRef" obj="doc" name='"ent2"' />
 <appendChild obj="elem" var="appendedChild" newChild="entRef"/>
Index: textreplacewholetext07.xml
===================================================================
RCS file: /sources/public/2001/DOM-Test-Suite/tests/level3/core/textreplacewholetext07.xml,v
retrieving revision 1.1
diff -u -r1.1 textreplacewholetext07.xml
--- textreplacewholetext07.xml	9 Dec 2003 20:29:08 -0000	1.1
+++ textreplacewholetext07.xml	18 Dec 2003 09:25:47 -0000
@@ -2,7 +2,7 @@
 
 <!--
 
-Copyright (c) 2001 World Wide Web Consortium, 
+Copyright (c) 2001-2003 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
@@ -21,20 +21,19 @@
 <title>textreplacewholetext07</title>
 <creator>IBM</creator>
 <description>
-	The method replaceWholeText substitutes the a specified text for the text of 
-	the current node and all logically-adjacent text nodes.  This method raises
-	a NO_MODIFICATION_ALLOWED_ERR if one of the Text nodes being replaced is readonly.
-
-	Invoke replaceWholeText on an existing text node with newly created text and Entityreference
-	nodes (whose replacement text is not text or cdata) appended as children of its parent element node.  
-	Check if a NO_MODIFICATION_ALLOWED_ERR gets thrown.
+Append an entity reference and a text node after to the content of the
+first name element.  Then call replaceWholeText on initial content
+of that element.  Since the entity reference does not contain any 
+logically-adjacent text content, only the initial text element should
+be replaced. 
 </description>
 <contributor>Neil Delima</contributor>
+<contributor>Curt Arnold</contributor>
 <date qualifier="created">2002-05-30</date>
-<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core.html#Text3-replaceWholeText"/>
+<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Text3-replaceWholeText"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=425"/>
 </metadata>
 <implementationAttribute name="namespaceAware" value="true"/>
-<implementationAttribute name="expandEntityReferences" value="true"/>
 <var name="doc" type="Document"/>
 <var name="itemList" type="NodeList"/>
 <var name="elementName" type="Element"/>
@@ -42,7 +41,10 @@
 <var name="erefNode" type="EntityReference"/>
 <var name="replacedText" type="Text"/>
 <var name="appendedChild" type="Node"/>
-<load var="doc" href="staffNS" willBeModified="false"/>
+<var name="node" type="Node"/>
+<var name="nodeValue" type="DOMString"/>
+<var name="nodeType" type="int"/>
+<load var="doc" href="staffNS" willBeModified="true"/>
 <getElementsByTagNameNS var="itemList" obj="doc" namespaceURI='"http://www.nist.gov"' localName='"name"' interface="Document"/>
 <item var="elementName" obj="itemList" index="0" interface="NodeList"/>
 <createEntityReference var="erefNode" obj="doc" name='"ent4"'/>
@@ -50,9 +52,14 @@
 <appendChild obj="elementName" var="appendedChild" newChild="erefNode"/>
 <appendChild obj="elementName" var="appendedChild" newChild="textNode"/>
 <firstChild var="textNode" obj="elementName" interface="Node"/>
-<assertDOMException id="NO_MODIFICATION_ALLOWED_ERR_textreplacewholetext07">
-<NO_MODIFICATION_ALLOWED_ERR>
 <replaceWholeText obj="textNode" var="replacedText" content='"New Text and Cdata"'/>
-</NO_MODIFICATION_ALLOWED_ERR>
-</assertDOMException>
+<firstChild var="textNode" obj="elementName" interface="Node"/>
+<assertSame expected="textNode" actual="replacedText" id="retval_same"/>
+<nodeValue var="nodeValue" obj="textNode"/>
+<assertEquals actual="nodeValue" expected='"New Text and Cdata"' 
+	id="nodeValueSame" ignoreCase="false"/>
+<nextSibling var="node" obj="textNode" interface="Node"/>
+<assertNotNull actual="node" id="secondChildNotNull"/>
+<nodeType var="nodeType" obj="node"/>
+<assertEquals actual="nodeType" expected="5" id="secondChildIsEntRef" ignoreCase="false"/>
 </test>
Index: tests/level3/core/textreplacewholetext08.xml
===================================================================
RCS file: tests/level3/core/textreplacewholetext08.xml
diff -N tests/level3/core/textreplacewholetext08.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level3/core/textreplacewholetext08.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet href="test-to-html.xsl" type="text/xml"?>
+<!--
+
+Copyright (c) 2001-2003 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.
+
+-->
+<!DOCTYPE test SYSTEM "dom3.dtd">
+<test xmlns="http://www.w3.org/2001/DOM-Test-Suite/Level-3" name="textreplacewholetext08">
+<metadata>
+<title>textreplacewholetext08</title>
+<creator>Curt Arnold</creator>
+<description>
+Appends an entity reference containing text and an element to an existing
+text node, then calls Text.replaceWholeText on the existing text node.
+A NO_MODIFICATION_ALLOWED_ERR should be thrown.
+</description>
+<date qualifier="created">2003-12-18</date>
+<subject resource="http://www.w3.org/TR/2003/CR-DOM-Level-3-Core-20031107/core#Text3-replaceWholeText"/>
+<subject resource="http://www.w3.org/Bugs/Public/show_bug.cgi?id=425"/>
+</metadata>
+<implementationAttribute name="namespaceAware" value="true"/>
+<var name="doc" type="Document"/>
+<var name="itemList" type="NodeList"/>
+<var name="p" type="Element"/>
+<var name="entRef" type="EntityReference"/>
+<var name="node" type="Node"/>
+<load var="doc" href="barfoo" willBeModified="true"/>
+<getElementsByTagNameNS var="itemList" obj="doc" namespaceURI='"http://www.w3.org/1999/xhtml"' localName='"p"' interface="Document"/>
+<item var="p" obj="itemList" index="0" interface="NodeList"/>
+<createEntityReference var="entRef" obj="doc" name='"ent2"'/>
+<appendChild obj="p" var="node" newChild="entRef"/>
+<firstChild var="node" obj="p" interface="Node"/>
+<assertDOMException id="throw_NO_MODIFICATION_ALLOWED_ERR">
+	<NO_MODIFICATION_ALLOWED_ERR>
+		<replaceWholeText obj="node" var="node" content='"yo"'/>
+	</NO_MODIFICATION_ALLOWED_ERR>
+</assertDOMException>
+</test>
Index: tests/level3/core/files/barfoo.svg
===================================================================
RCS file: tests/level3/core/files/barfoo.svg
diff -N tests/level3/core/files/barfoo.svg
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level3/core/files/barfoo.svg	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,20 @@
+<!DOCTYPE svg [
+<!ENTITY ent1 'foo'>
+<!ENTITY ent2 'foo<br/>'>
+<!ELEMENT svg (rect,p)>
+<!ATTLIST svg xmlns CDATA #IMPLIED>
+<!ELEMENT rect EMPTY>
+<!ATTLIST rect
+   x CDATA #REQUIRED
+   y CDATA #REQUIRED
+   width CDATA #REQUIRED
+   height CDATA #REQUIRED
+   fill CDATA #REQUIRED>
+<!ELEMENT p (#PCDATA|br)*>
+<!ATTLIST p xmlns CDATA #IMPLIED>
+<!ELEMENT br EMPTY>
+]>
+<svg xmlns="http://www.w3.org/2000/svg">
+<rect x="0" y="0" width="100" height="100" fill="blue"/>
+<p xmlns='http://www.w3.org/1999/xhtml'>bar</p>
+</svg>
Index: tests/level3/core/files/barfoo.xml
===================================================================
RCS file: tests/level3/core/files/barfoo.xml
diff -N tests/level3/core/files/barfoo.xml
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tests/level3/core/files/barfoo.xml	1 Jan 1970 00:00:00 -0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html [
+<!ENTITY ent1 'foo'>
+<!ENTITY ent2 'foo<br/>'>
+<!ELEMENT html (head, body)>
+<!ATTLIST html xmlns CDATA #IMPLIED>
+<!ELEMENT head (title)>
+<!ELEMENT title (#PCDATA)>
+<!ELEMENT body (p)>
+<!ELEMENT p (#PCDATA|br)*>
+<!ELEMENT br EMPTY>
+]>
+<html xmlns='http://www.w3.org/1999/xhtml'>
+<head>
+<title>replaceWholeText sample</title>
+</head>
+<body> 
+<p>bar</p>
+</body>
+</html>