Added remove() to Iterator.

Author: Bytekeeper

src/main/java/org/bk/ass/collection/UnorderedCollection.java

@@ -1,9 +1,6 @@
 package org.bk.ass.collection;
 
-import java.util.AbstractCollection;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.NoSuchElementException;
+import java.util.*;
 
 import static java.lang.Math.max;
 import static java.lang.Math.min;
@@ -107,7 +104,7 @@ public Iterator<T> iterator() {
 
   @Override
   public Object[] toArray() {
-    return items;
+    return Arrays.copyOf(items, size);
   }
 
   @Override
@@ -135,6 +132,11 @@ public void clear() {
   private class UnorderedListIterator implements Iterator<T> {
     private int index;
 
+    @Override
+    public void remove() {
+      UnorderedCollection.this.removeAt(index - 1);
+    }
+
     @Override
     public boolean hasNext() {
       return index < size;

src/test/java/org/bk/ass/collection/UnorderedCollectionTest.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
+import java.util.Iterator;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -84,4 +85,38 @@ public void shouldRemoveElements() {
     // THEN
     assertThat(sut).containsExactly("test2");
   }
+
+  @Test
+  void shouldRemoveInIterator() {
+    // GIVEN
+    String toRemove = "test";
+    sut.add(toRemove);
+
+    Iterator<Object> iterator = sut.iterator();
+    iterator.next();
+
+    // WHEN
+    iterator.remove();
+
+    // THEN
+    assertThat(sut).isEmpty();
+  }
+
+  @Test
+  void shouldRemoveCorrectItemInIterator() {
+    // GIVEN
+    String toRemove = "test";
+    sut.add(toRemove);
+    String expectedRemainingItem = "test2";
+    sut.add(expectedRemainingItem);
+
+    Iterator<Object> iterator = sut.iterator();
+    iterator.next();
+
+    // WHEN
+    iterator.remove();
+
+    // THEN
+    assertThat(sut).containsExactly(expectedRemainingItem);
+  }
 }