Merge branch 'master' of https://git.zipcode.rocks/Cohort4.2/Quiz5

src/main/java/rocks/zipcode/quiz3a/arrays/ArrayUtils.java

@@ -4,4 +4,11 @@ package rocks.zipcode.quiz3a.arrays;
  * @author leon on 01/01/2019.
  */
 public class ArrayUtils {
+    public static String getMiddleElement(String[] values) {
+        return null;
+    }
+
+    public static String[] removeMiddleElement(String[] values) {
+        return null;
+    }
 }

src/main/java/rocks/zipcode/quiz3a/collections/WordCounter.java

@@ -6,7 +6,7 @@ public class WordCounter {
     public WordCounter(String... strings) {
     }
 
-    public static Map<String, Integer> getWordCountMap() {
+    public Map<String, Integer> getWordCountMap() {
         return null;
     }
 }

src/test/java/rocks/zipcode/quiz3a/arrays/arrayutils/GetMiddleElementTest.java

@@ -0,0 +1,47 @@
+package rocks.zipcode.quiz3a.arrays.arrayutils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.arrays.ArrayUtils;
+
+public class GetMiddleElementTest {
+    @Test
+    public void test1() {
+        // given
+        String expected = "Quick";
+        String[] strings = {"The", expected, "Brown"};
+
+        // when
+        String actual = ArrayUtils.getMiddleElement(strings);
+
+        //then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void test2() {
+        // given
+        String expected = "Brown";
+        String[] strings = {"The", "Quick", expected, "Fox", "Jumps"};
+
+        // when
+        String actual = ArrayUtils.getMiddleElement(strings);
+
+        //then
+        Assert.assertEquals(expected, actual);
+    }
+
+
+    @Test
+    public void test3() {
+        // given
+        String expected = "Fox";
+        String[] strings = {"The", "Quick", "Brown", expected, "Jumps", "Over", "The"};
+
+        // when
+        String actual = ArrayUtils.getMiddleElement(strings);
+
+        //then
+        Assert.assertEquals(expected, actual);
+    }
+}

src/test/java/rocks/zipcode/quiz3a/arrays/arrayutils/RemoveMiddleCharacterTest.java

@@ -0,0 +1,47 @@
+package rocks.zipcode.quiz3a.arrays.arrayutils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.arrays.ArrayUtils;
+
+public class RemoveMiddleCharacterTest {
+    @Test
+    public void test1() {
+        // given
+        String[] strings = {"The", "Quick", "Brown"};
+        String[] expected = {"The", "Brown"};
+
+        // when
+        String[] actual = ArrayUtils.removeMiddleElement(strings);
+
+        //then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+    @Test
+    public void test2() {
+        // given
+        String[] expected = {"The", "Quick", "Fox", "Jumps"};
+        String[] strings = {"The", "Quick", "Brown", "Fox", "Jumps"};
+
+        // when
+        String[] actual = ArrayUtils.removeMiddleElement(strings);
+
+        //then
+        Assert.assertArrayEquals(expected, actual);
+    }
+
+
+    @Test
+    public void test3() {
+        // given
+        String[] strings = {"The", "Quick", "Brown", "Fox", "Jumps", "Over", "The"};
+        String[] expected = {"The", "Quick", "Brown", "Jumps", "Over", "The"};
+
+        // when
+        String[] actual = ArrayUtils.removeMiddleElement(strings);
+
+        //then
+        Assert.assertArrayEquals(expected, actual);
+    }
+}

src/test/java/rocks/zipcode/quiz3a/collections/wordcounter/GetWordCountMapTest.java

@@ -1,4 +1,72 @@
 package rocks.zipcode.quiz3a.collections.wordcounter;
 
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.collections.WordCounter;
+
+import java.util.Map;
+
 public class GetWordCountMapTest {
+    @Test
+    public void test1() {
+        // given
+        WordCounter wordCounter = new WordCounter("Hey");
+        Integer expected = 1;
+
+        // when
+        Map<String, Integer> map = wordCounter.getWordCountMap();
+        Integer actual = map.get("Hey");
+
+        // then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void test2() {
+        // given
+        WordCounter wordCounter = new WordCounter("Hey", "Hey");
+        Integer expected = 2;
+
+        // when
+        Map<String, Integer> map = wordCounter.getWordCountMap();
+        Integer actual = map.get("Hey");
+
+        // then
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void test3() {
+        // given
+        WordCounter wordCounter = new WordCounter("Hey", "Hey", "Hello");
+        Integer expectedHey = 2;
+        Integer expectedHello = 1;
+
+        // when
+        Map<String, Integer> map = wordCounter.getWordCountMap();
+        Integer actualHey = map.get("Hey");
+        Integer actualHello = map.get("Hello");
+
+        // then
+        Assert.assertEquals(expectedHey, actualHey);
+        Assert.assertEquals(expectedHello, actualHello);
+    }
+
+
+    @Test
+    public void test4() {
+        // given
+        WordCounter wordCounter = new WordCounter("Hey", "Hey", "Hello", "Hello", "Hello");
+        Integer expectedHey = 2;
+        Integer expectedHello = 3;
+
+        // when
+        Map<String, Integer> map = wordCounter.getWordCountMap();
+        Integer actualHey = map.get("Hey");
+        Integer actualHello = map.get("Hello");
+
+        // then
+        Assert.assertEquals(expectedHey, actualHey);
+        Assert.assertEquals(expectedHello, actualHello);
+    }
 }

src/test/java/rocks/zipcode/quiz3a/fundamentals/stringutils/LowerCaseMiddleCharacterTest.java

@@ -12,7 +12,7 @@ public class LowerCaseMiddleCharacterTest {
         String expected = "o";
 
         // when
-        String actual = StringUtils.capitalizeMiddleCharacter(input);
+        String actual = StringUtils.lowerCaseMiddleCharacter(input);
 
         // then
         Assert.assertEquals(expected, actual);
@@ -25,7 +25,7 @@ public class LowerCaseMiddleCharacterTest {
         String expected = "OoO";
 
         // when
-        String actual = StringUtils.capitalizeMiddleCharacter(input);
+        String actual = StringUtils.lowerCaseMiddleCharacter(input);
 
         // then
         Assert.assertEquals(expected, actual);

src/test/java/rocks/zipcode/quiz3a/objectorientation/bankaccount/DepositTest.java

@@ -28,14 +28,14 @@ public class DepositTest {
         test(10.0, 50.0);
     }
 
-    public void test(Double initialBalance, Double withdrawalAmount) {
+    public void test(Double initialBalance, Double witdrawalAmount) {
         // given
-        Double expected = initialBalance + withdrawalAmount;
+        Double expected = initialBalance + witdrawalAmount;
         BankAccount bankAccount = new BankAccount();
         bankAccount.setBalance(initialBalance);
 
         // when
-        bankAccount.withdrawal(withdrawalAmount);
+        bankAccount.deposit(witdrawalAmount);
         Double actual = bankAccount.getBalance();
 
         // then

src/test/java/rocks/zipcode/quiz3a/objectorientation/food/GetSpiceCountTest.java

@@ -3,20 +3,53 @@ package rocks.zipcode.quiz3a.objectorientation.food;
 import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcode.quiz3a.collections.Food;
+import rocks.zipcode.quiz3a.objectorientation.Curry;
+import rocks.zipcode.quiz3a.objectorientation.Ginger;
 import rocks.zipcode.quiz3a.objectorientation.Pepper;
 import rocks.zipcode.quiz3a.objectorientation.Spice;
 
 import java.util.Map;
+import java.util.function.Supplier;
 
 public class GetSpiceCountTest {
     @Test
     public void test1() {
+        test(5, Pepper::new);
+    }
+
+    @Test
+    public void test2() {
+        test(10, Pepper::new);
+    }
+
+    @Test
+    public void test3() {
+        test(3, Curry::new);
+    }
+
+
+    @Test
+    public void test4() {
+        test(6, Curry::new);
+    }
+
+    @Test
+    public void test5() {
+        test(2, Ginger::new);
+    }
+
+    @Test
+    public void test6() {
+        test(4, Ginger::new);
+    }
+
+    public void test(Integer amountOfIngredients, Supplier<?> ingredientConstructor) {
         // given
+        Integer expected = amountOfIngredients;
         Food food = new Food();
-        Integer expected = 5;
         Spice pepper = null;
-        for (int i = 0; i < expected; i++) {
-            pepper = (Spice)new Pepper();
+        for (int i = 0; i < amountOfIngredients; i++) {
+            pepper = (Spice) ingredientConstructor.get();
             food.applySpice(pepper);
         }