Search for element siblings by identity not content

jhy · jhy · commit 11f7c1bd7a2d · 2015-04-21T22:11:28.000-07:00
Fixes jhy#554, jhy#561
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,10 @@
 jsoup changelog
 
+*** Release 1.8.3 [PENDING]
+ * Fix an issue in Element.getElementSiblingIndex (and related methods) where sibling elements with the same content
+   would incorrectly have the same sibling index.
+   <https://github.com/jhy/jsoup/issues/554>
+
 *** Release 1.8.2 [2015-Apr-13]
  * Performance improvements for parsing HTML on Android, of 1.5x to 1.9x, with larger parses getting a bigger
    speed increase. For non-Android JREs, around 1.1x to 1.2x.
diff --git a/src/main/java/org/jsoup/nodes/Element.java b/src/main/java/org/jsoup/nodes/Element.java
@@ -571,7 +571,7 @@ private static <E extends Element> Integer indexInList(Element search, List<E> e
 
         for (int i = 0; i < elements.size(); i++) {
             E element = elements.get(i);
-            if (element.equals(search))
+            if (element == search)
                 return i;
         }
         return null;
diff --git a/src/test/java/org/jsoup/nodes/ElementTest.java b/src/test/java/org/jsoup/nodes/ElementTest.java
@@ -117,6 +117,18 @@ public class ElementTest {
         assertEquals("element", p.lastElementSibling().text());
     }
 
+    @Test public void testGetSiblingsWithDuplicateContent() {
+        Document doc = Jsoup.parse("<div><p>Hello<p id=1>there<p>this<p>this<p>is<p>an<p id=last>element</div>");
+        Element p = doc.getElementById("1");
+        assertEquals("there", p.text());
+        assertEquals("Hello", p.previousElementSibling().text());
+        assertEquals("this", p.nextElementSibling().text());
+        assertEquals("this", p.nextElementSibling().nextElementSibling().text());
+        assertEquals("is", p.nextElementSibling().nextElementSibling().nextElementSibling().text());
+        assertEquals("Hello", p.firstElementSibling().text());
+        assertEquals("element", p.lastElementSibling().text());
+    }
+
     @Test public void testGetParents() {
         Document doc = Jsoup.parse("<div><p>Hello <span>there</span></div>");
         Element span = doc.select("span").first();
@@ -137,6 +149,14 @@ public class ElementTest {
         assertTrue(2 == ps.get(2).elementSiblingIndex());
     }
 
+    @Test public void testElementSiblingIndexSameContent() {
+        Document doc = Jsoup.parse("<div><p>One</p>...<p>One</p>...<p>One</p>");
+        Elements ps = doc.select("p");
+        assertTrue(0 == ps.get(0).elementSiblingIndex());
+        assertTrue(1 == ps.get(1).elementSiblingIndex());
+        assertTrue(2 == ps.get(2).elementSiblingIndex());
+    }
+
     @Test public void testGetElementsWithClass() {
         Document doc = Jsoup.parse("<div class='mellow yellow'><span class=mellow>Hello <b class='yellow'>Yellow!</b></span><p>Empty</p></div>");
 

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,7 @@ private static <E extends Element> Integer indexInList(Element search, List<E> e`
`571`	`571`
`572`	`572`	`for (int i = 0; i < elements.size(); i++) {`
`573`	`573`	`E element = elements.get(i);`
`574`		`- if (element.equals(search))`
	`574`	`+ if (element == search)`
`575`	`575`	`return i;`
`576`	`576`	`}`
`577`	`577`	`return null;`