2006-11-17 Atsushi Enomoto <atsushi@ximian.com>

	* XsdValidatingReader.cs : when ValidationType is None, it does not
	  load external schemas. Fixed bug #79924.

	* XmlReaderSettingsTests.cs : added test for bug #79224; it does not
	  load external schemas when validation mode is none.

svn path=/trunk/mcs/; revision=68046

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
index d77dd03108e35df3e0f7d2433e021e27d161d24c..0b9e6a11640022b29433a79cddc78ff2489b5e3a 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-17  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XsdValidatingReader.cs : when ValidationType is None, it does not
+         load external schemas. Fixed bug #79924.
+
 2006-11-14  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlSchemaValidatingReader.cs : dispatch validation events from

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
index 380dbf769ee18b56a7ad9af4bbb0db54495c8d41..4a10006c63e9d624b86e06fa61bf33a7db3cb06b 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
@@ -1484,6 +1484,7 @@ namespace Mono.Xml.Schema
 
                private void ExamineAdditionalSchema ()
                {
+//                     if (resolver == null || ValidationType == ValidationType.None)
                        if (resolver == null)
                                return;
                        XmlSchema schema = null;

diff --git a/mcs/class/System.XML/Test/System.Xml/ChangeLog b/mcs/class/System.XML/Test/System.Xml/ChangeLog
index fa374f3904b26d443b5b43426bb2693f45754724..d27e8e69f010868dba645cf8621031fb0621971d 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/ChangeLog
+++ b/mcs/class/System.XML/Test/System.Xml/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-17  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XmlReaderSettingsTests.cs : added test for bug #79224; it does not
+         load external schemas when validation mode is none.
+
 2006-11-14  Atsushi Enomoto <atsushi@ximian.com>
 
        * XmlReaderSettingsTests.cs : added validation event handler test

diff --git a/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs b/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
index 291ad4cd77a46104a425e7182c952308bdd31ed9..e6f0ec1c2cc968a55305acb3c62db737c367d536 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs
@@ -9,6 +9,7 @@
 //\r
 using System;\r
 using System.IO;\r
+using System.Net;\r
 using System.Xml;\r
 using System.Xml.Schema;\r
 using NUnit.Framework;\r
@@ -337,5 +338,29 @@ namespace MonoTests.System.Xml
                        while (!xvr.EOF)\r
                                xvr.Read ();\r
                }\r
+\r
+               class XmlErrorResolver : XmlResolver\r
+               {\r
+                       public override ICredentials Credentials {\r
+                               set { }\r
+                       }\r
+\r
+                       public override object GetEntity (Uri uri, string role, Type type)\r
+                       {\r
+                               throw new Exception ();\r
+                       }\r
+               }\r
+\r
+               [Test] // bug #79924\r
+               public void ValidationTypeNoneIgnoreSchemaLocations ()\r
+               {\r
+                       string xml = "<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='nosuchschema.xsd'/>";\r
+                       XmlValidatingReader vr = new XmlValidatingReader (\r
+                               new XmlTextReader (new StringReader (xml)));\r
+                       vr.ValidationType = ValidationType.None;\r
+                       vr.XmlResolver = new XmlErrorResolver ();\r
+                       while (!vr.EOF)\r
+                               vr.Read ();\r
+               }\r
        }\r
 }\r