[mvp-xml-cvs] XInclude/v2/test EntryPoint.cs,1.1,1.2 XIncludeReaderTests.cs,1.1,1.2 XIncludeTest.csproj,1.1,1.2

[Oleg T. <he...@us...>]

Update of /cvsroot/mvp-xml/XInclude/v2/test
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31153/v2/test

Modified Files:
	EntryPoint.cs XIncludeReaderTests.cs XIncludeTest.csproj 
Log Message:


Index: XIncludeTest.csproj
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v2/test/XIncludeTest.csproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XIncludeTest.csproj	28 Oct 2005 22:28:57 -0000	1.1
+++ XIncludeTest.csproj	29 Oct 2005 11:51:35 -0000	1.2
@@ -17,7 +17,7 @@
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
+    <OutputType>Exe</OutputType>
     <RootNamespace>Mvp.Xml.XInclude.Test</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject>

Index: EntryPoint.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v2/test/EntryPoint.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- EntryPoint.cs	28 Oct 2005 22:28:57 -0000	1.1
+++ EntryPoint.cs	29 Oct 2005 11:51:35 -0000	1.2
@@ -16,8 +16,8 @@
             //FourThoughtTests rt = new FourThoughtTests();
             //XIncludeSyntaxTests rt = new XIncludeSyntaxTests();
             try 
-            {                
-                rt.Nist_include_24();
+            {
+                rt.Nist_include_49();
             } 
             catch (Exception e) 
             {

Index: XIncludeReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v2/test/XIncludeReaderTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XIncludeReaderTests.cs	28 Oct 2005 22:28:57 -0000	1.1
+++ XIncludeReaderTests.cs	29 Oct 2005 11:51:35 -0000	1.2
@@ -64,10 +64,11 @@
                 throw e;
             }
             xir.Close();
-            XmlTextReader r1 = new XmlTextReader(new StringReader(doc.OuterXml));            
-            r1.WhitespaceHandling = WhitespaceHandling.Significant;    
-            XmlTextReader r2 = new XmlTextReader(result);            
-            r2.WhitespaceHandling = WhitespaceHandling.Significant;
+            XmlReaderSettings s = new XmlReaderSettings();
+            s.ProhibitDtd = false;
+            s.IgnoreWhitespace = true;           
+            XmlReader r1 = XmlReader.Create(new StringReader(doc.OuterXml), s, doc.BaseURI);                        
+            XmlReader r2 = XmlReader.Create(result, s);                        
             try 
             {
                 while (r1.Read()) 
@@ -395,8 +396,8 @@
                 return File.OpenRead("../../results/document.xml");
             }
             else if (absoluteUri.Scheme == "xmlreader") 
-            {
-                return new XmlTextReader(absoluteUri.AbsoluteUri, new StringReader(@"<text attr=""val"">From custom resolver (as XmlReader)</text>")); 
+            {                
+                return XmlReader.Create(new StringReader(@"<text attr=""val"">From custom resolver (as XmlReader)</text>"), null, absoluteUri.AbsoluteUri); 
             }
             else
                 return base.GetEntity(absoluteUri, role, ofObjectToReturn);