tested Iterator

src/main/java/MyArrayList.java

@@ -17,8 +17,8 @@ public class MyArrayList<T> {
         this.size = size;
     }
 
-    public Object[] getMyArrayList() {
-        return myArrayList;
+    public T[] getMyArrayList() {
+        return (T[]) myArrayList;
     }
 
     public void add(T data) {

src/main/java/MySet.java

@@ -3,33 +3,10 @@ import java.util.Iterator;
 public class MySet<T> extends MyArrayList<T> implements Iterable<T> {
 
     public MySet() {
-
     }
 
 
-    @Override
-    public void add(T data){
-        // Sets cannot have duplicates
-        boolean hasItem = false;
-
-            for (Object o: getMyArrayList()) {
-                if (o.equals(data)) {
-                    hasItem = true;
-                    break;
-                }
-            }
-
-            if (!hasItem) {
-            Object[] tempArray1 = new Object[getSize() + 1];
-            copy(tempArray1, getMyArrayList());
-            tempArray1[getSize()] = data;
-            setMyArrayList(tempArray1);
-            setSize(getSize() + 1);
-
-        }
-    }
-
-    public class SetIterator implements Iterator<T> {
+    private class SetIterator implements Iterator<T> {
         int current = 0;
 
         public boolean hasNext() {
@@ -50,9 +27,9 @@ public class MySet<T> extends MyArrayList<T> implements Iterable<T> {
 
         @Override
         public void remove() {
-        // removes current -1
-            if (current < getSize() - 1) {
-                MySet.this.remove(next());
+            // removes current -1
+            if (current < getSize()) {
+                MySet.this.remove((T) getMyArrayList()[current]);
             }
 
         }
@@ -62,4 +39,31 @@ public class MySet<T> extends MyArrayList<T> implements Iterable<T> {
     public Iterator<T> iterator() {
         return new SetIterator();
     }
+
+    public boolean hasItem(T data) {
+        for (Object o: getMyArrayList()) {
+            if (o.equals(data)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public void add(T data){
+        // Sets cannot have duplicates
+        boolean hasItem = hasItem(data);
+
+        if (!hasItem) {
+            Object[] tempArray1 = new Object[getSize() + 1];
+            copy(tempArray1, getMyArrayList());
+            tempArray1[getSize()] = data;
+            setMyArrayList(tempArray1);
+            setSize(getSize() + 1);
+        }
+    }
+
+
+
+
 }

src/test/java/MyArrayListTest.java

@@ -31,13 +31,6 @@ public class MyArrayListTest {
 
 
         stringList.add(1, "Dolio Rollio");
-
-        for (int i = 0; i < stringList.getSize(); i++) {
-            System.out.println(stringList.get(i));
-        }
-
-//        System.out.println(stringList.get(1));
-
         Assert.assertTrue(expectedString.equals(stringList.get(1)));
 
     }

src/test/java/MySetTest.java

@@ -2,6 +2,10 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
 public class MySetTest {
 
     MySet<Integer> mySet;
@@ -14,7 +18,7 @@ public class MySetTest {
 
     @Test
     public void testAddUnique() {
-        int expectedOutput = 1;
+        Integer expectedOutput = 1;
         mySet.add(1);
         Assert.assertEquals(expectedOutput, mySet.getMyArrayList()[mySet.getSize()-1]);
     }
@@ -51,5 +55,57 @@ public class MySetTest {
         Assert.assertFalse(mySet.contains(3));
     }
 
+    @Test
+    public void testHasNextFalse() {
+        Assert.assertFalse(mySet.iterator().hasNext());
+    }
+
+    @Test
+    public void testHasNextTrue() {
+        mySet.add(1);
+        mySet.add(2);
+        mySet.add(5);
+        mySet.add(10);
+
+        Assert.assertTrue(mySet.iterator().hasNext());
+    }
+
+    @Test
+    public void testIteratorNext() {
+        Integer expectedNext = 1;
+        mySet.add(1);
+
+        Assert.assertEquals(expectedNext, mySet.iterator().next());
+    }
+
+    @Test
+    public void testIteratorRemove() {
+        mySet.add(1);
+        mySet.add(2);
+        mySet.add(5);
+        mySet.add(10);
+
+        mySet.iterator().remove();
+
+        Assert.assertFalse(mySet.contains(1));
+    }
 
+//    @Test
+//    public void testContainsAllFalse() {
+//        MySet<Integer> inputSet = new MySet<>();
+//        inputSet.add(1);
+//        inputSet.add(2);
+//        inputSet.add(3);
+//        inputSet.add(4);
+//
+//        Object[] inputArray = inputSet.getMyArrayList();
+//
+//        for (Object i: inputArray
+//             ) {
+//            System.out.println(i);
+//        }
+//        // Checks if all the values are in the set, if not add the values;
+//        Assert.assertFalse(mySet.containsAll(inputArray));
+//
+//    }
 }