finish

src/main/java/com/zipcodewilmington/arrayutility/ArrayUtility.java

@@ -1,5 +1,6 @@
 package com.zipcodewilmington.arrayutility;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Arrays;
 
@@ -8,11 +9,12 @@ import java.util.Arrays;
  */
 public class ArrayUtility<T> {
     ArrayList<T> utility;
-
+    private T[] array;
 
 
     public ArrayUtility(T[] array) {
         this.utility = new ArrayList<T>(Arrays.asList(array));
+        this.array = array;
 
     }
 
@@ -46,5 +48,21 @@ public class ArrayUtility<T> {
         return mostCommon;
     }
 
-    
+    public int countDuplicatesInMerge(T[] arrayToMerge, T valueToEvaluate) {
+      merge(arrayToMerge);
+      int counter = getNumberOfOccurrences(valueToEvaluate);
+      return counter;
+    }
+
+    public T[] removeValue(T valueToRemove) {
+        ArrayList<T> newList = new ArrayList<>();
+        for (T each: utility) {
+            if (!each.equals(valueToRemove)) {
+                newList.add(each);
+            }
+        }
+        int newLength = newList.size();
+        T[] arr = (T[]) Array.newInstance(array.getClass().getComponentType(), newLength);
+        return newList.toArray(arr);
+    }
 }

src/test/java/com/zipcodewilmington/arrayutility/CountDuplicatesInMergeTest.java

@@ -8,69 +8,69 @@ import org.junit.Test;
  * The purpose of this class is to thoroughly test the method countDuplicatesInMerge()
  */
 public class CountDuplicatesInMergeTest {
-//    @Test
-//    public void integerTest() {
-//        // Given
-//        Integer valueToEvaluate = 7;
-//        Integer expected = 5;
-//        Integer[] inputArray = {1, 2, valueToEvaluate, 8, 4, 5, valueToEvaluate, 0, 9, 8, valueToEvaluate};
-//        Integer[] arrayToMerge = {1, 2, valueToEvaluate, 8, 4, 5, valueToEvaluate, 0, 9, 8};
-//        ArrayUtility<Integer> arrayUtility = new ArrayUtility<Integer>(inputArray);
-//
-//        // When
-//        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
-//
-//        // Then
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void longTest() {
-//        // Given
-//        Long valueToEvaluate = 7L;
-//        Integer expected = 6;
-//        Long[] inputArray = {1L, 2L, valueToEvaluate, 8L, 4L, 5L, valueToEvaluate, 0L, 9L, 8L, valueToEvaluate};
-//        Long[] arrayToMerge = {1L, 2L, valueToEvaluate, 8L, 4L, 5L, valueToEvaluate, 0L, 9L, 8L, valueToEvaluate};
-//        ArrayUtility<Long> arrayUtility = new ArrayUtility<Long>(inputArray);
-//
-//        // When
-//        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
-//
-//        // Then
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void stringTest() {
-//        // Given
-//        String valueToEvaluate = "a";
-//        Integer expected = 7;
-//        String[] inputArray = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate};
-//        String[] arrayToMerge = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate, valueToEvaluate};
-//
-//        ArrayUtility<String> arrayUtility = new ArrayUtility<String>(inputArray);
-//
-//        // When
-//        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
-//
-//        // Then
-//        Assert.assertEquals(expected, actual);
-//    }
-//
-//    @Test
-//    public void objectTest() {
-//        // Given
-//        Object valueToEvaluate = "a";
-//        Integer expected = 8;
-//        Object[] inputArray = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate};
-//        Object[] arrayToMerge = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate, valueToEvaluate, valueToEvaluate};
-//
-//        ArrayUtility<Object> arrayUtility = new ArrayUtility<Object>(inputArray);
-//
-//        // When
-//        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
-//
-//        // Then
-//        Assert.assertEquals(expected, actual);
-//    }
+    @Test
+    public void integerTest() {
+        // Given
+        Integer valueToEvaluate = 7;
+        Integer expected = 5;
+        Integer[] inputArray = {1, 2, valueToEvaluate, 8, 4, 5, valueToEvaluate, 0, 9, 8, valueToEvaluate};
+        Integer[] arrayToMerge = {1, 2, valueToEvaluate, 8, 4, 5, valueToEvaluate, 0, 9, 8};
+        ArrayUtility<Integer> arrayUtility = new ArrayUtility<Integer>(inputArray);
+
+        // When
+        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
+
+        // Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void longTest() {
+        // Given
+        Long valueToEvaluate = 7L;
+        Integer expected = 6;
+        Long[] inputArray = {1L, 2L, valueToEvaluate, 8L, 4L, 5L, valueToEvaluate, 0L, 9L, 8L, valueToEvaluate};
+        Long[] arrayToMerge = {1L, 2L, valueToEvaluate, 8L, 4L, 5L, valueToEvaluate, 0L, 9L, 8L, valueToEvaluate};
+        ArrayUtility<Long> arrayUtility = new ArrayUtility<Long>(inputArray);
+
+        // When
+        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
+
+        // Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void stringTest() {
+        // Given
+        String valueToEvaluate = "a";
+        Integer expected = 7;
+        String[] inputArray = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate};
+        String[] arrayToMerge = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate, valueToEvaluate};
+
+        ArrayUtility<String> arrayUtility = new ArrayUtility<String>(inputArray);
+
+        // When
+        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
+
+        // Then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void objectTest() {
+        // Given
+        Object valueToEvaluate = "a";
+        Integer expected = 8;
+        Object[] inputArray = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate};
+        Object[] arrayToMerge = {"1", "2", valueToEvaluate, "8", "4", "5", valueToEvaluate, "0", "9", "8", valueToEvaluate, valueToEvaluate, valueToEvaluate};
+
+        ArrayUtility<Object> arrayUtility = new ArrayUtility<Object>(inputArray);
+
+        // When
+        Integer actual = arrayUtility.countDuplicatesInMerge(arrayToMerge, valueToEvaluate);
+
+        // Then
+        Assert.assertEquals(expected, actual);
+    }
 }

src/test/java/com/zipcodewilmington/arrayutility/RemoveValueTest.java

@@ -8,71 +8,71 @@ import org.junit.Test;
  * The purpose of this class is to thoroughly test the method removeValue()
  */
 public class RemoveValueTest {
-//    @Test
-//    public void integerTest() {
-//        // Given
-//        Integer valueToRemove = 7;
-//        Integer[] expected = {11, 2, 8, 4, 5, 0, 9, 8};
-//        Integer[] inputArray = {11, 2, valueToRemove, 8, 4, 5, valueToRemove, 0, 9, 8, valueToRemove};
-//        ArrayUtility<Integer> arrayUtility = new ArrayUtility<Integer>(inputArray);
-//
-//
-//        // When
-//        Integer[] actual = arrayUtility.removeValue(valueToRemove);
-//
-//        // Then
-//        UnitTestingUtils.assertArrayEquality(expected, actual);
-//    }
-//
-//    @Test
-//    public void longTest() {
-//        // Given
-//        Long valueToRemove = 7L;
-//        Long[] expected = {12L, 2L, 8L, 4L, 5L, 0L, 9L, 8L};
-//        Long[] inputArray = {12L, 2L, valueToRemove, 8L, 4L, 5L, valueToRemove, 0L, 9L, 8L, valueToRemove};
-//        ArrayUtility<Long> arrayUtility = new ArrayUtility<Long>(inputArray);
-//
-//
-//        // When
-//        Long[] actual = arrayUtility.removeValue(valueToRemove);
-//
-//        // Then
-//        UnitTestingUtils.assertArrayEquality(expected, actual);
-//    }
-//
-//
-//    @Test
-//    public void stringTest() {
-//        // Given
-//        String valueToRemove = "7";
-//        String[] expected = {"13", "2", "8", "4", "5", "0", "9", "8"};
-//        String[] inputArray = {"13", "2", valueToRemove, "8", "4", "5", valueToRemove, "0", "9", "8", valueToRemove};
-//        ArrayUtility<String> arrayUtility = new ArrayUtility<String>(inputArray);
-//
-//
-//        // When
-//        String[] actual = arrayUtility.removeValue(valueToRemove);
-//
-//        // Then
-//        UnitTestingUtils.assertArrayEquality(expected, actual);
-//    }
-//
-//
-//
-//    @Test
-//    public void objectTest() {
-//        // Given
-//        Object valueToRemove = "7";
-//        Object[] expected = {"41", "2", "8", "4", "5", "0", "9", "8"};
-//        Object[] inputArray = {"41", "2", valueToRemove, "8", "4", "5", valueToRemove, "0", "9", "8", valueToRemove};
-//        ArrayUtility<Object> arrayUtility = new ArrayUtility<Object>(inputArray);
-//
-//
-//        // When
-//        Object[] actual = arrayUtility.removeValue(valueToRemove);
-//
-//        // Then
-//        UnitTestingUtils.assertArrayEquality(expected, actual);
-//    }
+    @Test
+    public void integerTest() {
+        // Given
+        Integer valueToRemove = 7;
+        Integer[] expected = {11, 2, 8, 4, 5, 0, 9, 8};
+        Integer[] inputArray = {11, 2, valueToRemove, 8, 4, 5, valueToRemove, 0, 9, 8, valueToRemove};
+        ArrayUtility<Integer> arrayUtility = new ArrayUtility<Integer>(inputArray);
+
+
+        // When
+        Integer[] actual = arrayUtility.removeValue(valueToRemove);
+
+        // Then
+        UnitTestingUtils.assertArrayEquality(expected, actual);
+    }
+
+    @Test
+    public void longTest() {
+        // Given
+        Long valueToRemove = 7L;
+        Long[] expected = {12L, 2L, 8L, 4L, 5L, 0L, 9L, 8L};
+        Long[] inputArray = {12L, 2L, valueToRemove, 8L, 4L, 5L, valueToRemove, 0L, 9L, 8L, valueToRemove};
+        ArrayUtility<Long> arrayUtility = new ArrayUtility<Long>(inputArray);
+
+
+        // When
+        Long[] actual = arrayUtility.removeValue(valueToRemove);
+
+        // Then
+        UnitTestingUtils.assertArrayEquality(expected, actual);
+    }
+
+
+    @Test
+    public void stringTest() {
+        // Given
+        String valueToRemove = "7";
+        String[] expected = {"13", "2", "8", "4", "5", "0", "9", "8"};
+        String[] inputArray = {"13", "2", valueToRemove, "8", "4", "5", valueToRemove, "0", "9", "8", valueToRemove};
+        ArrayUtility<String> arrayUtility = new ArrayUtility<String>(inputArray);
+
+
+        // When
+        String[] actual = arrayUtility.removeValue(valueToRemove);
+
+        // Then
+        UnitTestingUtils.assertArrayEquality(expected, actual);
+    }
+
+
+
+    @Test
+    public void objectTest() {
+        // Given
+        Object valueToRemove = "7";
+        Object[] expected = {"41", "2", "8", "4", "5", "0", "9", "8"};
+        Object[] inputArray = {"41", "2", valueToRemove, "8", "4", "5", valueToRemove, "0", "9", "8", valueToRemove};
+        ArrayUtility<Object> arrayUtility = new ArrayUtility<Object>(inputArray);
+
+
+        // When
+        Object[] actual = arrayUtility.removeValue(valueToRemove);
+
+        // Then
+        UnitTestingUtils.assertArrayEquality(expected, actual);
+    }
 
 }