Merge pull request processing-js#22 from davidleibovic/master

[#1885] Fixed ArrayList Iterator

Author: jbuck

processing.js

@@ -454,17 +454,17 @@
    */
   var ArrayList = (function() {
     function Iterator(array) {
-      var index = 0;
+      var index = -1;
       this.hasNext = function() {
-        return index < array.length;
+        return (index + 1) < array.length;
       };
 
       this.next = function() {
-        return array[index++];
+        return array[++index];
       };
 
       this.remove = function() {
-        array.splice(index, 1);
+        array.splice(index--, 1);
       };
     }
 

test/unit/arrayListIterator.pde

@@ -0,0 +1,58 @@
+ArrayList<String> arrayList = new ArrayList<String>();
+arrayList.add("a");
+arrayList.add("b");
+arrayList.add("c");
+
+_checkEqual(3, arrayList.size());
+
+Iterator<String> it = arrayList.iterator();
+String temp;
+
+
+// test iteration methods
+_checkTrue(it.hasNext());
+temp = it.next();
+_checkEqual(temp, "a");
+
+_checkTrue(it.hasNext());
+temp = it.next();
+_checkEqual(temp, "b");
+
+_checkTrue(it.hasNext());
+temp = it.next();
+_checkEqual(temp, "c");
+
+_checkFalse(it.hasNext());
+
+// test remove method
+it = arrayList.iterator();
+
+ArrayList<String> remove1 = new ArrayList<String>();
+remove1.add("b");
+remove1.add("c");
+
+ArrayList<String> remove2 = new ArrayList<String>();
+remove2.add("c");
+
+ArrayList<String> remove3 = new ArrayList<String>();
+
+
+_checkTrue(it.hasNext());
+it.next();
+it.remove();
+_checkEqual(2, arrayList.size());
+_checkEqual(remove1, arrayList);
+
+_checkTrue(it.hasNext());
+it.next();
+it.remove();
+_checkEqual(1, arrayList.size());
+_checkEqual(remove2, arrayList);
+
+_checkTrue(it.hasNext());
+it.next();
+it.remove();
+_checkEqual(0, arrayList.size());
+_checkEqual(remove3, arrayList);
+
+_checkFalse(it.hasNext());