From f50c7bca4212fd41705d8662275089a6248693d7 Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Tue, 17 Jan 2017 13:25:52 -0500 Subject: [PATCH 1/7] Started project --- .idea/.name | 1 + .idea/compiler.xml | 16 +++ .idea/misc.xml | 51 ++++++++ .idea/modules.xml | 8 ++ .idea/vcs.xml | 6 + .idea/workspace.xml | 258 +++++++++++++++++++++++++++++++++++++++++ Access_Control_Lab.iml | 15 +++ pom.xml | 12 ++ 8 files changed, 367 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml create mode 100644 Access_Control_Lab.iml create mode 100644 pom.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..2a1782b --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +AccessControlLab \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..577caa2 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..590a53b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..767d9ff --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..15a0444 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1484677517447 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Access_Control_Lab.iml b/Access_Control_Lab.iml new file mode 100644 index 0000000..73f608b --- /dev/null +++ b/Access_Control_Lab.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..12f0d8c --- /dev/null +++ b/pom.xml @@ -0,0 +1,12 @@ + + + 4.0.0 + + mozeik.gerrod + AccessControlLab + 1.0-SNAPSHOT + + + \ No newline at end of file From 91508f15ff3ebafbad54d2fa11c5e9bfe51acc55 Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Tue, 17 Jan 2017 15:54:52 -0500 Subject: [PATCH 2/7] Added enums --- .idea/libraries/Maven__junit_junit_4_12.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 + .idea/workspace.xml | 546 +++++++++++++++++- Access_Control_Lab.iml | 2 + pom.xml | 9 +- src/main/java/Access_Control_Lab.java | 6 + src/main/java/AccountStatus.java | 6 + src/main/java/Bank.java | 6 + src/main/java/BankAccount.java | 6 + src/main/java/CheckingAccount.java | 5 + src/main/java/InvestmentAccount.java | 5 + src/main/java/ODPStatus.java | 6 + src/main/java/SavingsAccount.java | 5 + 13 files changed, 617 insertions(+), 11 deletions(-) create mode 100644 .idea/libraries/Maven__junit_junit_4_12.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 src/main/java/Access_Control_Lab.java create mode 100644 src/main/java/AccountStatus.java create mode 100644 src/main/java/Bank.java create mode 100644 src/main/java/BankAccount.java create mode 100644 src/main/java/CheckingAccount.java create mode 100644 src/main/java/InvestmentAccount.java create mode 100644 src/main/java/ODPStatus.java create mode 100644 src/main/java/SavingsAccount.java diff --git a/.idea/libraries/Maven__junit_junit_4_12.xml b/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 15a0444..b63ba86 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,19 @@ - + + + + + + + + + + + + + @@ -22,8 +34,78 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31,6 +113,14 @@ + + + @@ -39,6 +129,21 @@ + + + @@ -75,6 +180,16 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -94,6 +267,9 @@ + + + @@ -103,6 +279,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -147,6 +532,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -183,6 +629,22 @@ + + + + + + + + + + + + + + + + - - + @@ -219,8 +681,9 @@ - + + @@ -231,7 +694,6 @@ - @@ -246,10 +708,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/Access_Control_Lab.iml b/Access_Control_Lab.iml index 73f608b..03320bd 100644 --- a/Access_Control_Lab.iml +++ b/Access_Control_Lab.iml @@ -11,5 +11,7 @@ + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 12f0d8c..088189b 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - + + + + junit + junit + 4.12 + + mozeik.gerrod AccessControlLab 1.0-SNAPSHOT diff --git a/src/main/java/Access_Control_Lab.java b/src/main/java/Access_Control_Lab.java new file mode 100644 index 0000000..f19de4b --- /dev/null +++ b/src/main/java/Access_Control_Lab.java @@ -0,0 +1,6 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class Access_Control_Lab { + +} \ No newline at end of file diff --git a/src/main/java/AccountStatus.java b/src/main/java/AccountStatus.java new file mode 100644 index 0000000..9906813 --- /dev/null +++ b/src/main/java/AccountStatus.java @@ -0,0 +1,6 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public enum AccountStatus { + OPEN, CLOSED, FROZEN +} diff --git a/src/main/java/Bank.java b/src/main/java/Bank.java new file mode 100644 index 0000000..3bb8200 --- /dev/null +++ b/src/main/java/Bank.java @@ -0,0 +1,6 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class Bank { + +} diff --git a/src/main/java/BankAccount.java b/src/main/java/BankAccount.java new file mode 100644 index 0000000..a24bba1 --- /dev/null +++ b/src/main/java/BankAccount.java @@ -0,0 +1,6 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class BankAccount { + +} diff --git a/src/main/java/CheckingAccount.java b/src/main/java/CheckingAccount.java new file mode 100644 index 0000000..ed03eb1 --- /dev/null +++ b/src/main/java/CheckingAccount.java @@ -0,0 +1,5 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class CheckingAccount extends BankAccount { +} diff --git a/src/main/java/InvestmentAccount.java b/src/main/java/InvestmentAccount.java new file mode 100644 index 0000000..dcd2d80 --- /dev/null +++ b/src/main/java/InvestmentAccount.java @@ -0,0 +1,5 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class InvestmentAccount extends BankAccount { +} diff --git a/src/main/java/ODPStatus.java b/src/main/java/ODPStatus.java new file mode 100644 index 0000000..1f29fae --- /dev/null +++ b/src/main/java/ODPStatus.java @@ -0,0 +1,6 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public enum ODPStatus { + ON, OFF, AUTOTRANSFER +} diff --git a/src/main/java/SavingsAccount.java b/src/main/java/SavingsAccount.java new file mode 100644 index 0000000..b984103 --- /dev/null +++ b/src/main/java/SavingsAccount.java @@ -0,0 +1,5 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class SavingsAccount extends BankAccount { +} From de99b3d8a0af51408f3b4cd5f9782f1452da31c6 Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Tue, 17 Jan 2017 16:29:44 -0500 Subject: [PATCH 3/7] Began adding methods to BankAccount --- .idea/workspace.xml | 115 ++++++++++++++------------------- src/main/java/AccountType.java | 6 ++ src/main/java/BankAccount.java | 71 ++++++++++++++++++++ 3 files changed, 127 insertions(+), 65 deletions(-) create mode 100644 src/main/java/AccountType.java diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b63ba86..1193638 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,19 +2,9 @@ - - - - - - - - - - + - - + @@ -31,11 +21,11 @@ - + - - + + @@ -51,41 +41,24 @@ - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - + + - - + + @@ -140,6 +113,7 @@ @@ -656,12 +630,12 @@ - @@ -708,7 +682,15 @@ - + + + + + + + + + @@ -716,18 +698,18 @@ - + - - + + - + - - + + @@ -740,23 +722,23 @@ - + - - + + - + - + - + @@ -764,19 +746,22 @@ - + - - + + - + - - - + + + + + + diff --git a/src/main/java/AccountType.java b/src/main/java/AccountType.java new file mode 100644 index 0000000..9cccd5f --- /dev/null +++ b/src/main/java/AccountType.java @@ -0,0 +1,6 @@ +/** + * Created by gerrodmozeik on 1/17/17. + */ +public enum AccountType { + CHECKING, SAVINGS, INVESTMENT +} diff --git a/src/main/java/BankAccount.java b/src/main/java/BankAccount.java index a24bba1..755011b 100644 --- a/src/main/java/BankAccount.java +++ b/src/main/java/BankAccount.java @@ -3,4 +3,75 @@ */ public class BankAccount { + private AccountType accountType; + private double accountNumber; + private double accountBalance; + private String accountHolderName; + private double interestRate; + private boolean overDraftProtection; + private boolean autoTransfer; + private String[] transactionRecord; + private ODPStatus odpStatus; + private AccountStatus accountStatus; + + public BankAccount(double accountNumber, String accountHolderName, AccountType accountType) { + //Constructor that creates new accounts + //If accountNumber is already used, don't open account + } + + public void setAccountType(AccountType accountType) { + this.accountType = accountType; + } + + public void changeAccountHolderName(String accountHolderName) { + if (this.accountStatus == AccountStatus.OPEN) { + this.accountHolderName = accountHolderName; + } else { + System.out.println("You can't change the name on this account."); + } + } + + public boolean setAccountStatus(AccountStatus accountStatus) { + if (accountStatus == AccountStatus.CLOSED && accountBalance != 0.0) { + return false; + } else { + this.accountStatus = accountStatus; + return true; + } + } + + public String getBalance() { + if (accountStatus == AccountStatus.FROZEN) { + return "Your account is frozen."; + } else { + return Double.toString(accountBalance); + } + } + + public boolean creditAccount(double creditAmount) { + if (accountStatus == AccountStatus.OPEN) { + this.accountBalance += creditAmount; + return true; + } else { + return false; + } + } + + public boolean debitAccount(double debitAmount) { + if (accountStatus == AccountStatus.OPEN) { + if (odpStatus == ODPStatus.OFF) { + if (this.accountBalance < debitAmount) { + return false; + } else { + this.accountBalance -= debitAmount; + return true; + } + } else { + this.accountBalance -= debitAmount; + return true; + } + } else { + return false; + } + } } From ae1e8de065a00ed51f5a31cbbfe30e1bf1562ce3 Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Tue, 17 Jan 2017 17:25:04 -0500 Subject: [PATCH 4/7] Added unit tests for accountHolderName changes --- .idea/workspace.xml | 280 +++++++++++++++++----- src/main/java/Bank.java | 4 + src/main/java/BankAccount.java | 29 ++- src/main/java/CheckingAccount.java | 5 - src/main/java/InvestmentAccount.java | 5 - src/main/java/SavingsAccount.java | 4 + src/test/java/BankAccountTest.java | 73 ++++++ target/classes/Access_Control_Lab.class | Bin 0 -> 279 bytes target/classes/AccountStatus.class | Bin 0 -> 944 bytes target/classes/AccountType.class | Bin 0 -> 939 bytes target/classes/Bank.class | Bin 0 -> 429 bytes target/classes/BankAccount.class | Bin 0 -> 2772 bytes target/classes/ODPStatus.class | Bin 0 -> 917 bytes target/classes/SavingsAccount.class | Bin 0 -> 468 bytes target/test-classes/BankAccountTest.class | Bin 0 -> 2041 bytes 15 files changed, 328 insertions(+), 72 deletions(-) delete mode 100644 src/main/java/CheckingAccount.java delete mode 100644 src/main/java/InvestmentAccount.java create mode 100644 src/test/java/BankAccountTest.java create mode 100644 target/classes/Access_Control_Lab.class create mode 100644 target/classes/AccountStatus.class create mode 100644 target/classes/AccountType.class create mode 100644 target/classes/Bank.class create mode 100644 target/classes/BankAccount.class create mode 100644 target/classes/ODPStatus.class create mode 100644 target/classes/SavingsAccount.class create mode 100644 target/test-classes/BankAccountTest.class diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1193638..27abdca 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,13 @@ - + + + + + @@ -25,7 +29,7 @@ - + @@ -34,51 +38,48 @@ - - - + + + + + + - + - + - - + + + + + + - - - - - - - - - - - - + + - + - - + + - - + + @@ -89,8 +90,9 @@ @@ -106,15 +108,16 @@ @@ -191,6 +194,10 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -644,12 +790,13 @@ + - + - + @@ -681,6 +828,10 @@ + + @@ -690,14 +841,6 @@ - - - - - - - - @@ -709,23 +852,23 @@ - + - + - - + + - + - - + + @@ -738,18 +881,29 @@ - + - - + + - + + + + + + + + + + + + - + @@ -757,13 +911,25 @@ - + - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/Bank.java b/src/main/java/Bank.java index 3bb8200..8b5ebfa 100644 --- a/src/main/java/Bank.java +++ b/src/main/java/Bank.java @@ -3,4 +3,8 @@ */ public class Bank { + public static void main(String[] args) { + BankAccount bankAccount = new BankAccount(); + } + } diff --git a/src/main/java/BankAccount.java b/src/main/java/BankAccount.java index 755011b..5e55f87 100644 --- a/src/main/java/BankAccount.java +++ b/src/main/java/BankAccount.java @@ -4,38 +4,48 @@ public class BankAccount { private AccountType accountType; - private double accountNumber; + private String accountNumber; private double accountBalance; private String accountHolderName; private double interestRate; private boolean overDraftProtection; private boolean autoTransfer; - private String[] transactionRecord; + private String transactionRecord; private ODPStatus odpStatus; private AccountStatus accountStatus; - public BankAccount(double accountNumber, String accountHolderName, AccountType accountType) { - //Constructor that creates new accounts - //If accountNumber is already used, don't open account + public BankAccount() { + accountStatus = AccountStatus.OPEN; } public void setAccountType(AccountType accountType) { this.accountType = accountType; + writeToLog("Account Type Changed"); + } + + public AccountType getAccountType() { + return this.accountType; } public void changeAccountHolderName(String accountHolderName) { if (this.accountStatus == AccountStatus.OPEN) { this.accountHolderName = accountHolderName; + writeToLog("Account Holder Name Changed"); } else { System.out.println("You can't change the name on this account."); } } + public String getAccountHolderName() { + return this.accountHolderName; + } + public boolean setAccountStatus(AccountStatus accountStatus) { if (accountStatus == AccountStatus.CLOSED && accountBalance != 0.0) { return false; } else { this.accountStatus = accountStatus; + writeToLog("Account Status Changed to " + this.accountStatus); return true; } } @@ -44,6 +54,7 @@ public String getBalance() { if (accountStatus == AccountStatus.FROZEN) { return "Your account is frozen."; } else { + writeToLog("Balance inquiry."); return Double.toString(accountBalance); } } @@ -51,6 +62,7 @@ public String getBalance() { public boolean creditAccount(double creditAmount) { if (accountStatus == AccountStatus.OPEN) { this.accountBalance += creditAmount; + writeToLog("Your account has been credited by " + creditAmount); return true; } else { return false; @@ -64,14 +76,21 @@ public boolean debitAccount(double debitAmount) { return false; } else { this.accountBalance -= debitAmount; + writeToLog("Your account has been debited by " + debitAmount); return true; } } else { this.accountBalance -= debitAmount; + writeToLog("Your account has been debited by " + debitAmount); return true; } } else { return false; } } + + public String writeToLog(String logItem) { + this.transactionRecord += logItem; + return transactionRecord; + } } diff --git a/src/main/java/CheckingAccount.java b/src/main/java/CheckingAccount.java deleted file mode 100644 index ed03eb1..0000000 --- a/src/main/java/CheckingAccount.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Created by gerrodmozeik on 1/17/17. - */ -public class CheckingAccount extends BankAccount { -} diff --git a/src/main/java/InvestmentAccount.java b/src/main/java/InvestmentAccount.java deleted file mode 100644 index dcd2d80..0000000 --- a/src/main/java/InvestmentAccount.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * Created by gerrodmozeik on 1/17/17. - */ -public class InvestmentAccount extends BankAccount { -} diff --git a/src/main/java/SavingsAccount.java b/src/main/java/SavingsAccount.java index b984103..78b4948 100644 --- a/src/main/java/SavingsAccount.java +++ b/src/main/java/SavingsAccount.java @@ -2,4 +2,8 @@ * Created by gerrodmozeik on 1/17/17. */ public class SavingsAccount extends BankAccount { + + public SavingsAccount(String accountNumber, String accountHolderName, AccountType accountType, double interestRate) { + + } } diff --git a/src/test/java/BankAccountTest.java b/src/test/java/BankAccountTest.java new file mode 100644 index 0000000..aeccffb --- /dev/null +++ b/src/test/java/BankAccountTest.java @@ -0,0 +1,73 @@ +import org.junit.Before; +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Created by gerrodmozeik on 1/17/17. + */ +public class BankAccountTest { + + @Test + public void setAccountTypeTEST() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountType(AccountType.SAVINGS); + AccountType expected = AccountType.SAVINGS, actual = AccountType.SAVINGS; + assertEquals(expected, actual); + } + + @Test + public void changeAccountHolderNameForClosedAccountTest() { + BankAccount bankAccount = new BankAccount(); + bankAccount.changeAccountHolderName("BOB"); + bankAccount.setAccountStatus(AccountStatus.CLOSED); + bankAccount.changeAccountHolderName("STEVE"); + String expected = "BOB", actual = bankAccount.getAccountHolderName(); + assertEquals(expected, actual); + } + + @Test + public void changeAccountHolderNameForFrozenAccountTest() { + BankAccount bankAccount = new BankAccount(); + bankAccount.changeAccountHolderName("BOB"); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + bankAccount.changeAccountHolderName("STEVE"); + String expected = "BOB", actual = bankAccount.getAccountHolderName(); + assertEquals(expected, actual); + } + + @Test + public void changeAccountHolderNameForOpenAccountTest() { + BankAccount bankAccount = new BankAccount(); + bankAccount.changeAccountHolderName("BOB"); + bankAccount.changeAccountHolderName("STEVE"); + String expected = "STEVE", actual = bankAccount.getAccountHolderName(); + assertEquals(expected, actual); + } + + @Test + public void setAccountStatus() { + + } + + @Test + public void getBalance(){ + + } + + @Test + public void creditAccount() { + + } + + @Test + public void debitAccount() { + + } + + @Test + public void writeToLog() { + + } + +} \ No newline at end of file diff --git a/target/classes/Access_Control_Lab.class b/target/classes/Access_Control_Lab.class new file mode 100644 index 0000000000000000000000000000000000000000..3372e5fceeed4ff71b1e9f8465e3c2c0bb8dc210 GIT binary patch literal 279 zcmZWj%W48a5Uk#3vToucft+(oa&Yk+5rW`phzG^1%uI%4WU~YN$bWeXc<=-KD6v;^ z+iobjs;inloexI<6J!Z|+{L($F(gD&TiRwu@Sk5cgkbJI4Phv3X+GK?WvaDQ1uG-r zv@ABVvK{{ygXY`Tga`4iwW;gv+?7q`imj09jgYKdTWPbfUH-9e8Smt;Oc5aD^Zhj; z>kN4z%ddQ?c1AaNg2&HyMckZZjF{zD4ur3Npgjv7V#bJNul?06+mKAZEWl3PSze{Oi zjYiYY{wU+jEwLcpP44X6IdkUB-23bIx1RvY*iS&gwvIdsDzYkyI#Sr-ZC68Dr{FFl z9%@)-yQjfqTT<~zKxw^b91EnIHOCo-eqaT55RNMX@p`jmHJ;JW(aY8w#;9BETJv?o z63Dz=grC}8*c%I&`NCpUsSn@xxQgrdj>AE>H+p4vJvvckTI++rX1;l1pV}qQ_WLC( z7`cAGQdlTsHiwSwwe6A1`BM_bw+F;!E)tOXs_VPKfxyat_@5WrG=bowOS%)5+xMyW z5iv#c9MGzcH%(rjp>Fu$p!$!n0~(la4a1SsJ94=%b8eh_+?j!Ed^=f#uI#Zuat>i2 zhbIQ^;I4r*G6t4;Gm#NUU5$lH3&b36=u?eszAz)J)jjDs0qJ-;+i2ah$K%Qj?C)gf zSu2NSdJ-vmPs(AA6#!&OgtVjs$gFY$j6ed{u>ye`v6#gz0T1pwL;*>d^o6`ZCLv%htmJx!Ei0q+ALW~ckR_s!Wfp&@iN?GEJ zMzd#sl=0j<;tG13+>>+8cfRwT)BEf9x1RvY*iS&hwu(FoGO{v?DweRruU!Rcm6E$0 z@le4sw|fe7Zc8#AF(~z;M*T&z{hT4ys#(@3@chol4|at?Hfmi;7z}E&-EA11myLFZ z!du;1>s5ooORpCy;-{t?*b|0KzOa~+>Z7+dL%QX7b~_mM?QzHKyA+W{(eXQmjeP6G zJT*(M=?zMTKX$x9rLfRKZ;dR|?V4kUSI;OU&m0ny{%<)$yy|$4f55QvANFRU%OLsh z9nzdIoPlTh!I+q$d7e}L+2DHGb{9-m3WHU4X| z8vU=w49QSlLk>?g+`+nrG%^~N`K2R63%*(hZ^{s}+>uB8*?b`+=(vAkTRv%c8XmFk znv+Q-1pB+udDhBdnO?&ZJtgTd#}xo%NrbSZ1IVm$`5b`+u44rZH^|#0%a1w*`+~>? zqMyiPxJh?h8g7d`t%gv%V;NEU0J*rc zc8>UGkq)=JDwlDWOUH)5Y(l|3A(+#=p+WemeTUT3<>)z-GbDtgO2SDBM~ew375_oF n=#-vFPnsfW^kP$_j59DU;BsD-6aq196Ln7Qur*9mTb< literal 0 HcmV?d00001 diff --git a/target/classes/Bank.class b/target/classes/Bank.class new file mode 100644 index 0000000000000000000000000000000000000000..f89fdd616be27bbf7f40f862deb0ccc284d962fd GIT binary patch literal 429 zcmZutO-sW-5Ph4b%|}~Xt42L~s~#+#D?$}K1wB*>;%O5@+?sA6P5fV;3JU%Jf0Xz( zE%xFr%*=Z;^JbXupN}s97dZCO#DRmrhh_YsgCl{~rP8Xr5@-xhX9D(3{+tN(LZy?t zY7r&HgN!mVgD{U}Hj{-icthIdi&|16yq5ZP%(5PN14>=Xj&FZr{h{( z7AfoZ{z(h8BZ^GoIInam(5*E$kkbA%uZlRiRc0B_%sV$DI%vURuOa?=ZG!~*+a2zs zc@md6fz2D3XMt>Hy^n$*5wt{%C(;jWBCT;kPJL>|p837);*db$@Cls>`_X+E9 gg+{m)Fqa0Wxco*WSQny)K9Ng-T?}Y>5@HMczuqrSbN~PV literal 0 HcmV?d00001 diff --git a/target/classes/BankAccount.class b/target/classes/BankAccount.class new file mode 100644 index 0000000000000000000000000000000000000000..8f703fd1f59d7c8f2de3b65baae6958729f76d3f GIT binary patch literal 2772 zcma)8+fv(B6kWmwUl0Zagj|3K(gb4?ASu0)CgBpAi;F3yq|hdfYzw2rNJN&Cklw$d z?M$EPOCC}tkWM?(x4!hFI$cMSW#f1{eegNjNBiu(*4q0V`R{*z{}aGPd>_YYq+|F9 zOEC-~BZlQDK8|x<5k@wO)fhg(S`>HU_!R5HcSF4SEP~JDNFW`>T`}Ji!xv(>FMPBp za#7^tC_s;5Q>+)owyhWpJc#0kkIWf-mppq-CokRxh@-~quYAfS7On`nI#mDe!2!Y?y{~MM5Y!wk9DwZxslqGi{i>DPs*-jHLtK|M508o!KX7hcEm|Se}0SF>VBkp@%oal zYcGQK)`Hf%_cC;oT6NW6R`pQ=puRw3tU#PmgL-!4ZM|Sr=~1xcg7A_3ZG3#BxOwDVg#0q z9ZbrY5QB^^4$<3>z$VYTc@+dCeSk zRIfg&v!$!1@U=`n8)a4V&do#wj*JQ}%XlnMyn(YUYGWbhDuy@}5>8grd(u}ktB$40 zc!H;5*p=}NS7dyNNroa4yP8a8-c8$jrkfM4DDLr74f9dOuy={%E3xxy2_r`~ZE0mS zr|YKbl}|6Ixm`EgH!{xSLImH+_zo8&3^(8A*0s88T!`3SR}TWIvCZTj@L2P(_%y36 z7tSnSUpnHM-7ULy4p|lY_j%1=Sd+`VV;tTzy0*TrXmCEYU<7B}nXTr|>}z)(_3b3aTs!5@ESYPw*6z&H z!Z{8}93qaFXkB4kiL;z~1u3tGz5pc38;H$XiZ+=R#g^1JR`;hmLAnuOD z4?m$b^jrWBrT#!-{S`Wuu0wPSQio6u(Id!&pL3rljz{4$OJW$$OnFR|z~3ey3F zX>pCZ6lMboD~uyFAMj-B-9www_adbn6L|!r-_T!UrVumO4skX^2P@ah+SOWRASlZm z=6#k9B^IqU<;7=NMpNqyJDNXW`&20&C&kf2oCx@Z8W~k51$O literal 0 HcmV?d00001 diff --git a/target/classes/ODPStatus.class b/target/classes/ODPStatus.class new file mode 100644 index 0000000000000000000000000000000000000000..2e57318036ab80c3416b321d1ad0aefa63e9bd82 GIT binary patch literal 917 zcmZuvVQ?fdLTSp!R633r{pe2 zJlC+y?Vbjc+mebG43gDkNH(lDZ|%?tC*ul(Y}M-wM(wO+wN7hIyMBDipl-Emjk9B$ z67Lq!@e9YFxMPM?zOa~4j)osxhIGRV+~#D^bw@3y>r+G(CDuoVjeO(Wxo}Fp6ZA`V zIP!virLaJ6HikXNZ#yH8*Uku(z!?ya`EM~pyy^vBc)+moAMTSvn?VUbd89XCd;Ne$ z9ubqA=LxOa^Jm5D5$fY$GN?vG9ng++dpH^O+`7l-NzJ#n$EPuHhhIb1pu2fVedbvM zIlMCP5E};4$QW4WhlvbP+^&JQV~F+qVL;s3d?6ym>Yls3kov!l4tL}`<8dVdn{RTF zwQ^Xddr#4$Q4Vul0YH{S2unJE%qkbp5lG-JR={wNyiKzF)2CoxAzefMOdi91I^!b8 z@j0x{@cWQNR5z94H^i=?aJ;mDe?SrA28A`Oi#)A{P`qOqGW~#B+*!Lq{EJ9O+ufF{ zc*LdSvA}FX!xJHx)4Zoa_*eS@rDLk{6|_qvgrh6MNeah^31=z(lW_8s9!E!+B58MG dQ!Lq+U|hh>ygDfaV%R2XY1VWLPbnth*=uRYVE*6VxkqsL?y;zL*bHbtcGQRqsuH=1`c$`nb*1ZJTl)upI-pZaa=|b`vDFD91==bN-J|sxa@>4VkLU1(9>RIa;2yJe~_Cb z$(GuT-sZAD=*9%^E}KX~BUD-rm$R|VM`D~ZvKMBFNMn&J`*xsbp4EcT3?s2(hlP{t z6KZ0kywR}qKXC{x*YuF36PXXijD0E&vyoUPbdu|YgsRd;=5k>kh2b&{2<0eS=83#l zHf4J|$eA^*!ov}vzFlIcTcKZ_JfYa>#yCNNf71@uW}44?iC<6d^iMxP?+g?W@LuK< r+~8q{Cvd?8@Y>~y9X=|kGS%K{e6!s?>S(M@d^FKwE`JW=1+;$wuZ(Mt literal 0 HcmV?d00001 diff --git a/target/test-classes/BankAccountTest.class b/target/test-classes/BankAccountTest.class new file mode 100644 index 0000000000000000000000000000000000000000..ca99c923dd2802c721cc624e30c1ca9b34ca2937 GIT binary patch literal 2041 zcmbu8ZBrU&6o&6bWf2!e5;YnV6-~p7O46ilT9dS3z@#NG6Bs(pw`F;TtifHoEa}UK z{(%0Q_JirPGyMVmQJvn;vMj5qB{OA)=k=WXT+caY|N8s)KLOmuS8*&Lry?Im1i4x4 zVo$F2<0#-x40q+`!&%(JeYyH5hL7d^i9C6r;!_o$DTqEaEz^ChU@DVsDVRRAJ3_%i z)wD!yaMBh|Q*ZZplB(K<-fQWODfj;2wEN2JD_E?SbnA7|FzkWlHbvh(pnYGsqmv&_ zMYG&!Dwu1J?Gz-!Zgh!>?@xu{ijKSr`SL2N8}2~wDOi2M5ax+!nSGNSMa!~X-8F5C z7|E*bbPLA=zNg?*L3BoLm>& z9IAMtp^S=#Z5%0>X*A2NvWBO4rr}Fe*d`${nQ_)&oWXkgnAK#&QG(b83e-li^{jT( zP%uA!e$%^3X3kYzwqtT!(PF_PEWM8rltfp@`Zap4nvLV8t(V~?X^_S%uwlL4n zTK?i-2C&F6#a)53!g(h57RoPNL~w;;)H|HTRj#$60hX}L9iL3+i03@uJk7Hke<1SB zTTE5+zhe3fGaR4uU)$aL4bidaGG=I;K+I!VpimO)6q7-6Lm@v%jPo_DGT0UJuHiZZ ztq^LRt0~-|y#&0;S;0nt^RthW3vg2E8DfN*JwyEKd}@xnl=?h>2JIr-O{i2`BHJ?Q zRybZ`v{mdddX`bgjJbd@?K5s*j#itDzT+`&zQefn9*l|iWZWR*CKRY literal 0 HcmV?d00001 From 7e46e416bc98a639dcca4f2de2d91a3dcf8301be Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Tue, 17 Jan 2017 17:53:21 -0500 Subject: [PATCH 5/7] Added cases for account type changes --- .idea/workspace.xml | 44 ++++++++++++++---------------- src/main/java/BankAccount.java | 29 ++++++++++++++++++-- src/test/java/BankAccountTest.java | 25 +---------------- 3 files changed, 47 insertions(+), 51 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 27abdca..ecdd660 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,13 +2,9 @@ - - - - - + @@ -51,8 +47,8 @@ - - + + @@ -78,8 +74,8 @@ - - + + @@ -744,7 +740,7 @@ @@ -781,7 +777,7 @@ - @@ -796,7 +792,7 @@ - + @@ -889,6 +885,14 @@ + + + + + + + + @@ -900,18 +904,10 @@ - - - - - - - - - - + + @@ -925,8 +921,8 @@ - - + + diff --git a/src/main/java/BankAccount.java b/src/main/java/BankAccount.java index 5e55f87..5941878 100644 --- a/src/main/java/BankAccount.java +++ b/src/main/java/BankAccount.java @@ -41,13 +41,36 @@ public String getAccountHolderName() { } public boolean setAccountStatus(AccountStatus accountStatus) { - if (accountStatus == AccountStatus.CLOSED && accountBalance != 0.0) { + if (accountStatus == AccountStatus.CLOSED) { + System.out.println("You can not modify a closed account."); return false; - } else { + } else if (this.accountStatus == AccountStatus.FROZEN && accountStatus == AccountStatus.FROZEN) { + System.out.println("This account is already frozen."); + return false; + } else if (this.accountStatus == AccountStatus.FROZEN && accountStatus == AccountStatus.CLOSED) { + System.out.println("You can't close a frozen account."); + return false; + } else if (this.accountStatus == AccountStatus.FROZEN && accountStatus == AccountStatus.OPEN) { this.accountStatus = accountStatus; writeToLog("Account Status Changed to " + this.accountStatus); return true; - } + } else if (this.accountStatus == AccountStatus.OPEN && accountStatus == AccountStatus.OPEN) { + System.out.println("This account is already open."); + return false; + } else if (this.accountStatus == AccountStatus.OPEN && accountStatus == AccountStatus.FROZEN) { + this.accountStatus = accountStatus; + writeToLog("Account Status Changed to " + this.accountStatus); + return true; + } else if (this.accountStatus == AccountStatus.OPEN && accountStatus == AccountStatus.CLOSED) { + if (accountBalance != 0.0) { + this.accountStatus = accountStatus; + writeToLog("Account Status Changed to " + this.accountStatus); + return true; + } else { + System.out.println("You must have a 0 balance to close an account."); + return false; + } + } return true; } public String getBalance() { diff --git a/src/test/java/BankAccountTest.java b/src/test/java/BankAccountTest.java index aeccffb..e8dfb97 100644 --- a/src/test/java/BankAccountTest.java +++ b/src/test/java/BankAccountTest.java @@ -45,29 +45,6 @@ public void changeAccountHolderNameForOpenAccountTest() { assertEquals(expected, actual); } - @Test - public void setAccountStatus() { - - } - - @Test - public void getBalance(){ - - } - - @Test - public void creditAccount() { - - } - - @Test - public void debitAccount() { - - } - - @Test - public void writeToLog() { - - } + } \ No newline at end of file From 5a6a238d22eee6a8c6f977db0c894cafdc2887aa Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Tue, 17 Jan 2017 18:37:43 -0500 Subject: [PATCH 6/7] Added unit tests for account status changes --- .idea/workspace.xml | 214 +++++++++++++--------- src/main/java/BankAccount.java | 37 ++-- src/test/java/BankAccountTest.java | 81 +++++++- target/classes/BankAccount.class | Bin 2772 -> 3529 bytes target/test-classes/BankAccountTest.class | Bin 2041 -> 3669 bytes 5 files changed, 233 insertions(+), 99 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ecdd660..3f04e21 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,6 @@ - @@ -44,23 +43,45 @@ - + - - + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -71,11 +92,11 @@ - + - - + + @@ -257,15 +278,15 @@ - - + + - + - + - + + + + + + + + + @@ -740,44 +784,44 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - @@ -792,7 +836,7 @@ - + @@ -821,7 +865,9 @@ - + + @@ -853,42 +899,42 @@ - + - - + + - + - - + + - + - - + + - + - + - + - + @@ -904,26 +950,28 @@ - + - - - - - - - - - - + + + - + - - + + + + + + + + + + + diff --git a/src/main/java/BankAccount.java b/src/main/java/BankAccount.java index 5941878..6d0a338 100644 --- a/src/main/java/BankAccount.java +++ b/src/main/java/BankAccount.java @@ -13,6 +13,7 @@ public class BankAccount { private String transactionRecord; private ODPStatus odpStatus; private AccountStatus accountStatus; + private AccountStatus newAccountStatus; public BankAccount() { accountStatus = AccountStatus.OPEN; @@ -40,39 +41,45 @@ public String getAccountHolderName() { return this.accountHolderName; } - public boolean setAccountStatus(AccountStatus accountStatus) { - if (accountStatus == AccountStatus.CLOSED) { + public boolean setAccountStatus(AccountStatus newAccountStatus) { + if (this.accountStatus == AccountStatus.CLOSED) { System.out.println("You can not modify a closed account."); return false; - } else if (this.accountStatus == AccountStatus.FROZEN && accountStatus == AccountStatus.FROZEN) { + } else if (this.accountStatus == AccountStatus.FROZEN && newAccountStatus == AccountStatus.FROZEN) { System.out.println("This account is already frozen."); return false; - } else if (this.accountStatus == AccountStatus.FROZEN && accountStatus == AccountStatus.CLOSED) { + } else if (this.accountStatus == AccountStatus.FROZEN && newAccountStatus == AccountStatus.CLOSED) { System.out.println("You can't close a frozen account."); return false; - } else if (this.accountStatus == AccountStatus.FROZEN && accountStatus == AccountStatus.OPEN) { - this.accountStatus = accountStatus; + } else if (this.accountStatus == AccountStatus.FROZEN && newAccountStatus == AccountStatus.OPEN) { + this.accountStatus = newAccountStatus; + System.out.println("Your account has been opened."); writeToLog("Account Status Changed to " + this.accountStatus); return true; - } else if (this.accountStatus == AccountStatus.OPEN && accountStatus == AccountStatus.OPEN) { + } else if (this.accountStatus == AccountStatus.OPEN && newAccountStatus == AccountStatus.OPEN) { System.out.println("This account is already open."); return false; - } else if (this.accountStatus == AccountStatus.OPEN && accountStatus == AccountStatus.FROZEN) { - this.accountStatus = accountStatus; + } else if (this.accountStatus == AccountStatus.OPEN && newAccountStatus == AccountStatus.FROZEN) { + this.accountStatus = newAccountStatus; + System.out.println("Your account has been frozen."); writeToLog("Account Status Changed to " + this.accountStatus); return true; - } else if (this.accountStatus == AccountStatus.OPEN && accountStatus == AccountStatus.CLOSED) { - if (accountBalance != 0.0) { - this.accountStatus = accountStatus; - writeToLog("Account Status Changed to " + this.accountStatus); - return true; - } else { + } else if (this.accountStatus == AccountStatus.OPEN && newAccountStatus == AccountStatus.CLOSED) { + if (this.accountBalance != 0) { System.out.println("You must have a 0 balance to close an account."); return false; + } else { + this.accountStatus = newAccountStatus; + System.out.println("Your account has been closed."); + return false; } } return true; } + public AccountStatus getAccountStatus() { + return this.accountStatus; + } + public String getBalance() { if (accountStatus == AccountStatus.FROZEN) { return "Your account is frozen."; diff --git a/src/test/java/BankAccountTest.java b/src/test/java/BankAccountTest.java index e8dfb97..026bc5b 100644 --- a/src/test/java/BankAccountTest.java +++ b/src/test/java/BankAccountTest.java @@ -45,6 +45,85 @@ public void changeAccountHolderNameForOpenAccountTest() { assertEquals(expected, actual); } - + @Test + public void setAccountTypeFromFrozenToFrozen() { + BankAccount bankAccount = new BankAccount(); + System.out.println(bankAccount.getAccountStatus()); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + System.out.println(bankAccount.getAccountStatus()); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromFrozenToClosed() { + BankAccount bankAccount = new BankAccount(); + System.out.println(bankAccount.getAccountStatus()); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + System.out.println(bankAccount.getAccountStatus()); + boolean expected = false, actual = bankAccount.setAccountStatus(AccountStatus.CLOSED); + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromFrozenToOpen() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + bankAccount.setAccountStatus(AccountStatus.OPEN); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromOpenToOpen() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.OPEN); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromOpenToClosed() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.CLOSED); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromOpenToFrozen() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromClosedToOpen() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.CLOSED); + bankAccount.setAccountStatus(AccountStatus.OPEN); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromClosedToClosed() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.CLOSED); + bankAccount.setAccountStatus(AccountStatus.CLOSED); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } + + @Test + public void setAccountTypeFromClosedToFrozen() { + BankAccount bankAccount = new BankAccount(); + bankAccount.setAccountStatus(AccountStatus.CLOSED); + bankAccount.setAccountStatus(AccountStatus.FROZEN); + Boolean expected = false, actual = false; + assertEquals(expected, actual); + } } \ No newline at end of file diff --git a/target/classes/BankAccount.class b/target/classes/BankAccount.class index 8f703fd1f59d7c8f2de3b65baae6958729f76d3f..dea50755334de1509ae6249f6cdfae92b79b5cfa 100644 GIT binary patch literal 3529 zcma)8OLG)e6#hDyWIB`1gCT%G2u%c&OiY4`ih?K*BH&135eN8CDGC6&G4((pK4?JSt?sB6r46RzW#dCzie9zH=sqvAQ! zu3?vFBA^L&_RWYoOd zvMq0qg2w)VqY4uHodOYdWG&kaa-TMGMXsc?PTnXUHC#*P;bOv@vk0RtyU(!ChK_}o zvgw7hfZfji2#U;iNuc)G6*e9H1IvsQtjo`lZZq^$%jcT@8_OY1yQ)rW&AaHjPWd{k zFe5h7G0>2+0T!jR>NT=kRRtRwDoD{RRzh3eH49e60(tEp6<1ogToUDRS}=1pMybBTAHs7tXZUi@OIEmLaynzE6-o*V1wuUEl+wt_0Q?ORj z5$1vx-A7{jB90e&s8jUk#%}sQu#nZ@3KQN zVS%_=rQD*Q{)ZZN;NB!Y((p0v4Qf$`XJ7Tvse43Xtu<<;cB}M{=gzQQvg3rjNB1!? zK5^j4GRvvOvVRL2oeJ&O1Xsm!Mkd(1J$7)@D6vzm_FXSuR*;+*qoS>#d4G0%>HxcX z^VsD02?^0`%(GnV!$Y@pBSWPy)H3@Zk6kymrK-K^Il+f!Sz4n`#c#)J*iY(R|L%J0 zRi`cS_ks<7d~6I`_(|;J_qr7ga{c+%fD8uxk%IF_-gNutsj z0M@ReO%S#bVdJ;KTKiRW4PFBWf2-rht>{$e@~s^_MFxh10g};@Ud8>)FGwH%5v$W( zOIRZTmaujS>x7*|7?5WqAO}C-Z8cuGCSHl9>UI4sd%crKiFF&pZfO7Pi@^QHz+yZ|G(hl1RJgOvVZeng+9gOIhuO%0Swf#9bPJns2Aff2t1VFjHtT;5kHdwDGOZSBQnKQdEIbjW#D8HS zsYgkvG{2tkI%Q7$fNjJ&$R8=Z?u&d|wQMQh`XZalrJ5K$af}|8G-xbO(rW{b{tp{E B9oYZ? delta 1368 zcma)6NmCPH5Pg%7$z+^_7$gxP0fQP0N`m5!3%Dx+;tC2V5HapM;uif0)Rd)Gd5#y$ zq7b5`ReJKEXMcd+J$ta+UQgmAWqGht`FeWN-S55b&iB6hV`b*U&sT2%G~=F*T6B1@ z2b~^7&?QH=hP^s%k2w1@?DyaR4r(~0<1l(9woiUJ;>J-OK6Gg47ds%wpd7~}=D3C- z4Z}J{kkW8M-j7P!Ne|L~oYHVwyfbc`b>rN`ldsPwm3qbe=9sKZqS=k}1}-3Bph=E8 z%s1aUtF-OdVPFyJ%}>rc^`e1GxNNFriHa)*uAp=Z?KFGbgToQF5zyffu6%MJih9eEj%7*Pvay2SfW?*{ zFIZN#d@`^sh12R#z<%&tX4Yuo#B#p#!O3$r$`HUTRG@{P!3a55U?r`BRakB1oYW#~ zia9~J5MtC^DnfVYq%Pr_Z{XARa`*>AOAOtMvaKy?X{%SKv(~ zztB>%H4jE+?>InNuykIHBa374%rxdrp*o9YA}99nvDM;Uc^)n0Rr5Em_TVBS~02S zwK=0Wn=?wd&(#BdH*Tkb)&Vma(iL4NA0i zCN-nr8?4B9qTnf36|CWzg!XhMz7kjP9N#MV4y!W0SMUP#ypF7l4Fwur%Ggw}1zo{5 zR@p_Ka6*ujXjNdT^=*osOpbooB@*QH^vXi=L0Uq0ZEX?|f;&F^;~0j$H(vj0ZdU z6_gjpccIj?oq|kn{bU;;-5|$fWIK*g5=D7%kqC=%%w-JQjKk<8;~7RDCD#bw>KV@- zfU)a&b4bQ>F5?F~kKwvJTKVhTH-9I1a*)E$EOld?T02j+ z3#7d0;R?ICJ7MQ;(9PY+2Dyv4T)){|lMdG>bhDO6cG1HcSMs-aru7SY7sXIt@i19| z%N(yDh^r*K#ynmp_YICWF@aki@=2Hcs!e{WLLMd4^$K}(Pu0g<@?UN8+Xo?Uy<;nO z>Ljs;_^at6OR0CrJw@)j(pknZP0(p}*V I+JdY90?~D#)c^nh literal 2041 zcmbu8ZBrU&6o&6bWf2!e5;YnV6-~p7O46ilT9dS3z@#NG6Bs(pw`F;TtifHoEa}UK z{(%0Q_JirPGyMVmQJvn;vMj5qB{OA)=k=WXT+caY|N8s)KLOmuS8*&Lry?Im1i4x4 zVo$F2<0#-x40q+`!&%(JeYyH5hL7d^i9C6r;!_o$DTqEaEz^ChU@DVsDVRRAJ3_%i z)wD!yaMBh|Q*ZZplB(K<-fQWODfj;2wEN2JD_E?SbnA7|FzkWlHbvh(pnYGsqmv&_ zMYG&!Dwu1J?Gz-!Zgh!>?@xu{ijKSr`SL2N8}2~wDOi2M5ax+!nSGNSMa!~X-8F5C z7|E*bbPLA=zNg?*L3BoLm>& z9IAMtp^S=#Z5%0>X*A2NvWBO4rr}Fe*d`${nQ_)&oWXkgnAK#&QG(b83e-li^{jT( zP%uA!e$%^3X3kYzwqtT!(PF_PEWM8rltfp@`Zap4nvLV8t(V~?X^_S%uwlL4n zTK?i-2C&F6#a)53!g(h57RoPNL~w;;)H|HTRj#$60hX}L9iL3+i03@uJk7Hke<1SB zTTE5+zhe3fGaR4uU)$aL4bidaGG=I;K+I!VpimO)6q7-6Lm@v%jPo_DGT0UJuHiZZ ztq^LRt0~-|y#&0;S;0nt^RthW3vg2E8DfN*JwyEKd}@xnl=?h>2JIr-O{i2`BHJ?Q zRybZ`v{mdddX`bgjJbd@?K5s*j#itDzT+`&zQefn9*l|iWZWR*CKRY From a0530f7c1528c55de367cc83adf2eb3592ac1c17 Mon Sep 17 00:00:00 2001 From: Gerrod Mozeik Date: Wed, 18 Jan 2017 09:15:40 -0500 Subject: [PATCH 7/7] Saving changes to submit current progress --- .idea/workspace.xml | 90 ++++++++++-------------------- src/main/java/Bank.java | 1 + src/test/java/BankAccountTest.java | 2 + 3 files changed, 33 insertions(+), 60 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 3f04e21..5ec4705 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,7 @@ - + @@ -30,24 +30,24 @@ - + - - + + - - + + - + - - + + @@ -62,41 +62,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -131,10 +101,10 @@ @@ -784,7 +754,7 @@ @@ -821,7 +791,7 @@ - @@ -836,7 +806,7 @@ - + @@ -939,29 +909,18 @@ - - - - - - - - - - - - - + + - - + + @@ -975,5 +934,16 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/Bank.java b/src/main/java/Bank.java index 8b5ebfa..27866c7 100644 --- a/src/main/java/Bank.java +++ b/src/main/java/Bank.java @@ -1,5 +1,6 @@ /** * Created by gerrodmozeik on 1/17/17. + * Worked on this with Bill Mattern. */ public class Bank { diff --git a/src/test/java/BankAccountTest.java b/src/test/java/BankAccountTest.java index 026bc5b..4cc2061 100644 --- a/src/test/java/BankAccountTest.java +++ b/src/test/java/BankAccountTest.java @@ -126,4 +126,6 @@ public void setAccountTypeFromClosedToFrozen() { assertEquals(expected, actual); } + @Test + } \ No newline at end of file