diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2006-11-17 06:34:52 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2006-11-17 06:34:52 +0300 |
| commit | db8ef8f4784eb1f772a6ca5d1e95e6da9f80893c (patch) | |
| tree | 3a7d0b6466417ef6c2e39dc2a4d8969e2f6d5e7e | |
| parent | 848d3729d520a64ffce751630d621716ef6beb76 (diff) | |
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
4 files changed, 36 insertions, 0 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog index d77dd03108e..0b9e6a11640 100644 --- 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 380dbf769ee..4a10006c63e 100644 --- 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 fa374f3904b..d27e8e69f01 100644 --- 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 291ad4cd77a..e6f0ec1c2cc 100644 --- a/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs +++ b/mcs/class/System.XML/Test/System.Xml/XsdValidatingReaderTests.cs @@ -9,6 +9,7 @@ //
using System;
using System.IO;
+using System.Net;
using System.Xml;
using System.Xml.Schema;
using NUnit.Framework;
@@ -337,5 +338,29 @@ namespace MonoTests.System.Xml while (!xvr.EOF)
xvr.Read ();
}
+
+ class XmlErrorResolver : XmlResolver
+ {
+ public override ICredentials Credentials {
+ set { }
+ }
+
+ public override object GetEntity (Uri uri, string role, Type type)
+ {
+ throw new Exception ();
+ }
+ }
+
+ [Test] // bug #79924
+ public void ValidationTypeNoneIgnoreSchemaLocations ()
+ {
+ string xml = "<project xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:noNamespaceSchemaLocation='nosuchschema.xsd'/>";
+ XmlValidatingReader vr = new XmlValidatingReader (
+ new XmlTextReader (new StringReader (xml)));
+ vr.ValidationType = ValidationType.None;
+ vr.XmlResolver = new XmlErrorResolver ();
+ while (!vr.EOF)
+ vr.Read ();
+ }
}
}
|