MyArrayList finished

src/main/java/MyArrayList.java

@@ -1,3 +1,6 @@
+import java.util.ArrayList;
+import java.util.Arrays;
+
 public class MyArrayList<T> {
     private final static int INITIAL_SIZE = 0;
     private Object[] myArrayList;
@@ -13,12 +16,12 @@ public class MyArrayList<T> {
         this.size = size;
     }
 
-
     public void add(T data) {
 
-        Object[] tempArray = new Object[getSize() + 1];
-        tempArray[size] = data;
-        myArrayList = tempArray;
+        Object[] tempArray1 = new Object[getSize() + 1];
+        copy(tempArray1, myArrayList);
+        tempArray1[getSize()] = data;
+        myArrayList = tempArray1;
         setSizeBy1();
 
     }
@@ -29,17 +32,24 @@ public class MyArrayList<T> {
         }
     }
 
-    public void add(T data, int index) {
-        try {
-            Object[] tempoArray = new Object[getSize() + 1];
-            copy(tempoArray, myArrayList);
-            setSizeBy1();
-            myArrayList = tempoArray;
-            add(data);
-            set(index, data);
-        } catch (ArrayIndexOutOfBoundsException e) {
-            System.out.println("That index is not in my array list!");
+    public void add(int index, T data) {
+        Object[] newArray = new Object[getSize()];
+        Object[] firstArray = Arrays.copyOfRange(myArrayList, 0, index);
+        for (int i = 0; i < firstArray.length; i++) {
+            newArray[i] = firstArray[i];
+        }
+
+        Object[] secondArray = Arrays.copyOfRange(myArrayList, index, getSize());
+        int count = 1;
+        newArray[index] = data;
+        for (int i = index + 1; i < newArray.length; i++) {
+
+            newArray[i] = secondArray[count++];
         }
+
+        setSize(newArray.length);
+        myArrayList = newArray;
+
     }
 
     public int getSize() {
@@ -50,6 +60,10 @@ public class MyArrayList<T> {
         this.size++;
     }
 
+    public void setSize(int i) {
+        this.size = i;
+    }
+
     public void resetSize() {
         this.size = INITIAL_SIZE;
     }

src/test/java/MyArrayListTest.java

@@ -28,11 +28,15 @@ public class MyArrayListTest {
         stringList.add("Wilhelm spilled the tea");
         stringList.add("the table got wet :(");
         stringList.add("Nhu got more tears to fill up her tea");
-        stringList.add("Wilhelm spilled the tea");
-        stringList.add("Wilhelm spilled the tea");
 
 
-        stringList.add("Dolio Rollio", 1);
+        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)));
 
@@ -68,11 +72,6 @@ public class MyArrayListTest {
         Assert.assertEquals(expectedString, stringList.get(5));
     }
 
-//    @Test(expected = ArrayIndexOutOfBoundsException.class)
-//    public void testSetException() throws ArrayIndexOutOfBoundsException {
-//        stringList.set(100, "Froilon's fav color is red");
-//    }
-
     @Test
     public void testClear() {
         int expectedSize = 0;