Merge pull request #2154 from BrennanConroy/bug_30018

[mono.git] / mcs / class / System.XML / Test / System.Xml.Schema / XmlSchemaSetTests.cs

diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs
index 6a8a7a49d8accf2b444cc3efc26ae861e332e194..9b45b3f8aaa062da5aad29663ed56d7fae16cae5 100644 (file)
--- a/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/XmlSchemaSetTests.cs
@@ -6,11 +6,11 @@
 //
 // (C) 2004 Novell Inc.
 //
-#if NET_2_0
 
 using System;
 using System.Collections;
 using System.IO;
+using System.Text;
 using System.Xml;
 using System.Xml.Schema;
 using NUnit.Framework;
@@ -163,7 +163,7 @@ namespace MonoTests.System.Xml
                        ss.Compile ();
                        Assert.IsTrue (ss.IsCompiled, "#4");
                        ss.RemoveRecursive (s);
-                       Assert.IsTrue (ss.IsCompiled, "#5");
+                       Assert.IsFalse (ss.IsCompiled, "#5");
                }
 
                [Test] // bug #77489
@@ -279,6 +279,39 @@ type=""xsd:string"" use=""required""/>
                        xss.Compile ();
                        Assert.IsNotNull (xss.GlobalElements [new XmlQualifiedName ("GetSystemDateAndTimeResponse", "http://www.onvif.org/ver10/device/wsdl")], "#1");
                }
+               
+               [Test] // bug #13716
+               public void ResolveSchemaUriUsingXmlResolver ()
+               {
+                       var resolver = new Bug13716XmlResolver ();
+                       string xml = "<people xmlns='testschema'><person name='Ian'><books><book>Clean Code</book></books></person></people>";
+                       string ns = "testschema";
+                       string xsdPath = "my.xsd";
+
+                       var readerSettings = new XmlReaderSettings ();
+
+                       //readerSettings.XmlResolver = resolver;
+                       readerSettings.Schemas.XmlResolver = resolver;
+                       readerSettings.Schemas.Add (ns, xsdPath);
+                       readerSettings.ValidationType = ValidationType.Schema;
+
+                       using (var xr = XmlReader.Create (new StringReader (xml), readerSettings))
+                       {
+                               while (!xr.EOF)
+                                       xr.Read ();
+                       }
+               }
+               
+               public class Bug13716XmlResolver : XmlUrlResolver
+               {
+                       public override object GetEntity(Uri absoluteUri, string role, Type typeOfObjectToReturn)
+                       {
+                               string xsd = @"
+               <xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema' targetNamespace='testschema'>
+                 <xs:element name='people' />
+               </xs:schema>";
+                               return new MemoryStream (Encoding.UTF8.GetBytes (xsd));
+                       }
+               }
        }
 }
-#endif