2006-12-05 Atsushi Enomoto <[email protected]>

	* XmlReader.cs : new 2.0 MoveToAttribute(int) failed to move to the
	  final attribute in an element.

	* XPathNavigatorReaderTests.cs : added test for MoveToAttribute(int).


svn path=/trunk/mcs/; revision=69026

mcs/class/System.XML/System.Xml/ChangeLog

@@ -1,3 +1,8 @@
+2006-12-05  Atsushi Enomoto <[email protected]>
+
+	* XmlReader.cs : new 2.0 MoveToAttribute(int) failed to move to the
+	  final attribute in an element.
+
 2006-12-05  Atsushi Enomoto <[email protected]>
 
 	* XmlNode.cs : GetPrefixOfNamespace() was not correctly searching

mcs/class/System.XML/System.Xml/XmlReader.cs

@@ -487,7 +487,7 @@ namespace System.Xml
 			if (i >= AttributeCount)
 				throw new ArgumentOutOfRangeException ();
 			MoveToFirstAttribute ();
-			for (int a = 1; a < i; a++)
+			for (int a = 0; a < i; a++)
 				MoveToNextAttribute ();
 		}
 #else

mcs/class/System.XML/Test/System.Xml.XPath/ChangeLog

@@ -1,3 +1,7 @@
+2006-12-05  Atsushi Enomoto <[email protected]>
+
+	* XPathNavigatorReaderTests.cs : added test for MoveToAttribute(int).
+
 2006-12-05  Atsushi Enomoto <[email protected]>
 
 	* XPathNavigatorTests.cs : added test for XPath navigator editor's

mcs/class/System.XML/Test/System.Xml.XPath/XPathNavigatorReaderTests.cs

@@ -664,6 +664,21 @@ namespace MonoTests.System.Xml.XPath
 			nav.MoveToFirstChild ();
 			nav.ReadSubtree ();
 		}
+
+		[Test]
+		public void ReadSubtreeAttributesByIndex ()
+		{
+			XmlWriter xw;
+			XmlDocument doc = new XmlDocument ();
+			doc.LoadXml ("<u:Timestamp u:Id='ID1' xmlns:u='urn:foo'></u:Timestamp>");
+			XmlReader r = doc.CreateNavigator ().ReadSubtree ();
+			r.Read ();
+			r.MoveToAttribute (0);
+			if (r.LocalName != "Id")
+				r.MoveToAttribute (1);
+				if (r.LocalName != "Id")
+					Assert.Fail ("Should move to the attribute.");
+		}
 	}
 }