test3CheckbookValue

Checkbook/src/main/java/Checkbook.java

@@ -6,16 +6,16 @@ import java.util.function.Predicate;
 
 public class Checkbook {
     private ArrayList<Transaction> transactionList;
-    private double cashAmount;
+    private GenericAccount account;
     private Payee owner;
 
     Checkbook(double cashAmount){
-        this.cashAmount = cashAmount;
         this.transactionList = new ArrayList<>();
+        this.account = new GenericAccount();
     }
     Checkbook(Payee owner, double cashAmount){
         this.owner = owner;
-        this.cashAmount = cashAmount;
+        this.account = new GenericAccount(cashAmount);
         this.transactionList = new ArrayList<>();
     }
 
@@ -34,6 +34,7 @@ public class Checkbook {
     public boolean add(Transaction element){
         if (element instanceof Transaction){
             transactionList.add(element);
+            account.setBalance(element.getAmount());
             return true;
         }
         return false;
@@ -41,6 +42,7 @@ public class Checkbook {
 
     public boolean remove(Transaction element){
         if (element instanceof Transaction && transactionList.contains(element)){
+            account.setBalance(element.getAmount() * -1);
             transactionList.remove(element);
             return true;
         }
@@ -60,7 +62,7 @@ public class Checkbook {
     }
 
     public double checkbookValue(){ // sum of all Transactions (both Debits and Credits)
-        return cashAmount;
+        return account.getBalance();
     }
 
     public Transaction[] getTransactionsForDate(LocalDate aDate){

Checkbook/src/test/java/CheckbookTest.java

@@ -9,6 +9,7 @@ import static org.junit.Assert.*;
 
 public class CheckbookTest {
     Checkbook checkbook;
+    Checkbook checkbookNoOwner;
     Transaction debit;
     Transaction credit;
     Payee payeeDebit;
@@ -26,6 +27,8 @@ public class CheckbookTest {
         this.debit = new Transaction("This is a Debit", payeeDebit, TransactionType.DEBIT, 100.50);
         this.credit = new Transaction("This is a Credit", payeeCredit, TransactionType.CREDIT, 100.50);
         this.checkbook = new Checkbook(owner, 1000.00);
+
+        this.checkbookNoOwner = new Checkbook(100.50);
     }
 
     @Test
@@ -48,12 +51,14 @@ public class CheckbookTest {
     @Test
     public void test3Size(){
         checkbook.add(debit);
+        checkbook.add(debit);
+        checkbook.add(debit);
         checkbook.remove(debit);
-        int expected = 0;
+        int expected = 2;
         int actual = checkbook.size();
         Assert.assertEquals(expected, actual);
     }
-//
+
     @Test
     public void test1IsEmpty(){
         checkbook.add(debit);
@@ -199,14 +204,35 @@ public class CheckbookTest {
 
     @Test
     public void test3ToArray(){
+        Transaction[] expected = new Transaction[1];
+        expected[0] = debit;
+        Transaction[] actual = checkbook.toArray(expected);
+        Assert.assertEquals(expected[0], actual[0]);
+    }
+
+    @Test
+    public void test1CheckbookValue(){
         checkbook.add(debit);
+        double expected = 100.50;
+        double actual = checkbook.checkbookValue();
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void test2CheckbookValue(){
         checkbook.add(credit);
-        String expected = payeeCredit.getGivenName();
-        Transaction[] ret = checkbook.toArray();
-        String actual = ret[1].getPayee().getGivenName();
+        double expected = -100.50;
+        double actual = checkbook.checkbookValue();
         Assert.assertEquals(expected, actual);
     }
 
+    @Test
+    public void test3CheckbookValue(){
+        checkbook.add(credit);
+        double expected = -100.50;
+        double actual = checkbook.checkbookValue();
+        Assert.assertEquals(expected, actual);
+    }