update

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

@@ -11,4 +11,4 @@ public class ArrayUtils {
     public static String[] removeMiddleElement(String[] values) {
         return null;
     }
-}
+}

src/main/java/rocks/zipcode/quiz3a/fundamentals/StringUtils.java

@@ -20,7 +20,7 @@ public class StringUtils {
         return null;
     }
 
-    public static Boolean hasDuplicateCharacters(String str) {
+    public static Boolean hasDuplicateConsecutiveCharacters(String str) {
         return null;
     }
 

src/main/java/rocks/zipcode/quiz3a/objectorientation/account/BankAccount.java

@@ -4,18 +4,6 @@ package rocks.zipcode.quiz3a.objectorientation.account;
  * @author leon on 27/12/2018.
  */
 public class BankAccount {
-    public void deposit(Double amountToIncreaseBy) {
-
-    }
-
-    public void withdrawal(Double amountToDecreaseBy) {
-
-    }
-
-    public Double getBalance() {
-        return null;
-    }
-
     public void setBalance(Double val) {
     }
 }

src/main/java/rocks/zipcode/quiz3a/objectorientation/account/Employee.java

@@ -17,8 +17,4 @@ public class Employee {
     public void setBankAccount(BankAccount bankAccount) {
 
     }
-
-    public String getName() {
-        return null;
-    }
 }

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

@@ -9,37 +9,40 @@ public class GetMiddleElementTest {
     public void test1() {
         // given
         String expected = "Quick";
-        String[] strings = {"The", expected, "Brown"};
+        String[] input = {"The", expected, "Brown"};
+        test(expected, input);
 
-        // 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"};
+        String[] input = {"The", "Quick", expected, "Fox", "Jumps"};
+        test(expected, input);
 
-        // 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"};
+        String[] input = {"The", "Quick", "Brown", expected, "Jumps", "Over", "The"};
+        test(expected, input);
+    }
+
+
+    @Test
+    public void test4() {
+        // given
+        String expected = "Jumps";
+        String[] input = {"The", "Quick", "Brown", "Fox", expected, "Over", "The", "Lazy", "Dog"};
+        test(expected, input);
+    }
 
+    private void test(String expected, String[] input) {
         // when
-        String actual = ArrayUtils.getMiddleElement(strings);
+        String actual = ArrayUtils.getMiddleElement(input);
 
         //then
         Assert.assertEquals(expected, actual);

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

@@ -8,38 +8,40 @@ public class RemoveMiddleCharacterTest {
     @Test
     public void test1() {
         // given
-        String[] strings = {"The", "Quick", "Brown"};
         String[] expected = {"The", "Brown"};
+        String[] input = {"The", "Quick", "Brown"};
+        test(expected, input);
 
-        // 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);
+        String[] input = {"The", "Quick", "Brown", "Fox", "Jumps"};
+        test(expected, input);
     }
 
-
     @Test
     public void test3() {
         // given
-        String[] strings = {"The", "Quick", "Brown", "Fox", "Jumps", "Over", "The"};
         String[] expected = {"The", "Quick", "Brown", "Jumps", "Over", "The"};
+        String[] input = {"The", "Quick", "Brown", "Fox", "Jumps", "Over", "The"};
+        test(expected, input);
+    }
+
+
+    @Test
+    public void test4() {
+        // given
+        String[] expected = {"The", "Quick", "Brown", "Fox", "Over", "The", "Lazy", "Dog"};
+        String[] input = {"The", "Quick", "Brown", "Fox", "Jumps", "Over", "The", "Lazy", "Dog"};
+        test(expected, input);
+    }
 
+    private void test(String[] expected, String[] input) {
         // when
-        String[] actual = ArrayUtils.removeMiddleElement(strings);
+        String[] actual = ArrayUtils.removeMiddleElement(input);
 
         //then
         Assert.assertArrayEquals(expected, actual);

src/test/java/rocks/zipcode/quiz3a/fundamentals/calculator/AddTest.java

@@ -11,25 +11,25 @@ public class AddTest {
     @Test
     public void test1() {
         // given
-        test(81.74, 32.70, 49.04);
+        test(98.5, 10.5, 88.5);
     }
 
     @Test
     public void test2() {
         // given
-        test(1435.93, 689.93, 746.00);
+        test(40.12, 19.93, 20.19);
     }
 
     @Test
     public void test3() {
         // given
-        test(109896.0, 35354.0, 74542.0);
+        test(39.94, 19.94, 20.00);
     }
 
     @Test
     public void test4() {
         // given
-        test(12.0, 4.0, 8.0);
+        test(100.00, 50.0, 50.0);
     }
 
     @Test

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

@@ -10,12 +10,7 @@ public class CapitalizeMiddleCharacterTest {
         // given
         String input = "o";
         String expected = "O";
-
-        // when
-        String actual = StringUtils.capitalizeMiddleCharacter(input);
-
-        // then
-        Assert.assertEquals(expected, actual);
+        test(expected, input);
     }
 
     @Test
@@ -23,7 +18,10 @@ public class CapitalizeMiddleCharacterTest {
         // given
         String input = "ooo";
         String expected = "oOo";
+        test(expected, input);
+    }
 
+    private void test(String expected, String input) {
         // when
         String actual = StringUtils.capitalizeMiddleCharacter(input);
 

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

@@ -10,12 +10,7 @@ public class GetMiddleCharacterTest {
         // given
         String input = "joint";
         Character expected = 'i';
-
-        // when
-        Character actual = StringUtils.getMiddleCharacter(input);
-
-        // then
-        Assert.assertEquals(expected, actual);
+        test(expected, input);
     }
 
 
@@ -24,11 +19,32 @@ public class GetMiddleCharacterTest {
         // given
         String input = "burnt";
         Character expected = 'r';
+        test(expected, input);
+    }
 
+
+    @Test
+    public void test3() {
+        // given
+        String input = "bang!";
+        Character expected = 'n';
+        test(expected, input);
+    }
+
+    @Test
+    public void test4() {
+        // given
+        String input = "bang!";
+        Character expected = 'n';
+        test(expected, input);
+    }
+
+    private void test(Character expected, String input) {
         // when
         Character actual = StringUtils.getMiddleCharacter(input);
 
         // then
         Assert.assertEquals(expected, actual);
     }
+
 }

src/test/java/rocks/zipcode/quiz3a/fundamentals/stringutils/HasDuplicateCharacterTest.java → src/test/java/rocks/zipcode/quiz3a/fundamentals/stringutils/HasDuplicateConsecutiveCharactersTest.java

@@ -4,28 +4,28 @@ import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcode.quiz3a.fundamentals.StringUtils;
 
-public class HasDuplicateCharacterTest {
+public class HasDuplicateConsecutiveCharactersTest {
     @Test
     public void test1() {
         String input = "Happy";
-        Assert.assertFalse(StringUtils.hasDuplicateCharacters(input));
+        Assert.assertFalse(StringUtils.hasDuplicateConsecutiveCharacters(input));
     }
 
     @Test
     public void test2() {
         String input = "Fool";
-        Assert.assertTrue(StringUtils.hasDuplicateCharacters(input));
+        Assert.assertTrue(StringUtils.hasDuplicateConsecutiveCharacters(input));
     }
 
     @Test
     public void test3() {
         String input = "George";
-        Assert.assertFalse(StringUtils.hasDuplicateCharacters(input));
+        Assert.assertFalse(StringUtils.hasDuplicateConsecutiveCharacters(input));
     }
 
     @Test
     public void test4() {
         String input = "False";
-        Assert.assertFalse(StringUtils.hasDuplicateCharacters(input));
+        Assert.assertFalse(StringUtils.hasDuplicateConsecutiveCharacters(input));
     }
 }

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

@@ -0,0 +1,53 @@
+package rocks.zipcode.quiz3a.fundamentals.stringutils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.fundamentals.StringUtils;
+
+/**
+ * @author leon on 02/01/2019.
+ */
+public class IsogramNegativeTest {
+    @Test
+    public void test1() {
+        String input = "XX";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+
+    @Test
+    public void test2() {
+        String input = "XXX";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+
+    @Test
+    public void test3() {
+        String input = "AA";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+
+    @Test
+    public void test4() {
+        String input = "AAA";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+
+
+    @Test
+    public void test5() {
+        String input = "Here";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+
+    @Test
+    public void test6() {
+        String input = "Teared";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+
+    @Test
+    public void test7() {
+        String input = "Brown Fox";
+        Assert.assertFalse(StringUtils.isIsogram(input));
+    }
+}

src/test/java/rocks/zipcode/quiz3a/fundamentals/stringutils/IsIsoGramTest.java → src/test/java/rocks/zipcode/quiz3a/fundamentals/stringutils/IsogramPositiveTest.java

@@ -4,7 +4,7 @@ import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcode.quiz3a.fundamentals.StringUtils;
 
-public class IsIsoGramTest {
+public class IsogramPositiveTest {
     @Test
     public void test1() {
         String input = "Jump";
@@ -19,13 +19,24 @@ public class IsIsoGramTest {
 
     @Test
     public void test3() {
-        String input = "Here";
-        Assert.assertFalse(StringUtils.isIsogram(input));
+        String input = "Jj0Oo";
+        Assert.assertTrue(StringUtils.isIsogram(input));
     }
 
+
     @Test
     public void test4() {
-        String input = "Teared";
-        Assert.assertFalse(StringUtils.isIsogram(input));
+        String input = "The Quick";
+        Assert.assertTrue(StringUtils.isIsogram(input));
     }
+
+    @Test
+    public void test5() {
+        String input = "Brown";
+        Assert.assertTrue(StringUtils.isIsogram(input));
+    }
+
+
+
+
 }

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

@@ -10,12 +10,7 @@ public class LowerCaseMiddleCharacterTest {
         // given
         String input = "O";
         String expected = "o";
-
-        // when
-        String actual = StringUtils.lowerCaseMiddleCharacter(input);
-
-        // then
-        Assert.assertEquals(expected, actual);
+        test(expected, input);
     }
 
     @Test
@@ -23,11 +18,31 @@ public class LowerCaseMiddleCharacterTest {
         // given
         String input = "OOO";
         String expected = "OoO";
+        test(expected, input);
+    }
+
+    @Test
+    public void test3() {
+        // given
+        String input = "APPLE";
+        String expected = "APpLE";
+        test(expected, input);
+    }
+
+    @Test
+    public void test4() {
+        // given
+        String input = "Waffle Sauces";
+        String expected = "Waffle Sauces";
+        test(expected, input);
+    }
 
+    public void test(String expected, String input) {
         // when
         String actual = StringUtils.lowerCaseMiddleCharacter(input);
 
         // then
         Assert.assertEquals(expected, actual);
     }
+
 }

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

@@ -1,33 +0,0 @@
-package rocks.zipcode.quiz3a.fundamentals.stringutils;
-
-import org.junit.Assert;
-import org.junit.Test;
-import rocks.zipcode.quiz3a.fundamentals.StringUtils;
-
-public class RemoveDuplicateCharactersTest {
-    @Test
-    public void test1() {
-        // given
-        String input = "Fool";
-        String expected = "Fl";
-
-        // when
-        String actual = StringUtils.removeConsecutiveDuplicateCharacters(input);
-
-        // then
-        Assert.assertEquals(expected, actual);
-    }
-
-    @Test
-    public void test2() {
-        // given
-        String input = "Mississippi";
-        String expected = "Miiii";
-
-        // when
-        String actual = StringUtils.removeConsecutiveDuplicateCharacters(input);
-
-        // then
-        Assert.assertEquals(expected, actual);
-    }
-}

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

@@ -0,0 +1,54 @@
+package rocks.zipcode.quiz3a.fundamentals.stringutils;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.fundamentals.StringUtils;
+
+public class RemoveDuplicateConsecutiveCharactersTest {
+    @Test
+    public void test1() {
+        // given
+        String input = "Fool";
+        String expected = "Fl";
+        test(expected, input);
+    }
+
+    @Test
+    public void test2() {
+        // given
+        String input = "Mississippi";
+        String expected = "Miiii";
+        test(expected, input);
+    }
+
+    @Test
+    public void test3() {
+        // given
+        String input = "Fleet";
+        String expected = "Flt";
+        test(expected, input);
+    }
+
+    @Test
+    public void test4() {
+        // given
+        String input = "Independence";
+        String expected = input;
+        test(expected, input);
+    }
+    @Test
+    public void test5() {
+        // given
+        String input = "Integer";
+        String expected = input;
+        test(expected, input);
+    }
+
+    public void test(String expected, String input) {
+        // when
+        String actual = StringUtils.removeConsecutiveDuplicateCharacters(input);
+
+        // then
+        Assert.assertEquals(expected, actual);
+    }
+}

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

@@ -0,0 +1,39 @@
+package rocks.zipcode.quiz3a.objectorientation.bankaccount;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.objectorientation.account.BankAccount;
+import rocks.zipcode.quiz3a.objectorientation.account.Transactable;
+
+/**
+ * @author leon on 02/01/2019.
+ */
+@SuppressWarnings("all")
+public class DepositNegativeTest {
+
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test1() {
+        test(100.0, -1.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test2() {
+        test(10.0, 50.0);
+    }
+
+    public void test(Double initialBalance, Double witdrawalAmount) {
+        // given
+        Double expected = initialBalance + witdrawalAmount;
+        BankAccount bankAccount = new BankAccount();
+        Transactable transactable = (Transactable)bankAccount;
+        bankAccount.setBalance(initialBalance);
+
+        // when
+        transactable.deposit(witdrawalAmount);
+        Double actual = transactable.getBalance();
+
+        // then
+        Assert.assertEquals(expected, actual);
+    }
+}

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

@@ -0,0 +1,47 @@
+package rocks.zipcode.quiz3a.objectorientation.bankaccount;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.objectorientation.account.BankAccount;
+import rocks.zipcode.quiz3a.objectorientation.account.Transactable;
+
+/**
+ * @author leon on 02/01/2019.
+ */
+@SuppressWarnings("all")
+public class DepositPositiveTest {
+    @Test(expected = IllegalArgumentException.class)
+    public void test1() {
+        test(100.0, -1.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test2() {
+        test(10.0, 50.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test3() {
+        test(55.0, 500.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test4() {
+        test(78.0, 90.0);
+    }
+
+    public void test(Double initialBalance, Double witdrawalAmount) {
+        // given
+        Double expected = initialBalance + witdrawalAmount;
+        BankAccount bankAccount = new BankAccount();
+        Transactable transactable = (Transactable)bankAccount;
+        bankAccount.setBalance(initialBalance);
+
+        // when
+        transactable.deposit(witdrawalAmount);
+        Double actual = transactable.getBalance();
+
+        // then
+        Assert.assertEquals(expected, actual);
+    }
+}

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

@@ -3,6 +3,7 @@ package rocks.zipcode.quiz3a.objectorientation.bankaccount;
 import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcode.quiz3a.objectorientation.account.BankAccount;
+import rocks.zipcode.quiz3a.objectorientation.account.Transactable;
 
 /**
  * @author leon on 30/12/2018.
@@ -32,11 +33,12 @@ public class DepositTest {
         // given
         Double expected = initialBalance + witdrawalAmount;
         BankAccount bankAccount = new BankAccount();
+        Transactable transactable = (Transactable)bankAccount;
         bankAccount.setBalance(initialBalance);
 
         // when
-        bankAccount.deposit(witdrawalAmount);
-        Double actual = bankAccount.getBalance();
+        transactable.deposit(witdrawalAmount);
+        Double actual = transactable.getBalance();
 
         // then
         Assert.assertEquals(expected, actual);

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

@@ -0,0 +1,53 @@
+package rocks.zipcode.quiz3a.objectorientation.bankaccount;
+
+import org.junit.Assert;
+import org.junit.Test;
+import rocks.zipcode.quiz3a.objectorientation.account.BankAccount;
+import rocks.zipcode.quiz3a.objectorientation.account.Transactable;
+
+/**
+ * @author leon on 30/12/2018.
+ */
+@SuppressWarnings("all")
+public class WithdrawalNegativeTest {
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test1() {
+        test(0.0, 1.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test2() {
+        test(10.0, 50.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test3() {
+        test(10.0, -50.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test4() {
+        test(00.0, -50.0);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void test5() {
+        test(00.0, 0.01);
+    }
+
+    private void test(Double initialBalance, Double withdrawalAmount) {
+        // given
+        Double expected = initialBalance - withdrawalAmount;
+        BankAccount bankAccount = new BankAccount();
+        Transactable transactable = (Transactable)bankAccount;
+        bankAccount.setBalance(initialBalance);
+
+        // when
+        transactable.withdrawal(withdrawalAmount);
+        Double actual = transactable.getBalance();
+
+        // then
+        Assert.assertEquals(expected, actual);
+    }
+}

src/test/java/rocks/zipcode/quiz3a/objectorientation/bankaccount/WithdrawalTest.java → src/test/java/rocks/zipcode/quiz3a/objectorientation/bankaccount/WithdrawalPositiveTest.java

@@ -3,11 +3,13 @@ package rocks.zipcode.quiz3a.objectorientation.bankaccount;
 import org.junit.Assert;
 import org.junit.Test;
 import rocks.zipcode.quiz3a.objectorientation.account.BankAccount;
+import rocks.zipcode.quiz3a.objectorientation.account.Transactable;
 
 /**
- * @author leon on 30/12/2018.
+ * @author leon on 02/01/2019.
  */
-public class WithdrawalTest {
+@SuppressWarnings("all")
+public class WithdrawalPositiveTest {
     @Test
     public void test1() {
         test(100.0, 80.0);
@@ -18,25 +20,32 @@ public class WithdrawalTest {
         test(150.0, 70.0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+
+    @Test
     public void test3() {
-        test(100.0, 180.0);
+        test(150.0, 150.0);
     }
 
-    @Test(expected = IllegalArgumentException.class)
+    @Test
     public void test4() {
-        test(10.0, 50.0);
+        test(150.0, 100.0);
+    }
+
+    @Test
+    public void test5() {
+        test(150.0, 50.0);
     }
 
     public void test(Double initialBalance, Double withdrawalAmount) {
         // given
         Double expected = initialBalance - withdrawalAmount;
         BankAccount bankAccount = new BankAccount();
+        Transactable transactable = (Transactable)bankAccount;
         bankAccount.setBalance(initialBalance);
 
         // when
-        bankAccount.withdrawal(withdrawalAmount);
-        Double actual = bankAccount.getBalance();
+        transactable.withdrawal(withdrawalAmount);
+        Double actual = transactable.getBalance();
 
         // then
         Assert.assertEquals(expected, actual);

src/test/java/rocks/zipcode/quiz3a/objectorientation/employee/EmployeeConstructorTest.java

@@ -15,8 +15,11 @@ public class EmployeeConstructorTest {
     public void testNullaryConstructor() {
         // given
         Employee employee = new Employee();
-        Worker worker = (Worker) employee;
-        Transactable transactable = (Transactable) employee;
+        Worker workerEmployee = (Worker) employee;
+        Transactable transactableEmployee = (Transactable) employee;
+        Transactable bankAccount = (Transactable) employee.getBankAccount();
+
+
 
         Double expectedHourlyWage = 35.0;
         Double expectedHoursWorked = 0.0;
@@ -24,10 +27,10 @@ public class EmployeeConstructorTest {
         Double expectedBankAccountBalance = 0.0;
 
         Assert.assertNotNull(employee.getBankAccount());
-        Assert.assertEquals(expectedHourlyWage, worker.getHourlyWage());
-        Assert.assertEquals(expectedHoursWorked, worker.getHoursWorked());
-        Assert.assertEquals(expectedBalance, transactable.getBalance());
-        Assert.assertEquals(expectedBankAccountBalance, employee.getBankAccount().getBalance());
+        Assert.assertEquals(expectedHourlyWage, workerEmployee.getHourlyWage());
+        Assert.assertEquals(expectedHoursWorked, workerEmployee.getHoursWorked());
+        Assert.assertEquals(expectedBalance, transactableEmployee.getBalance());
+        Assert.assertEquals(expectedBankAccountBalance, bankAccount.getBalance());
     }
 
     @Test
@@ -40,19 +43,20 @@ public class EmployeeConstructorTest {
         Double expectedMoneyEarned = expectedHourlyWage * expectedHoursWorked;
         BankAccount bankAccount = new BankAccount();
         bankAccount.setBalance(expectedBankAccountBalance);
+        Transactable transactableBankAccount = (Transactable)bankAccount;
 
         // when
         Employee employee = new Employee(bankAccount);
-        Worker worker = (Worker) employee;
-        Transactable transactable = (Transactable) employee;
+        Worker workerEmployee = (Worker) employee;
+        Transactable transactableEmployee = (Transactable) employee;
 
 
         Assert.assertNotNull(employee.getBankAccount());
-        Assert.assertEquals(expectedHourlyWage, worker.getHourlyWage());
-        Assert.assertEquals(expectedHoursWorked, worker.getHoursWorked());
-        Assert.assertEquals(expectedBalance, transactable.getBalance());
+        Assert.assertEquals(expectedHourlyWage, workerEmployee.getHourlyWage());
+        Assert.assertEquals(expectedHoursWorked, workerEmployee.getHoursWorked());
+        Assert.assertEquals(expectedBalance, transactableEmployee.getBalance());
         Assert.assertEquals(expectedMoneyEarned, expectedMoneyEarned);
-        Assert.assertEquals(expectedBankAccountBalance, employee.getBankAccount().getBalance());
+        Assert.assertEquals(expectedBankAccountBalance, transactableBankAccount.getBalance());
     }
 
 }

src/test/java/rocks/zipcode/quiz3a/objectorientation/employee/EmployeeDepositTest.java

@@ -49,7 +49,7 @@ public class EmployeeDepositTest {
         // when
         employeeAsTransactable.deposit(amountToDeposit);
         Double actualEmployeeBalance = employeeAsTransactable.getBalance();
-        Double actualBankAccountBalance = bankAccount.getBalance();
+        Double actualBankAccountBalance = ((Transactable)bankAccount).getBalance();
 
 
         // then

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

@@ -10,17 +10,62 @@ import rocks.zipcode.quiz3a.objectorientation.Spice;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Supplier;
 
 public class GetAllSpicesTest {
     @Test
     public void test1() {
         // given
-        Food food = new Food();
-        List<Spice> expected = Arrays.asList(
+        test(() -> Arrays.asList(
+                (Spice) new Pepper(),
+                (Spice) new Ginger(),
+                (Spice) new Curry()));
+    }
+
+    @Test
+    public void test2() {
+        // given
+        test(() -> Arrays.asList(
+                (Spice) new Pepper(),
+                (Spice) new Pepper(),
+                (Spice) new Ginger(),
+                (Spice) new Curry()));
+    }
+
+
+    @Test
+    public void test3() {
+        // given
+        test(() -> Arrays.asList(
+                (Spice) new Pepper(),
                 (Spice) new Pepper(),
                 (Spice) new Ginger(),
-                (Spice) new Curry());
+                (Spice) new Ginger(),
+                (Spice) new Curry()));
+    }
+
+
+    @Test
+    public void test4() {
+        // given
+        test(() -> Arrays.asList((Spice) new Curry()));
+    }
+
+    @Test
+    public void test5() {
+        // given
+        test(() -> Arrays.asList((Spice) new Ginger()));
+    }
+
+    @Test
+    public void test6() {
+        // given
+        test(() -> Arrays.asList((Spice) new Pepper()));
+    }
 
+    private void test(Supplier<List<Spice>> listSupplier) {
+        List<Spice> expected = listSupplier.get();
+        Food food = new Food();
         for (Spice spice : expected) {
             food.applySpice(spice);
         }

src/test/java/rocks/zipcode/quiz3a/objectorientation/spice/SpicePolymorphismTest.java

@@ -2,6 +2,7 @@ package rocks.zipcode.quiz3a.objectorientation.spice;
 
 import org.junit.Assert;
 import org.junit.Test;
+import rocks.zipcode.quiz3a.objectorientation.Curry;
 import rocks.zipcode.quiz3a.objectorientation.Ginger;
 import rocks.zipcode.quiz3a.objectorientation.Pepper;
 import rocks.zipcode.quiz3a.objectorientation.Spice;
@@ -19,4 +20,9 @@ public class SpicePolymorphismTest {
     public void testGingerIsSpice() {
         Assert.assertTrue(new Ginger() instanceof Spice);
     }
+
+    @Test
+    public void testCurryIsSpice() {
+        Assert.assertTrue(new Curry() instanceof Spice);
+    }
 }