[incubator-netbeans-html4j] branch master updated: Bugfixing behavior of subList().toArray

[jtulach]

This is an automated email from the ASF dual-hosted git repository.

jtulach pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans-html4j.git


The following commit(s) were added to refs/heads/master by this push:
     new 857a495  Bugfixing behavior of subList().toArray
857a495 is described below

commit 857a4959c4ed550e012bed25643ae51b4aac6c6b
Author: Jaroslav Tulach <jaroslav.tul...@apidesign.org>
AuthorDate: Fri Feb 1 21:06:25 2019 +0100

    Bugfixing behavior of subList().toArray
---
 .../java/org/netbeans/html/json/impl/SimpleList.java  |  4 ++--
 .../org/netbeans/html/json/impl/SimpleListTest.java   | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/json/src/main/java/org/netbeans/html/json/impl/SimpleList.java 
b/json/src/main/java/org/netbeans/html/json/impl/SimpleList.java
index 566397c..60b7f38 100644
--- a/json/src/main/java/org/netbeans/html/json/impl/SimpleList.java
+++ b/json/src/main/java/org/netbeans/html/json/impl/SimpleList.java
@@ -93,8 +93,8 @@ public class SimpleList<E> implements List<E> {
         if (a.length < to - from) {
             a = newArr(a, to - from);
         }
-        for (int i = 0; i < size; i++) {
-            a[i] = (T) arr[i + from];
+        for (int i = from; i < to; i++) {
+            a[i - from] = (T) arr[i];
         }
         return a;
     }
diff --git a/json/src/test/java/org/netbeans/html/json/impl/SimpleListTest.java 
b/json/src/test/java/org/netbeans/html/json/impl/SimpleListTest.java
index 58eee5a..60e06a0 100644
--- a/json/src/test/java/org/netbeans/html/json/impl/SimpleListTest.java
+++ b/json/src/test/java/org/netbeans/html/json/impl/SimpleListTest.java
@@ -104,6 +104,25 @@ public class SimpleListTest {
     }
 
     @Test(dataProvider = "lists")
+    public void subListFromTwo(List<Number> list) {
+        list.add(10);
+        list.add(20);
+
+        Number[] first = list.subList(0, 1).toArray(new Number[0]);
+        assertEquals(1, first.length);
+        assertEquals(10, first[0]);
+
+        Number[] second = list.subList(1, 2).toArray(new Number[0]);
+        assertEquals(1, second.length);
+        assertEquals(20, second[0]);
+
+        Number[] both = list.subList(0, 2).toArray(new Number[0]);
+        assertEquals(2, both.length);
+        assertEquals(10, both[0]);
+        assertEquals(20, both[1]);
+    }
+
+    @Test(dataProvider = "lists")
     public void retainAllOnSubList(List<Number> list) {
         list.add(3);
         list.add(3.3f);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists