Monali2

src/main/java/BankAccount.java

@@ -1,14 +1,13 @@
 import java.text.NumberFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Map;
 
 
 
 public class BankAccount {
 
 
-    private String accountType;
+    public String accountType;
     private double currentBalance;
     NumberFormat formatter = NumberFormat.getCurrencyInstance();
 
@@ -22,13 +21,20 @@ public BankAccount(String chosenAccountType) {
     void setType(String accType) {
         accountType = accType;
     }
+
     void setBalance(Double accBal) {
         currentBalance = accBal;
     }
     public String getAccountType() {
         return this.accountType;
     }
 
+    public String getAccountType() { return accountType; }
+
+    Double getBalance() {
+        return currentBalance;
+    }
+
     void deposit(Double dep) {
         currentBalance = currentBalance +  dep;
     }
@@ -37,22 +43,18 @@ void withdraw(Double wit) {
         currentBalance = currentBalance - wit;
     }
 
-    Double getBalance() {
-        return currentBalance;
-    }
-
     void printTxn(String txnType, Double amt, Double balance){
 
-        System.out.println("");
+
         System.out.println("|----------------------------------------|");
         System.out.println("| BANK OF ZIP CODE WILMINGTON DE         |");
         System.out.println("|----------------------------------------|");
         System.out.println("|" +    dateTime()  + "                     "+"|");
         System.out.println("|----------------------------------------|");
-        System.out.println("|        Transaction Receipt            |");
-        System.out.println("|" +            txnType + "                         " +"|");
-        System.out.println("|" +  amt + "" + "                                    "+ "|");
-        System.out.println("| Remaining Balance: " + balance + "                "   +   "|");
+        System.out.println("|        Transaction Receipt             |");
+        System.out.println("|" +            txnType + "                           " +"|");
+        System.out.println("|" +  amt + "" + "                                   "+ "|");
+        System.out.println("| Remaining Balance: " + balance + "                 "   +   "|");
         System.out.println("|----------------------------------------|");
 
     }

src/main/test/BankAccountTest.java

@@ -1,8 +1,5 @@
+import org.junit.Test;
 import org.testng.Assert;
-import org.testng.annotations.Test;
-
-import java.util.Scanner;
-
 
 // Test the expected Account class from ATM.
 public class BankAccountTest {
@@ -16,150 +13,124 @@ public void constructorCActTypeTest1() { // tests creation of checking account -
         String returnedCAcctType = testAccount.checking.type;
         Assert.assertEquals(givenCAcctType, returnedCAcctType);
 
-    }
 
     @Test
-    public void constructorCActBalTest2() { // tests creation of checking account - balance equals zero @ creation
-        // Arrange
-        Account testAccount = new Account();
-        System.out.println(testAccount.checking.balance);
-        double givenCAcctBal = 0.00;
-        double returnedCAcctBal = testAccount.checking.balance;
-        Assert.assertEquals(givenCAcctBal, returnedCAcctBal);
+    public void constructorInitialBalanceTest1() { // tests account balance 0.0 upon creation of BankAccount
+        //Arrange
+        String givenAccountType = "Checking";
+        Double givenCurrentBalance = 0.0;
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        Double returnedBalance = testBankAccount.getBalance();
+        //Assert
+        Assert.assertEquals(givenCurrentBalance, returnedBalance);
     }
 
     @Test
-    public void constructorTestSActType3() { // tests creation of savings account - type field
-        // Arrange
-        Account testAccount = new Account();
-        System.out.println(testAccount.savings.type);
-        String givenSAcctType = "Savings";
-        String returnedSAcctType = testAccount.savings.type;
-        Assert.assertEquals(givenSAcctType, returnedSAcctType);
+    public void constructorAcctTypeArgTest2() { // tests creation of BankAccount sets account type
+        //Arrange
+        String givenAccountType = "Checking";
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        String returnedAccountType = testBankAccount.accountType;
+        //Assert
+        Assert.assertEquals(givenAccountType, returnedAccountType);
 
     }
 
     @Test
-    public void constructorTestSActBal4() { // tests creation of savings account - balance equals zero @ creation
-        // Arrange
-        Account testAccount = new Account();
-        System.out.println(testAccount.savings.balance);
-        double givenSAcctBal = 0.00;
-        double returnedSAcctBal = testAccount.savings.balance;
-        Assert.assertEquals(givenSAcctBal, returnedSAcctBal);
-
+    public void setTypeTest() { // tests method to reset account type
+        //Arrange
+        String givenAccountType = "Checking";
+        Double givenCurrentBalance = 0.0;
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        testBankAccount.setType("Savings");
+        String returnedAccountType = testBankAccount.getAccountType();
+        //Assert
+        Assert.assertEquals(givenAccountType, returnedAccountType);
     }
 
     @Test
-    public void constructorTestTxHxType5() { // tests creation of transactionHistory - type
-        // Arrange
-        Account testAccount = new Account();
-        System.out.println(testAccount.TxnHistory.type);
-        String givenTxHxType = "Transaction";
-        String returnedTxHxType = testAccount.TxnHistory.type;
-        Assert.assertEquals(givenTxHxType, returnedTxHxType);
-
+    public void getAccountTypeTest() { // tests method for return account type
+        //Arrange
+        String givenAccountType = "Checking";
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        String returnedAccountType = testBankAccount.getAccountType();
+        //Assert
+        Assert.assertEquals(givenAccountType, returnedAccountType);
     }
 
     @Test
-    public void depositMoneyTest1() {
-        // Arrange
-        Scanner sc = new Scanner(System.in);
-        Integer depAccount = sc.nextInt(1);
-        Account testAccount = new Account();
-        testAccount.depositMoney();
-
+    public void setBalanceTest() { // tests method to reset account balance
+        //Arrange
+        String givenAccountType = "Investment";
+        Double givenCurrentBalance = 0.0;
+        Double expectedAccountBal = 100.0;
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        testBankAccount.setBalance(100.0);
+        Double returnedAccountBal = testBankAccount.getBalance();
+        //Assert
+        Assert.assertEquals(expectedAccountBal, returnedAccountBal);
     }
 
     @Test
-    public void withdrawMoneyTest1() {
-
+    public void getBalanceTest() { // tests method to reset account balance
+        //Arrange
+        String givenAccountType = "Investment";
+        Double givenCurrentBalance = 0.0;
+        Double expectedAccountBal = 100.0;
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        testBankAccount.setBalance(100.0);
+        Double returnedAccountBal = testBankAccount.getBalance();
+        //Assert
+        Assert.assertEquals(expectedAccountBal, returnedAccountBal);
     }
 
     @Test
-    public void transferMoneyTest1() {
-
+    public void depositTest() {
+        //Arrange
+        String givenAccountType = "Investment";
+        Double expectedAccountBal = 200.0;
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        testBankAccount.setBalance(100.00);
+        testBankAccount.deposit(100.0);
+        Double returnedAccountBalance = testBankAccount.getBalance();
+        //Assert
+        Assert.assertEquals(expectedAccountBal, returnedAccountBalance);
     }
 
     @Test
-    public void checkBalance1() {
-
+    public void withdrawTest() {
+        //Arrange
+        String givenAccountType = "Investment";
+        Double expectedAccountBal = 0.0;
+        //Act
+        BankAccount testBankAccount = new BankAccount(givenAccountType);
+        testBankAccount.setBalance(100.00);
+        testBankAccount.withdraw(100.0);
+        Double returnedAccountBalance = testBankAccount.getBalance();
+        //Assert
+        Assert.assertEquals(expectedAccountBal, returnedAccountBalance);
     }
 
- */
-
-
-
-
-//    @Test
-//    public void testA0() {
-//        Account a = new Account(0.0);
-//        assertEquals(0.0, a.balance(), 0.0001);
-//    }
-//
-//    @Test
-//    public void testA00() {
-//        Account a = new Account(10.0);
-//        assertEquals(10.0, a.balance(), 0.0001);
-//    }
-//
-//    @Test
-//    public void testA01() {
-//        Account a = new Account(0.0);
-//        assertEquals(true, a.closeAccount());
-//    }
-//
-//    @Test
-//    public void testA02() {
-//        Account a = new Account(10.0);
-//        assertEquals(false, a.closeAccount());
-//    }
-//
-//    @Test
-//    public void testA1() {
-//        Account a = new Account(0.0);
-//        a.deposit(100.0);
-//        assertEquals(100.0, a.balance(), 0.0001);
-//    }
-//
-//    @Test
-//    public void testA2() {
-//        Account a = new Account(10.0);
-//        a.deposit(100.0);
-//        assertEquals(110.0, a.balance(), 0.0001);
-//    }
-//
-//    @Test
-//    public void testA3() {
-//        Account a = new Account(200.0);
-//        Double actual = a.withdraw(100.0);
-//        assertEquals(100.0, actual, 0.0001);
-//    }
-//
-//    @Test
-//    public void testA4() {
-//        Account a = new Account(0.0);
-//        Double actual = a.withdraw(1.0);
-//        assertEquals(0.0, actual, 0.0001);
-//    }
-//
-//    @Test
-//    public void testA5() {
-//        Account a = new Account(10.0);
-//        Account b = new Account(0.0);
-//        a.transfer(b, 10.0);
-//        assertEquals(0.0, a.balance(), 0.0001);
-//        assertEquals(10.0, b.balance(), 0.0001);
-//    }
-//
-//    @Test
-//    public void testA6() {
-//        Account a = new Account(10.0);
-//        Account b = new Account(0.0);
-//        a.transfer(b, 100.0); // nothing should happen
-//        assertEquals(10.0, a.balance(), 0.0001);
-//        assertEquals(0.0, b.balance(), 0.0001);
-//    }
-
+    @Test
+    public void dateTimeTest() {  // tests return of date and time method
+        //Arrange
+        String givenAccountType = "Checking";
+        //Act
+        BankAccount testBankAccount1 = new BankAccount(givenAccountType);
+        BankAccount testBankAccount2 = new BankAccount(givenAccountType);
+        System.out.println(testBankAccount1.dateTime());
+        System.out.println(testBankAccount2.dateTime());
+        String expectedDateTime = testBankAccount1.dateTime();
+        String returnedDateTime = testBankAccount2.dateTime();
+        //Assert
+        Assert.assertEquals(expectedDateTime, returnedDateTime);
+}
 
 }

src/main/test/UserAccountTest.java

@@ -1,7 +1,5 @@
 
 // Test the expected User class from ATM.
-import org.testng.Assert;
-import org.testng.annotations.Test;
 
 public class UserAccountTest {