From 2a3dad0921d18b2e0d2065b136f73338aae58cd4 Mon Sep 17 00:00:00 2001
From: cwilliams <coreywllms9@gmail.com>
Date: Fri, 6 Mar 2020 11:35:26 -0500
Subject: [PATCH 1/2]  done

---
 .../zipcodewilmington/assessment2/part1/BasicUtilities.java | 6 ++++++
 .../zipcodewilmington/assessment2/part2/ArrayUtility.java   | 3 ++-
 .../assessment2/part2/arrayutility/MergeTest.java           | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java
index 1402353..4e8e879 100644
--- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java
+++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java
@@ -2,6 +2,12 @@
 
 public class BasicUtilities {
     public Boolean isGreaterThan5(Integer value) {
+        // int value;
+        // for (int i = 0; i < Math.abs(value); i++) {
+        // if (value > 5){
+        //    return null;
+        // }
+        //}
         return null;
     }
 
diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java
index de2f799..54e1664 100644
--- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java
+++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java
@@ -1,7 +1,8 @@
 package com.zipcodewilmington.assessment2.part2;
 
 public class ArrayUtility {
-    public Integer[] merge(Integer[] array1, Integer[] array2) {
+    public Integer merge(Integer[] array1, Integer[] array2) {
+
         return null;
     }
 
diff --git a/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java b/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java
index 206e36f..0752f72 100644
--- a/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java
+++ b/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java
@@ -39,7 +39,6 @@ public void test2() {
     }
 
 
-
     @Test
     public void test3() {
         //Given

From 035deea59419f2a1bbf0f94cb696f3e2c2b9c018 Mon Sep 17 00:00:00 2001
From: cwilliams <coreywllms9@gmail.com>
Date: Fri, 6 Mar 2020 12:00:29 -0500
Subject: [PATCH 2/2]  I fixed my return type. I did have 2 completed but was
 having compiling issues

---
 .../assessment2/part1/BasicUtilities.java      | 14 +++++++-------
 .../assessment2/part2/ArrayUtility.java        | 18 +++++++++++++++---
 .../part2/arrayutility/MergeTest.java          |  2 +-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java
index 4e8e879..5188067 100644
--- a/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java
+++ b/src/main/java/com/zipcodewilmington/assessment2/part1/BasicUtilities.java
@@ -2,13 +2,13 @@
 
 public class BasicUtilities {
     public Boolean isGreaterThan5(Integer value) {
-        // int value;
-        // for (int i = 0; i < Math.abs(value); i++) {
-        // if (value > 5){
-        //    return null;
-        // }
-        //}
-        return null;
+
+         for (int i = 0; i < Math.abs(value); i++) {
+         if (value >= 5){
+            return true;
+        }
+        }
+        return false;
     }
 
     public Boolean isLessThan7(Integer value) {
diff --git a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java
index 54e1664..bf17413 100644
--- a/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java
+++ b/src/main/java/com/zipcodewilmington/assessment2/part2/ArrayUtility.java
@@ -1,9 +1,21 @@
 package com.zipcodewilmington.assessment2.part2;
 
 public class ArrayUtility {
-    public Integer merge(Integer[] array1, Integer[] array2) {
-
-        return null;
+    public Integer [] merge(Integer[] array1, Integer[] array2) {
+       Integer [] firstArray = array1;
+       Integer [] secondArray = array2;
+       int length = firstArray.length + secondArray.length;
+       Integer[] mergedArray = new Integer[length];
+       int pos = 0;
+       for (Integer element : firstArray){
+           mergedArray[pos] = element;
+           pos++;
+       }
+       for(Integer element : secondArray){
+           mergedArray[pos] = element;
+           pos++;
+       }
+        return mergedArray;
     }
 
     public Integer[] rotate(Integer[] array, Integer index) {
diff --git a/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java b/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java
index 0752f72..eb83f59 100644
--- a/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java
+++ b/src/test/java/com/zipcodewilmington/assessment2/part2/arrayutility/MergeTest.java
@@ -65,7 +65,7 @@ public void test4() {
 
     private void test(Integer[] array1, Integer[] array2, Integer[] expected) {
         // when
-        Integer[] actual = utility.merge(array1, array2);
+        Integer [] actual = utility.merge(array1, array2);
 
         // then
         TestUtils.assertArrayEquals(expected, actual);