Completed

arraz/src/main/java/Arraz.java

@@ -1,6 +1,4 @@
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.TreeMap;
+import java.util.*;
 
 public class Arraz {
 
@@ -73,24 +71,20 @@ public class Arraz {
     }
 
 
-//    public Integer[] copyArrayByIterator(Integer[] intInput) {
-//        Integer[] retArr = new Integer[intInput.length];
-//
-//        Iterator<Integer> iterator = new Iterator<Integer>() {
-//            public boolean hasNext(int intValue) {
-//                return intValue == null ? true : false;
-//            }
-//
-//            public Integer next() {
-//                return null;
-//            }
-//
-//            public void remove() {
-//
-//            }
-//        }
-//        return retArr;
-//    }
+    public int[] copyArrayByIterator(Integer[] intInput) {
+        int[] retArr = new int[intInput.length];
+        List<Integer> list = Arrays.asList(intInput);
+        Iterable<Integer> iterable = list;
+        Iterator<Integer> iterator = iterable.iterator();
+
+        int index = 0;
+        while (index < intInput.length){
+            retArr[index] = iterator.next();
+            index++;
+        }
+
+        return retArr;
+    }
 
     public int[] copyArrayByLoop(int[] ints){
         int[] retArr = new int[ints.length];
@@ -346,19 +340,25 @@ public class Arraz {
     }
 
     public int[] sortArrayIntoEvensThenOdds(int[] arr) {
-        ArrayList<Integer> even = new ArrayList<>();
-        ArrayList<Integer> odd = new ArrayList<>();
-        int[] retArr = new int[arr.length];
+        ArrayList<Integer> evenList = new ArrayList<>();
+        ArrayList<Integer> oddList = new ArrayList<>();
+        int retArrLength = arr.length;
 
         for (int i: arr) {
             if (i % 2 == 0){
-                even.add(i);
+                evenList.add(i);
             }
             else {
-                odd.add(i);
+                oddList.add(i);
             }
         }
 
+        return retArr(evenList, oddList, retArrLength);
+    }
+
+    private int[] retArr(ArrayList<Integer> even, ArrayList<Integer> odd, int retArrLength){
+        int[] retArr = new int[retArrLength];
+
         int index = 0;
         for (int i: even) {
             retArr[index] = i;
@@ -369,7 +369,6 @@ public class Arraz {
             retArr[index] = i;
             index++;
         }
-
         return retArr;
     }
 }

arraz/src/test/java/ArrazTest.java

@@ -224,23 +224,31 @@ public class ArrazTest {
         Assert.assertEquals(expected, actual);
     }
 
-//    @Test
-//    public void test1copyArrayByIterator() {
-//        //GIVEN
-//        Object[] arr = {1, 2, 3, 4, 5};
-//        //WHEN
-//        Object[] retObject = arraz.copyArrayByIterator(arr);
-//        int expected = 3;
-//
-//        //THEN
-//        int actual = retObject.;
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void test2copyArrayByIterator() {
-//
-//    }
+    @Test
+    public void test1copyArrayByIterator() {
+        //GIVEN
+        Integer[] arr = {1, 2, 3, 4, 5};
+        //WHEN
+        int[] retArr = arraz.copyArrayByIterator(arr);
+        int expected = 3;
+
+        //THEN
+        int actual = retArr[2];
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void test2copyArrayByIterator() {
+        //GIVEN
+        Integer[] arr = {1, 2, 3, 4, 5};
+        //WHEN
+        int[] retArr = arraz.copyArrayByIterator(arr);
+        int expected = 5;
+
+        //THEN
+        int actual = retArr[4];
+        Assert.assertEquals(expected, actual);
+    }
 
     @Test
     public void test1copyArrayByLoop() {
@@ -744,7 +752,7 @@ public class ArrazTest {
         //THEN
         Assert.assertEquals(expected, actual);
     }
-    // sortArrayIntoEvensThenOdds
+
     @Test
     public void test1sortArrayIntoEvensThenOdds(){
         //GIVEN