mvp-xml-cvs

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

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

Modified Files:
	XIncludeReaderTests.cs XIncludeTest.csproj 
Log Message:
Basic XInclude tests.

Index: XIncludeTest.csproj
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- XIncludeTest.csproj	13 Oct 2004 17:46:59 -0000	1.2
+++ XIncludeTest.csproj	14 Oct 2004 15:17:13 -0000	1.3
@@ -105,10 +105,38 @@
                     BuildAction = "Compile"
                 />
                 <File
+                    RelPath = "results\document.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "results\fallback.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "results\working_example.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "results\working_example2.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "results\xpointer.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "tests\binary.bin"
                     BuildAction = "None"
                 />
                 <File
+                    RelPath = "tests\count.txt"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "tests\data.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "tests\disclaimer.xml"
                     BuildAction = "Content"
                 />
@@ -117,6 +145,10 @@
                     BuildAction = "Content"
                 />
                 <File
+                    RelPath = "tests\fallback.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "tests\fallbacknotchildinclude.xml"
                     BuildAction = "Content"
                 />
@@ -141,7 +173,11 @@
                     BuildAction = "Content"
                 />
                 <File
-                    RelPath = "tests\result.xml"
+                    RelPath = "tests\resolver.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "tests\test2.xml"
                     BuildAction = "Content"
                 />
                 <File
@@ -153,6 +189,18 @@
                     BuildAction = "Content"
                 />
                 <File
+                    RelPath = "tests\working_example.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "tests\working_example2.xml"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "tests\xpointer.xml"
+                    BuildAction = "Content"
+                />
+                <File
                     RelPath = "XInclude-Test-Suite\README.cvs"
                     BuildAction = "None"
                 />

Index: XIncludeReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- XIncludeReaderTests.cs	13 Oct 2004 17:46:59 -0000	1.1
+++ XIncludeReaderTests.cs	14 Oct 2004 15:17:13 -0000	1.2
@@ -50,7 +50,7 @@
         [Test]
         public void ItWorksAtLeast() 
         {
-            RunAndCompare("../../tests/document.xml", "../../tests/result.xml");            
+            RunAndCompare("../../tests/document.xml", "../../results/document.xml");            
         }
 
         /// <summary>
@@ -60,7 +60,7 @@
         [ExpectedException(typeof(NonXmlCharacterException))]
         public void NonXMLChar() 
         {
-            RunAndCompare("../../tests/nonxmlchar.xml", "../../tests/result.xml");            
+            RunAndCompare("../../tests/nonxmlchar.xml", "../../results/result.xml");            
         }
 
         /// <summary>
@@ -70,7 +70,7 @@
         [ExpectedException(typeof(FatalResourceException))]
         public void FileNotFound() 
         {
-            RunAndCompare("../../tests/filenotfound.xml", "../../tests/result.xml");            
+            RunAndCompare("../../tests/filenotfound.xml", "../../results/result.xml");            
         }
 
         /// <summary>
@@ -80,7 +80,53 @@
         [ExpectedException(typeof(CircularInclusionException))]
         public void IncludesItself() 
         {
-            RunAndCompare("../../tests/includesitself.xml", "../../tests/result.xml");            
+            RunAndCompare("../../tests/includesitself.xml", "../../results/result.xml");            
+        }
+
+        /// <summary>
+        /// Text inclusion. 
+        /// </summary>
+        [Test]        
+        public void TextInclusion() 
+        {
+            RunAndCompare("../../tests/working_example.xml", "../../results/working_example.xml");            
+        }
+
+        /// <summary>
+        /// Text inclusion. 
+        /// </summary>
+        [Test]        
+        public void TextInclusion2() 
+        {
+            RunAndCompare("../../tests/working_example2.xml", "../../results/working_example2.xml");            
+        }
+
+        /// <summary>
+        /// Fallback.
+        /// </summary>
+        [Test]        
+        public void Fallback() 
+        {
+            RunAndCompare("../../tests/fallback.xml", "../../results/fallback.xml");            
         }
+
+        /// <summary>
+        /// XPointer.
+        /// </summary>
+        [Test]        
+        public void XPointer() 
+        {
+            RunAndCompare("../../tests/xpointer.xml", "../../results/xpointer.xml");            
+        }
+
+//        /// <summary>
+//        /// Custom resolver test.
+//        /// </summary>
+//        [Test]        
+//        public void CustomResolver() 
+//        {
+//            RunAndCompare("../../tests/resolver.xml", "../../results/resolver.xml");            
+//        }
+
     }
 }