[mvp-xml-cvs] XInclude/v1/test Elliotte_Rusty_HaroldTests.cs,1.6,1.7 EntryPoint.cs,1.12,1.13 XIncludeReaderTests.cs,1.12,1.13 XIncludeTest.csproj,1.11,1.12

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

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

Modified Files:
	Elliotte_Rusty_HaroldTests.cs EntryPoint.cs 
	XIncludeReaderTests.cs XIncludeTest.csproj 
Log Message:
Fixed support for xml:lang fixup

Index: XIncludeTest.csproj
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- XIncludeTest.csproj	1 Nov 2004 05:44:44 -0000	1.11
+++ XIncludeTest.csproj	2 Nov 2004 14:31:57 -0000	1.12
@@ -163,6 +163,10 @@
                     BuildAction = "Content"
                 />
                 <File
+                    RelPath = "results\langtest.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "results\nonxmlchar.xml"
                     BuildAction = "Content"
                 />
@@ -223,6 +227,10 @@
                     BuildAction = "Content"
                 />
                 <File
+                    RelPath = "tests\langtest.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "tests\nohref.xml"
                     BuildAction = "Content"
                 />
@@ -235,6 +243,10 @@
                     BuildAction = "Content"
                 />
                 <File
+                    RelPath = "tests\russian.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "tests\test2.xml"
                     BuildAction = "Content"
                 />

Index: EntryPoint.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- EntryPoint.cs	1 Nov 2004 08:12:03 -0000	1.12
+++ EntryPoint.cs	2 Nov 2004 14:31:57 -0000	1.13
@@ -9,15 +9,15 @@
     {
         public static void Main() 
         {            
-            //XIncludeReaderTests rt = new XIncludeReaderTests();
+            XIncludeReaderTests rt = new XIncludeReaderTests();
             //LTG_Edinburgh_UnivTests rt = new LTG_Edinburgh_UnivTests();
-            NISTTests rt = new NISTTests();
+            //NISTTests rt = new NISTTests();
             //Elliotte_Rusty_HaroldTests rt = new Elliotte_Rusty_HaroldTests();
             //FourThoughtTests rt = new FourThoughtTests();
             //XIncludeSyntaxTests rt = new XIncludeSyntaxTests();
             try 
             {                
-                rt.Nist_include_24();
+                rt.XmlLangTest();
             } 
             catch (Exception e) 
             {

Index: XIncludeReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- XIncludeReaderTests.cs	1 Nov 2004 05:44:44 -0000	1.12
+++ XIncludeReaderTests.cs	2 Nov 2004 14:31:57 -0000	1.13
@@ -251,6 +251,15 @@
         }        
 
         /// <summary>
+        /// xml:lang fixup
+        /// </summary>
+        [Test]        
+        public void XmlLangTest() 
+        {
+            RunAndCompare("../../tests/langtest.xml", "../../results/langtest.xml");            
+        }        
+
+        /// <summary>
         /// ReadOuterXml() test.
         /// </summary>
         [Test]

Index: Elliotte_Rusty_HaroldTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/Elliotte_Rusty_HaroldTests.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Elliotte_Rusty_HaroldTests.cs	1 Nov 2004 08:04:00 -0000	1.6
+++ Elliotte_Rusty_HaroldTests.cs	2 Nov 2004 14:31:57 -0000	1.7
@@ -954,7 +954,9 @@
         [Test]
         public void harold_77() 
         {
-            RunAndCompare("UnicodeBigUnmarked.xml", "../result/UnicodeBigUnmarked.xml");            
+            XIncludeReaderTests.RunAndCompare(
+                "http://localhost/test/UnicodeBigUnmarked.xml", 
+                "../../XInclude-Test-Suite/Harold/test/../result/UnicodeBigUnmarked.xml");            
         }  
   
 
@@ -965,7 +967,9 @@
         [Test]
         public void harold_78() 
         {
-            RunAndCompare("UnicodeLittleUnmarked.xml", "../result/UnicodeLittleUnmarked.xml");            
+            XIncludeReaderTests.RunAndCompare(
+                "http://localhost/test/UnicodeLittleUnmarked.xml", 
+                "../../XInclude-Test-Suite/Harold/test/../result/UnicodeLittleUnmarked.xml");
         }  
   
     
@@ -973,9 +977,14 @@
         /// <summary>
         /// Can autodetect EBCDIC files with a without a byte order mark when parse="text"        
         /// </summary>
+        /// <remarks>EBCDIC is not supported encoding</remarks>
         [Test]
+        [ExpectedException(typeof(FatalResourceException))]
         public void harold_79() 
         {
+            XIncludeReaderTests.RunAndCompare(
+                "http://localhost/test/EBCDIC.xml", 
+                "../../XInclude-Test-Suite/Harold/test/../result/EBCDIC.xml");
             RunAndCompare("EBCDIC.xml", "../result/EBCDIC.xml");            
         }