[mvp-xml-cvs] Common/v1/test/XPathNavigatorReaderTests Tests.cs,1.2,1.3

[Daniel C. \(kzu\) <dca...@us...>]

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

Modified Files:
	Tests.cs 
Log Message:
Fixed bug that didn't allow reading comments and PIs even if they are allows under the root (not considered as fragments)

Index: Tests.cs
===================================================================
RCS file: /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests/Tests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Tests.cs	14 Nov 2004 01:24:30 -0000	1.2
+++ Tests.cs	17 Nov 2004 15:18:10 -0000	1.3
@@ -22,6 +22,8 @@
 		{
 			string xml = @"<?xml version='1.0'?>
 <!-- comment -->
+<?an arbitrary PI ?>
+<!-- another comment -->
 <foo />";
 
 			XmlReader tr = new XmlTextReader(new StringReader(xml));
@@ -39,6 +41,13 @@
 			reader = new XPathNavigatorReader(nav);
 			Assert.IsTrue(reader.Read());
 			Assert.AreEqual(XmlNodeType.Comment, reader.NodeType);
+			Assert.IsTrue(reader.Read());
+			Assert.AreEqual(XmlNodeType.ProcessingInstruction, reader.NodeType);
+			Assert.IsTrue(reader.Read());
+			Assert.AreEqual(XmlNodeType.Comment, reader.NodeType);
+			Assert.IsTrue(reader.Read());
+			Assert.AreEqual(XmlNodeType.Element, reader.NodeType);
+			Assert.IsTrue(reader.IsEmptyElement);
 			Assert.IsFalse(reader.Read());
 		}
 
@@ -646,15 +655,19 @@
 		public void TestSiblingRead()
 		{
 			string xml = @"<foo><bar/><baz/></foo>"; 
+
+			XmlTextReader tr = new XmlTextReader(new StringReader(xml));
+			tr.MoveToContent();
+			Assert.AreEqual("foo", tr.LocalName);
+
 			XPathDocument doc = new XPathDocument(new StringReader(xml)); 
 			XPathNavigator nav = doc.CreateNavigator(); 
 			XPathNodeIterator ni = nav.Select("/foo/bar"); 
 			if (ni.MoveNext()) 
 			{
 				XPathNavigatorReader r = new XPathNavigatorReader(ni.Current);
-				r.MoveToContent();
-				Assert.AreEqual(r.LocalName, "bar");
 				Assert.IsTrue(r.Read());
+				Assert.AreEqual("bar", r.LocalName);
 				Assert.IsFalse(r.Read());
 				r.Close();
 			}