Author: atsushi
Date: 2007-10-31 02:39:02 -0500 (Wed, 31 Oct 2007)
New Revision: 88537
Added:
trunk/mcs/class/System.XML/Test/XmlFiles/xsd/336495.xsd
Modified:
trunk/mcs/class/System.XML/ChangeLog
trunk/mcs/class/System.XML/Makefile
trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog
trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
trunk/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
Log:
2007-10-31 Atsushi Enomoto <[EMAIL PROTECTED]>
* XsdValidatingReader.cs : r68046 didn't really fix the issue.
Enabled the actual fix. and fixed bug #336625.
* XsdValidatingReaderTests.cs : added test for #336625.
* 336625.xsd : new test file.
* Makefile : extra distfiles (336625.xsd).
Modified: trunk/mcs/class/System.XML/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/ChangeLog 2007-10-31 04:23:48 UTC (rev
88536)
+++ trunk/mcs/class/System.XML/ChangeLog 2007-10-31 07:39:02 UTC (rev
88537)
@@ -1,3 +1,7 @@
+2007-10-31 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * Makefile : extra distfiles (336625.xsd).
+
2007-09-21 Atsushi Enomoto <[EMAIL PROTECTED]>
* Makefile : extra distfiles (325482.xml / 325482.xsl).
Modified: trunk/mcs/class/System.XML/Makefile
===================================================================
--- trunk/mcs/class/System.XML/Makefile 2007-10-31 04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Makefile 2007-10-31 07:39:02 UTC (rev 88537)
@@ -72,6 +72,7 @@
Test/XmlFiles/79683.dtd \
Test/XmlFiles/xsd/multi-schemaLocation.xml \
Test/XmlFiles/xsd/datatypesTest.xsd \
+ Test/XmlFiles/xsd/336625.xsd \
Test/XmlFiles/xsd/77687.xsd \
Test/XmlFiles/xsd/77687inc.xsd \
Test/XmlFiles/xsd/78985.xml \
Modified: trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog 2007-10-31
04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog 2007-10-31
07:39:02 UTC (rev 88537)
@@ -1,3 +1,8 @@
+2007-10-31 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XsdValidatingReader.cs : r68046 didn't really fix the issue.
+ Enabled the actual fix. and fixed bug #336625.
+
2007-07-25 Atsushi Enomoto <[EMAIL PROTECTED]>
* XsdValidatingReader.cs : reject more whitespaces in empty model
Modified: trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
2007-10-31 04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
2007-10-31 07:39:02 UTC (rev 88537)
@@ -1488,8 +1488,7 @@
private void ExamineAdditionalSchema ()
{
-// if (resolver == null || ValidationType ==
ValidationType.None)
- if (resolver == null)
+ if (resolver == null || ValidationType ==
ValidationType.None)
return;
XmlSchema schema = null;
string schemaLocation = reader.GetAttribute
("schemaLocation", XmlSchema.InstanceNamespace);
Modified: trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog 2007-10-31
04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Test/System.Xml/ChangeLog 2007-10-31
07:39:02 UTC (rev 88537)
@@ -1,3 +1,7 @@
+2007-10-31 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XsdValidatingReaderTests.cs : added test for #336625.
+
2007-10-30 Atsushi Enomoto <[EMAIL PROTECTED]>
* XmlConvertTest.cs : added test for DateTime roundtrip.
Modified: trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
===================================================================
--- trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
2007-10-31 04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
2007-10-31 07:39:02 UTC (rev 88537)
@@ -363,6 +363,17 @@
vr.Read ();
}
+ [Test] // bug #336625
+ public void ValidationTypeNoneIgnoreLocatedSchemaErrors ()
+ {
+ string xml = "<test
xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
xsi:noNamespaceSchemaLocation='Test/XmlFiles/xsd/336625.xsd'/>";
+ XmlValidatingReader vr = new XmlValidatingReader (
+ new XmlTextReader (new StringReader (xml)));
+ vr.ValidationType = ValidationType.None;
+ while (!vr.EOF)
+ vr.Read ();
+ }
+
[Test]
public void Bug81360 ()
{
Added: trunk/mcs/class/System.XML/Test/XmlFiles/xsd/336495.xsd
===================================================================
--- trunk/mcs/class/System.XML/Test/XmlFiles/xsd/336495.xsd 2007-10-31
04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Test/XmlFiles/xsd/336495.xsd 2007-10-31
07:39:02 UTC (rev 88537)
@@ -0,0 +1,9 @@
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'>
+<xs:element name='test' type='testType' />
+<xs:complexType name="testType">
+ <xs:complexContent>
+ <xs:restriction base="nonexistent">
+ </xs:restriction>
+ </xs:complexContent>
+</xs:complexType>
+</xs:schema>
Modified: trunk/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog 2007-10-31
04:23:48 UTC (rev 88536)
+++ trunk/mcs/class/System.XML/Test/XmlFiles/xsd/ChangeLog 2007-10-31
07:39:02 UTC (rev 88537)
@@ -1,3 +1,7 @@
+2007-10-31 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * 336625.xsd : new test file.
+
2007-08-21 Atsushi Enomoto <[EMAIL PROTECTED]>
* 82078.xsd : new test file.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
