this is my final verison for the day

Author: donald f

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

@@ -5,8 +5,8 @@
 
 public class ATM {
 
-    public void startATM(int userInput){
-        userInput = PromptUser.userStartATM();
+    public void startATM(){
+        int userInput = PromptUser.userStartATM();
         boolean terminator = true;
         while(terminator == true){
             if("1".equals(userInput)){

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

@@ -1,15 +1,21 @@
 package foutain.donald.atmproject.bettercopy;
 
 import foutain.donald.atmproject.bettercopy.ATMFunctions.ATM;
+import foutain.donald.atmproject.bettercopy.UserFunctions.User;
+import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory;
+import foutain.donald.atmproject.bettercopy.UserFunctions.UserWarehouse;
 
 /**
  * Created by iyasuwatts on 10/17/17.
  */
 public class Main {
 
     public static void main(String[] args){
-        //ATM newATM = new ATM();
-        //newATM.startATM();
+        ATM newATM = new ATM();
+        newATM.startATM();
 
+        UserWarehouse warehouse = new UserWarehouse();
+        User Logan = UserFactory.createNewUser("Logan", "Password");
+        warehouse.addUserToList(Logan);
     }
 }

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

@@ -6,21 +6,20 @@
 
 public class AccountTests {
 
+    Account newAccount = new Account();
+
     @Test
     public void getTypeOfAccountTest(){
-        Account newAccount = new Account();
         String expected = "Checking";
 
-        String typeOfAccount = "Checking";
-        newAccount.setTypeOfAccount(typeOfAccount);
+        newAccount.setTypeOfAccount(expected);
         String actual = newAccount.getTypeOfAccount();
 
         Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void getAccountNumber(){
-        Account newAccount = new Account();
         int expected = 10000;
 
         int accountNumber = 10000;
@@ -32,7 +31,6 @@ public void getAccountNumber(){
 
     @Test
     public void getAccountBalance(){
-        Account newAccount = new Account();
         double expected = 100.55;
 
         double accountBalance = 100.55;
@@ -44,7 +42,6 @@ public void getAccountBalance(){
 
     @Test
     public void withDrawMoneyTest(){
-        Account newAccount = new Account();
         String expected = "Your new account balance is: 200.0";
 
         double accountBalance = 260;
@@ -57,7 +54,6 @@ public void withDrawMoneyTest(){
 
     @Test
     public void depositMoneyTest(){
-        Account newAccount = new Account();
         String expected = "Your new account balance is: 260.0";
 
         double accountBalance = 200;

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

@@ -1,13 +1,43 @@
 package foutain.donald.atmproject.bettercopy.Tests;
 
+import foutain.donald.atmproject.bettercopy.UserFunctions.User;
 import foutain.donald.atmproject.bettercopy.UserFunctions.UserFactory;
+import org.junit.Assert;
 import org.junit.Test;
 
 public class UserFactoryTests {
 
-    @Test
+    /*@Test
     public void createNewUserTest(){
+        //Given:
         UserFactory newUser = new UserFactory();
+        String expected = "Donald Fountain" + "Password";
+
+        //When;
+        String password = "Password";
+        String userName = "Donald Fountain";
+        User expectedInput = newUser.createNewUser(userName, password);
+        String outPut = expectedInput.getUserName() + expectedInput.getUserPassword();
+
+        //Then:
+        Assert.assertEquals(expected, outPut);
+    }
+*/
+    @Test
+    public void createNewUserTestLeon(){
+        //Given:
+        UserFactory userCreator = new UserFactory();
+        String expectedUsername = "Donald Fountain";
+        String expectedPassword = "Password";
+
+        // : When
+        User expectedUser = userCreator.createNewUser(expectedUsername, expectedPassword);
+        String actualUsername = expectedUser.getUserName();
+        String actualPassword = expectedUser.getUserPassword();
+
 
+        // : Then
+        Assert.assertEquals(expectedPassword, actualPassword);
+        Assert.assertEquals(expectedUsername, actualUsername);
     }
 }

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

@@ -5,10 +5,10 @@
 import org.junit.Test;
 
 public class UserTests {
+    User newUser = new User();
 
     @Test
     public void randomAccountGeneratorTest(){
-        User newUser = new  User();
         int expected = 0;
 
         int actual = newUser.randomAccountGenerator();
@@ -19,7 +19,6 @@ public void randomAccountGeneratorTest(){
     @Test
     public void getAccountNumberTest(){
         int expected = 0;
-        User newUser = new User();
 
         int newAccountNUmber = 10000;
         newUser.setAccountNumber(newAccountNUmber);
@@ -30,23 +29,19 @@ public void getAccountNumberTest(){
 
     @Test
     public void getUserName(){
-        User newUser = new User();
         String expected = "Donald Fountain";
 
-        String userName = "Donald Fountain";
-        newUser.setUserName(userName);
+        newUser.setUserName(expected);
         String actual = newUser.getUserName();
 
         Assert.assertEquals(expected, actual);
     }
 
     @Test
     public void getUserPassword(){
-        User newUser = new User();
         String expected = "Password";
 
-        String password = "Password";
-        newUser.setUserPassword(password);
+        newUser.setUserPassword(expected);
         String actual = newUser.getUserPassword();
 
         Assert.assertEquals(expected, actual);

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

@@ -1,7 +1,15 @@
 package foutain.donald.atmproject.bettercopy.Tests;
 
+import foutain.donald.atmproject.bettercopy.UserFunctions.User;
+import foutain.donald.atmproject.bettercopy.UserFunctions.UserWarehouse;
+import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.ArrayList;
+
 public class UserWarehouseTests {
 
+    @Test
+    public void addUserToListTest(){
+    }
 }

src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/User.java

@@ -10,14 +10,16 @@ public class User {
 
     private String userName;
 
-
+        //Random account number generator
 
     public int randomAccountGenerator() {
         Random rnd = new Random();
         int accountNumber = 100000 + rnd.nextInt(900000);
         return accountNumber;
     }
 
+        //Getters and Setters
+
     public int getAccountNumber() {
         return accountNumber;
     }
@@ -36,7 +38,6 @@ public void setAccountNumber(int accountNumber) {
         this.accountNumber = accountNumber;
     }
 
-    public void setUserPassword(String userPassword) {
-        this.userPassword = userPassword;
+    public void setUserPassword(String userPassword) { this.userPassword = userPassword;
     }
 }

src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserFactory.java

@@ -1,25 +1,26 @@
 package foutain.donald.atmproject.bettercopy.UserFunctions;
-import foutain.donald.atmproject.bettercopy.ATMFunctions.PromptUser;
 
 import java.util.ArrayList;
 
 
 public class UserFactory {
 
-  /*  private ArrayList<String> userNames(ArrayList userName){
 
 
-
-        return users;
+    public static User createNewUser(String userName, String userPassword){
+        User newUser = new User();
+        newUser.setUserName(userName);
+        newUser.setUserPassword(userPassword);
+        return newUser;
     }
 
+    private static ArrayList<User> users;
 
-    public static String createNewUser(){
-        User newUser = new User();
-        newUser.setUserInfo(PromptUser.getUserName(), PromptUser.getUserPassWord());
-        String userInfo =
-        return
+    public void addUserToList(User user){
+        this.users.add(user);
     }
 
-*/
-}
+    public UserFactory(){
+        users = new ArrayList<>();
+        }
+    }

src/main/java/foutain/donald/atmproject/bettercopy/UserFunctions/UserWarehouse.java

@@ -1,11 +1,27 @@
 package foutain.donald.atmproject.bettercopy.UserFunctions;
 
+import java.util.ArrayList;
+
 public class UserWarehouse {
 
-    public void UserWarehouse(){
+    private static ArrayList<User> usersList;
+
+    public void addUserToList(User user){
+        this.usersList.add(user);
+    }
 
+    public UserWarehouse(){
+        usersList = new ArrayList<>();
     }
 
     public static void userLogin() {
     }
-}
+
+    public User getUserFromList(String user) {
+        for (User userLookingFor : usersList) {
+            if (userLookingFor.getUserName().equals(user))
+                return userLookingFor;
+            }
+        return null;
+        }
+    }