[mvp-xml-cvs] XInclude/v1/test EntryPoint.cs,1.5,1.6 XIncludeReaderTests.cs,1.6,1.7

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

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

Modified Files:
	EntryPoint.cs XIncludeReaderTests.cs 
Log Message:
Integrated XmlBaseAwareXmltextReader.

Index: EntryPoint.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- EntryPoint.cs	22 Oct 2004 14:56:42 -0000	1.5
+++ EntryPoint.cs	25 Oct 2004 19:32:39 -0000	1.6
@@ -12,9 +12,10 @@
             XIncludeReaderTests rt = new XIncludeReaderTests();
             //EdUniTests rt = new EdUniTests();
             //NistTests rt = new NistTests();
+            //Elliotte_Rusty_HaroldTests rt = new Elliotte_Rusty_HaroldTests();
             try 
             {                
-                rt.InnerXmlTest();
+                rt.OuterXmlTest();
             } 
             catch (Exception e) 
             {

Index: XIncludeReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- XIncludeReaderTests.cs	22 Oct 2004 14:56:42 -0000	1.6
+++ XIncludeReaderTests.cs	25 Oct 2004 19:32:39 -0000	1.7
@@ -5,6 +5,7 @@
 using System.Text;
 
 using Mvp.Xml.XInclude;
+using Mvp.Xml.Common;
 using NUnit.Framework;
 
 namespace Mvp.Xml.XInclude.Test
@@ -28,20 +29,18 @@
         public static void RunAndCompare(string source, string result) 
         {                                 
             XmlDocument doc = new XmlDocument();
-            doc.PreserveWhitespace = true;      
-            XmlValidatingReader vr = new XmlValidatingReader(new XmlTextReader(source));
-            vr.ValidationType = ValidationType.None;
-            vr.EntityHandling = EntityHandling.ExpandEntities;
+            doc.PreserveWhitespace = true;                  
+            XIncludingReader xir = new XIncludingReader(source);
             try 
             {
-                doc.Load(new XIncludingReader(vr));
+                doc.Load(xir);
             } 
             catch (Exception e)
             {
-                vr.Close();
+                xir.Close();
                 throw e;
             }
-            vr.Close();
+            xir.Close();
             XmlTextReader r1 = new XmlTextReader(new StringReader(doc.OuterXml));            
             r1.WhitespaceHandling = WhitespaceHandling.Significant;    
             XmlTextReader r2 = new XmlTextReader(result);