it's not going to be pretty but I've refactored and refactored and now have some test

Author: donald f

src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/ATM.java

@@ -1,13 +1,22 @@
 package foutain.donald.atmproject.bettercopy.ATMFunctions;
 
+import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory;
+import foutain.donald.atmproject.bettercopy.UserFunctions.UserWarehouse;
+
 public class ATM {
 
-    public int startATM(){
-        int userInput = PromptUser.userStartATM();
-        return userInput;
+    public void startATM(int userInput){
+        userInput = PromptUser.userStartATM();
+        boolean terminator = true;
+        while(terminator == true){
+            if("1".equals(userInput)){
+               // UserFactory.createNewUser();
+            } else if("2".equals(userInput)){
+                UserWarehouse.userLogin();
+            } else {
+                PromptUser.correctResponse();
+            }
+        }
     }
 
-    public static void userOption(){
-        System.out.println("User Options are: ");
-    }
 }

src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/Main.java

@@ -18,4 +18,15 @@ public static String getUserPassWord(){
         String userInfo = Console.getStringInput("Please enter your password.");
         return userInfo;
     }
+
+    public static int getUserAccountType(){
+        int userInfo = Console.getIntInput("Account type options\n"+
+                        "1: Checking\n2: Savings\n 3: Investments");
+        return userInfo;
+    }
+
+    public static int correctResponse(){
+        int userInfo = Console.getIntInput("Please reread the above directions and answer appropriately.");
+        return userInfo;
+    }
 }

src/main/java/foutain/donald/atmproject/bettercopy/ATMFunctions/PromptUser.java

@@ -12,28 +12,65 @@ public class Account {
 
     private ArrayList<String> transactionHistory;
 
-    public double getAccountBalance(){
+    //Getter and Setter for TypeOfAccount
 
-        return this.accountBalance;
+    public String getTypeOfAccount() {
+        return typeOfAccount;
     }
 
-    public double withdrawMoney(int withdrawAmount){
+    public void setTypeOfAccount(String typeOfAccount) {
+        this.typeOfAccount = typeOfAccount;
+    }
 
-        this.accountBalance -= withdrawAmount;
+    //Getter and Setter for AccountNumber
+
+    public int getAccountNumber() {
+        return accountNumber;
+    }
+
+    public void setAccountNumber(int accountNumber) {
+        this.accountNumber = accountNumber;
+    }
+
+    //Getter and Setter for AccountBalance
 
+    public double getAccountBalance() {
         return accountBalance;
     }
 
+    public void setAccountBalance(double accountBalance) {
+        this.accountBalance = accountBalance;
+    }
+
+    //Getter and Setter for TransactionHistory
+
+    public ArrayList<String> getTransactionHistory() {
+        return transactionHistory;
+    }
+
+    public void setTransactionHistory(ArrayList<String> transactionHistory) {
+        this.transactionHistory = transactionHistory;
+    }
+
+    //Methods for Accounts
+
+    public String withdrawMoney(double withdrawAmount){
+
+        this.accountBalance -= withdrawAmount;
+
+        return "Your new account balance is: " + accountBalance;
+    }
+
     public String closeAccount(){
 
         return "Your account has been closed";
     }
 
-    public double depositMoney(int depositAmount){
+    public String depositMoney(double depositAmount){
 
         this.accountBalance += depositAmount;
 
-        return accountBalance;
+        return "Your new account balance is: " + accountBalance;
     }
 
     public ArrayList<String > printTransactionHistory(ArrayList<String> transactionHistory){
@@ -43,6 +80,6 @@ public ArrayList<String > printTransactionHistory(ArrayList<String> transactionH
 
     public String openAccountType(){
 
-        return typeOfAccount;
+        return "You have just opened a " + typeOfAccount;
     }
 }

src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Account.java

@@ -0,0 +1,4 @@
+package foutain.donald.atmproject.bettercopy.AccountFunctions;
+
+public class Checking {
+}

src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Checking.java

@@ -0,0 +1,4 @@
+package foutain.donald.atmproject.bettercopy.AccountFunctions;
+
+public class Investments {
+}

src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Investments.java

@@ -0,0 +1,4 @@
+package foutain.donald.atmproject.bettercopy.AccountFunctions;
+
+public class Saving {
+}

src/main/java/foutain/donald/atmproject/bettercopy/AccountFunctions/Saving.java

@@ -0,0 +1,15 @@
+package foutain.donald.atmproject.bettercopy;
+
+import foutain.donald.atmproject.bettercopy.ATMFunctions.ATM;
+
+/**
+ * Created by iyasuwatts on 10/17/17.
+ */
+public class Main {
+
+    public static void main(String[] args){
+        //ATM newATM = new ATM();
+        //newATM.startATM();
+
+    }
+}

src/main/java/foutain/donald/atmproject/bettercopy/Main.java

@@ -0,0 +1,70 @@
+package foutain.donald.atmproject.bettercopy.Tests;
+
+import foutain.donald.atmproject.bettercopy.AccountFunctions.Account;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class AccountTests {
+
+    @Test
+    public void getTypeOfAccountTest(){
+        Account newAccount = new Account();
+        String expected = "Checking";
+
+        String typeOfAccount = "Checking";
+        newAccount.setTypeOfAccount(typeOfAccount);
+        String actual = newAccount.getTypeOfAccount();
+
+        Assert.assertEquals(expected, actual);
+    }
+
+    @Test
+    public void getAccountNumber(){
+        Account newAccount = new Account();
+        int expected = 10000;
+
+        int accountNumber = 10000;
+        newAccount.setAccountNumber(accountNumber);
+        int actual = newAccount.getAccountNumber();
+
+        Assert.assertEquals(expected, accountNumber);
+    }
+
+    @Test
+    public void getAccountBalance(){
+        Account newAccount = new Account();
+        double expected = 100.55;
+
+        double accountBalance = 100.55;
+        newAccount.setAccountBalance(accountBalance);
+        double actual = newAccount.getAccountBalance();
+
+        Assert.assertEquals(expected, actual, 0);
+    }
+
+    @Test
+    public void withDrawMoneyTest(){
+        Account newAccount = new Account();
+        String expected = "Your new account balance is: 200.0";
+
+        double accountBalance = 260;
+        double withDrawAmount = 60;
+        newAccount.setAccountBalance(accountBalance);
+        String actual = newAccount.withdrawMoney(withDrawAmount);
+
+        Assert.assertEquals(expected,actual);
+    }
+
+    @Test
+    public void depositMoneyTest(){
+        Account newAccount = new Account();
+        String expected = "Your new account balance is: 260.0";
+
+        double accountBalance = 200;
+        double depositAmount = 60;
+        newAccount.setAccountBalance(accountBalance);
+        String actual = newAccount.depositMoney(depositAmount);
+
+        Assert.assertEquals(expected,actual);
+    }
+}

src/main/java/foutain/donald/atmproject/bettercopy/Tests/AccountTests.java

@@ -0,0 +1,4 @@
+package foutain.donald.atmproject.bettercopy.Tests;
+
+public class CheckingTest {
+}