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

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

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

Modified Files:
	EntryPoint.cs XIncludeReaderTests.cs 
Log Message:
Working on OuterXml.

Index: EntryPoint.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- EntryPoint.cs	19 Oct 2004 16:24:56 -0000	1.3
+++ EntryPoint.cs	20 Oct 2004 19:28:13 -0000	1.4
@@ -14,7 +14,7 @@
             //NistTests rt = new NistTests();
             try 
             {                
-                rt.IncludesItself();
+                rt.DepthTest();
             } 
             catch (Exception e) 
             {

Index: XIncludeReaderTests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- XIncludeReaderTests.cs	18 Oct 2004 18:19:22 -0000	1.4
+++ XIncludeReaderTests.cs	20 Oct 2004 19:28:13 -0000	1.5
@@ -226,6 +226,58 @@
             RunAndCompare("../../tests/xpointer.xml", "../../results/xpointer.xml");            
         }
 
+        /// <summary>
+        /// ReadOuterXml() test.
+        /// </summary>
+        [Test]
+        public void OuterXmlTest() 
+        {
+            XIncludingReader xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            string outerXml = xir.ReadOuterXml();
+            xir.Close();
+            xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            XmlDocument doc = new XmlDocument();
+            doc.PreserveWhitespace = true;
+            doc.Load(xir);            
+            string outerXml2 = doc.OuterXml;
+            Assert.AreEqual(outerXml, outerXml2);
+        }
+
+        /// <summary>
+        /// ReadInnerXml() test.
+        /// </summary>
+        [Test]
+        public void InnerXmlTest() 
+        {
+            XIncludingReader xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            string innerXml = xir.ReadInnerXml();
+            xir.Close();
+            xir = new XIncludingReader("../../tests/document.xml");
+            xir.MoveToContent();
+            XmlDocument doc = new XmlDocument();
+            doc.PreserveWhitespace = true;
+            doc.Load(xir);            
+            string innerXml2 = doc.InnerXml;
+            Assert.AreEqual(innerXml, innerXml2);
+        }
+
+        /// <summary>
+        /// Depth test.
+        /// </summary>
+        [Test]
+        public void DepthTest() 
+        {
+            XIncludingReader xir = new XIncludingReader("../../tests/document.xml");
+            while (xir.Read()) 
+            {
+                Console.WriteLine("{0} | {1} | {2} | {3}", 
+                    xir.NodeType, xir.Name, xir.Value, xir.Depth);
+            }
+        }
+
 //        /// <summary>
 //        /// Custom resolver test.
 //        /// </summary>