Author: andrews
Date: 2005-06-27 08:19:24 -0400 (Mon, 27 Jun 2005)
New Revision: 46552
Modified:
trunk/mcs/class/System.XML/System.Xml/ChangeLog
trunk/mcs/class/System.XML/System.Xml/DTDReader.cs
trunk/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
trunk/mcs/class/System.XML/Test/System.Xml/W3C/fixme.lst
Log:
Fixes valid-sa-086 test from W3C xmlconf suite
Modified: trunk/mcs/class/System.XML/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-06-27 12:15:18 UTC
(rev 46551)
+++ trunk/mcs/class/System.XML/System.Xml/ChangeLog 2005-06-27 12:19:24 UTC
(rev 46552)
@@ -1,3 +1,9 @@
+2005-06-27 Andrew Skiba <[EMAIL PROTECTED]>
+
+ * DTDReader.cs : don't validate entity values, when the entry is
+ redefined so it will be never used. Fixes valid-sa-086 test from W3C
+ xmlconf suite.
+
2005-06-27 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlQueryDialect.cs : removed.
Modified: trunk/mcs/class/System.XML/System.Xml/DTDReader.cs
===================================================================
--- trunk/mcs/class/System.XML/System.Xml/DTDReader.cs 2005-06-27 12:15:18 UTC
(rev 46551)
+++ trunk/mcs/class/System.XML/System.Xml/DTDReader.cs 2005-06-27 12:19:24 UTC
(rev 46552)
@@ -641,8 +641,9 @@
private void ResolveExternalEntityReplacementText
(DTDEntityBase decl)
{
if (decl.LiteralEntityValue.StartsWith ("<?xml")) {
+ // FIXME: not always it should be read in
Element context
XmlTextReader xtr = new XmlTextReader
(decl.LiteralEntityValue, XmlNodeType.Element, null);
- if (decl is DTDEntityDeclaration) {
+ if (decl is DTDEntityDeclaration &&
DTD.EntityDecls [decl.Name] == null) {
// GE - also checked as valid contents
StringBuilder sb = new StringBuilder ();
xtr.Normalization = this.Normalization;
@@ -710,8 +711,9 @@
}
decl.ReplacementText = CreateValueString ();
- if (decl is DTDEntityDeclaration) {
+ if (decl is DTDEntityDeclaration && DTD.EntityDecls
[decl.Name] == null) {
// GE - also checked as valid contents
+ // FIXME: not always it should be read in
Element context
XmlTextReader xtr = new XmlTextReader
(decl.ReplacementText, XmlNodeType.Element, null);
StringBuilder sb = new StringBuilder ();
xtr.Normalization = this.Normalization;
Modified: trunk/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog 2005-06-27
12:15:18 UTC (rev 46551)
+++ trunk/mcs/class/System.XML/Test/System.Xml/W3C/ChangeLog 2005-06-27
12:19:24 UTC (rev 46552)
@@ -1,5 +1,9 @@
2005-06-27 Andrew Skiba <[EMAIL PROTECTED]>
+ * fixme.lst: remove fixed testcase
+
+2005-06-27 Andrew Skiba <[EMAIL PROTECTED]>
+
* knownFailures.lst, fixme.lst: remove fixed testcases
* ignored.lst: add a test which causes mono runtime to hang
Modified: trunk/mcs/class/System.XML/Test/System.Xml/W3C/fixme.lst
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/W3C/fixme.lst 2005-06-27
12:15:18 UTC (rev 46551)
+++ trunk/mcs/class/System.XML/Test/System.Xml/W3C/fixme.lst 2005-06-27
12:19:24 UTC (rev 46552)
@@ -1,4 +1,3 @@
not-wf-sa-076
-valid-sa-086
valid-sa-100
rmt-e2e-15h
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
