#37 Fix non-first attributes finding

denis-ivanov · denis-ivanov · commit 1bb16a9ca5f0 · 2022-07-20T10:13:48.000+04:00
diff --git a/src/AngleSharp.XPath.Tests/HtmlDocumentNavigatorTests.cs b/src/AngleSharp.XPath.Tests/HtmlDocumentNavigatorTests.cs
@@ -1,10 +1,10 @@
-using System.Xml;
-using AngleSharp.Xml.Parser;
+using AngleSharp.Dom;
 using AngleSharp.Html.Parser;
+using AngleSharp.Xml.Parser;
 using NUnit.Framework;
 using System.Threading.Tasks;
+using System.Xml;
 using System.Xml.XPath;
-using AngleSharp.Dom;
 
 namespace AngleSharp.XPath.Tests
 {
@@ -173,5 +173,29 @@ public void MoveToParent_CallWhenCurrentNodeIsAttr_ShouldBeMovedToAttrOwnerEleme
             // Assert
             Assert.AreEqual(nav.Name, "root");
         }
+
+        [Test]
+        public void SelectSingleNodeTest_AttributesOrder()
+        {
+            // Arrange
+            const string html =
+                @"<body>
+			<div id='div1'>First</div>
+			<div id='div2' class='mydiv'>Second</div>
+			<div class='mydiv' id='div3'>Third</div>
+		</body>";
+            var parser = new HtmlParser();
+            var document = parser.ParseDocument(html);
+
+            // Act
+            var div1 = document.DocumentElement.SelectSingleNode("//div[@id='div1']");
+            var div2 = document.DocumentElement.SelectSingleNode("//div[@id='div2']");
+            var div3 = document.DocumentElement.SelectSingleNode("//div[@id='div3']");
+
+            // Assert
+            Assert.That(div1, Is.Not.Null);
+            Assert.That(div2, Is.Not.Null);
+            Assert.That(div3, Is.Not.Null); // currently fails
+        }
     }
 }
diff --git a/src/AngleSharp.XPath/AngleSharp.XPath.csproj b/src/AngleSharp.XPath/AngleSharp.XPath.csproj
@@ -1,8 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Version>2.0.0</Version>
-    <AssemblyVersion>2.0.0</AssemblyVersion>
-    <FileVersion>2.0.0</FileVersion>
+    <Version>2.0.1</Version>
+    <AssemblyVersion>2.0.1</AssemblyVersion>
+    <FileVersion>2.0.1</FileVersion>
     <Authors>Denis Ivanov</Authors>
     <PackageId>AngleSharp.XPath</PackageId>
     <AssemblyName>AngleSharp.XPath</AssemblyName>
@@ -20,7 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AngleSharp" Version="0.17.0" />
+    <PackageReference Include="AngleSharp" Version="0.17.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' or '$(TargetFramework)' == 'net472' or '$(TargetFramework)' == 'net6.0' ">
diff --git a/src/AngleSharp.XPath/HtmlDocumentNavigator.cs b/src/AngleSharp.XPath/HtmlDocumentNavigator.cs
@@ -283,11 +283,6 @@ public override bool MoveToNext()
         /// <inheritdoc />
         public override bool MoveToNextAttribute()
 		{
-			if (CurrentElement == null)
-			{
-				return false;
-			}
-
             if (!(CurrentNode is IAttr attr))
             {
                 return false;
@@ -300,10 +295,10 @@ public override bool MoveToNextAttribute()
 
             var attrIndex = attr.OwnerElement.Attributes.Index(attr);
 
-			if (attrIndex >= CurrentElement.Attributes.Length - 1)
-			{
+            if (attrIndex == attr.OwnerElement.Attributes.Length - 1)
+            {
                 return false;
-			}
+            }
 
             _currentNode = attr.OwnerElement.Attributes[attrIndex + 1];
 			return true;
