From 61cac47f350434b841eea2a4203a6b4d6bacac3e Mon Sep 17 00:00:00 2001 From: Michael Wolfe Date: Tue, 17 Jan 2017 21:01:22 -0500 Subject: [PATCH 1/2] oops --- AccessControlLab/.idea/compiler.xml | 16 + .../libraries/Maven__junit_junit_4_12.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 + AccessControlLab/.idea/misc.xml | 29 + AccessControlLab/.idea/modules.xml | 8 + AccessControlLab/.idea/uiDesigner.xml | 124 +++ AccessControlLab/.idea/workspace.xml | 768 ++++++++++++++++++ AccessControlLab/AccessControlLab.iml | 17 + AccessControlLab/Access_Control_Lab | 1 + AccessControlLab/pom.xml | 37 + .../AccountFunctions.java | 7 + .../AccessControlLabTest/AccountStatus.java | 8 + .../AccessControlLabTest/AccountTypes.java | 8 + .../AccessControlLabTest/BankAccount.java | 109 +++ .../AccessControlLabTest/CheckingAccount.java | 11 + .../InvestmentAccount.java | 11 + .../michael/AccessControlLabTest/Main.java | 7 + .../OverdraftProtection.java | 9 + .../AccessControlLabTest/SavingsAccount.java | 12 + .../AccessControlLabTest/UserPrompt.java | 12 + .../AccessControlLabTest/BankAccountTest.java | 58 ++ .../AccountFunctions.class | Bin 0 -> 405 bytes .../AccessControlLabTest/AccountStatus.class | Bin 0 -> 1340 bytes .../AccessControlLabTest/AccountTypes.class | Bin 0 -> 1342 bytes .../AccessControlLabTest/BankAccount.class | Bin 0 -> 3587 bytes .../CheckingAccount.class | Bin 0 -> 1633 bytes .../InvestmentAccount.class | Bin 0 -> 1641 bytes .../michael/AccessControlLabTest/Main.class | Bin 0 -> 369 bytes .../OverdraftProtection.class | Bin 0 -> 1379 bytes .../AccessControlLabTest/SavingsAccount.class | Bin 0 -> 1442 bytes .../AccessControlLabTest/UserPrompt.class | Bin 0 -> 458 bytes .../BankAccountTest.class | Bin 0 -> 2913 bytes 32 files changed, 1278 insertions(+) create mode 100644 AccessControlLab/.idea/compiler.xml create mode 100644 AccessControlLab/.idea/libraries/Maven__junit_junit_4_12.xml create mode 100644 AccessControlLab/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 AccessControlLab/.idea/misc.xml create mode 100644 AccessControlLab/.idea/modules.xml create mode 100644 AccessControlLab/.idea/uiDesigner.xml create mode 100644 AccessControlLab/.idea/workspace.xml create mode 100644 AccessControlLab/AccessControlLab.iml create mode 160000 AccessControlLab/Access_Control_Lab create mode 100644 AccessControlLab/pom.xml create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java create mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/UserPrompt.java create mode 100644 AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.class create mode 100644 AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/UserPrompt.class create mode 100644 AccessControlLab/target/test-classes/wolfe/michael/AccessControlLabTest/BankAccountTest.class diff --git a/AccessControlLab/.idea/compiler.xml b/AccessControlLab/.idea/compiler.xml new file mode 100644 index 0000000..ff57a9a --- /dev/null +++ b/AccessControlLab/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/libraries/Maven__junit_junit_4_12.xml b/AccessControlLab/.idea/libraries/Maven__junit_junit_4_12.xml new file mode 100644 index 0000000..d411041 --- /dev/null +++ b/AccessControlLab/.idea/libraries/Maven__junit_junit_4_12.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/AccessControlLab/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/AccessControlLab/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/misc.xml b/AccessControlLab/.idea/misc.xml new file mode 100644 index 0000000..a4c2ac6 --- /dev/null +++ b/AccessControlLab/.idea/misc.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + 1.8 + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/modules.xml b/AccessControlLab/.idea/modules.xml new file mode 100644 index 0000000..6ea730a --- /dev/null +++ b/AccessControlLab/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/uiDesigner.xml b/AccessControlLab/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/AccessControlLab/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/workspace.xml b/AccessControlLab/.idea/workspace.xml new file mode 100644 index 0000000..129de08 --- /dev/null +++ b/AccessControlLab/.idea/workspace.xml @@ -0,0 +1,768 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1484681500025 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/AccessControlLab.iml b/AccessControlLab/AccessControlLab.iml new file mode 100644 index 0000000..5cf6df2 --- /dev/null +++ b/AccessControlLab/AccessControlLab.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/Access_Control_Lab b/AccessControlLab/Access_Control_Lab new file mode 160000 index 0000000..5fef196 --- /dev/null +++ b/AccessControlLab/Access_Control_Lab @@ -0,0 +1 @@ +Subproject commit 5fef196ef31696a00c5c13f2492a9d0e8a24b3bc diff --git a/AccessControlLab/pom.xml b/AccessControlLab/pom.xml new file mode 100644 index 0000000..ef6200a --- /dev/null +++ b/AccessControlLab/pom.xml @@ -0,0 +1,37 @@ + + + 4.0.0 + + wolfe.michael + AccessControlLab + 1.0-SNAPSHOT + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + + + + + junit + junit + 4.12 + + + junit + junit + RELEASE + + + + \ No newline at end of file diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.java new file mode 100644 index 0000000..b528b32 --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.java @@ -0,0 +1,7 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class AccountFunctions { +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.java new file mode 100644 index 0000000..c995ae2 --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.java @@ -0,0 +1,8 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public enum AccountStatus { + OPEN, CLOSED, FROZEN +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.java new file mode 100644 index 0000000..5ad79bf --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.java @@ -0,0 +1,8 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public enum AccountTypes { + CHECKING, SAVINGS, INVESTMENT //checking, savings, investment --CANT BE CHANGED +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java new file mode 100644 index 0000000..e52fa39 --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java @@ -0,0 +1,109 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class BankAccount { + + public AccountTypes type; + public OverdraftProtection odp; + public AccountStatus status; + private String accountNumber; // CANT BE CHANGED + private double accountBalance; + private String accountHolderName; + private double interestRate; + //transaction log array list updated with a string builder + + public BankAccount(){ + + } + + public BankAccount(String actNumber, AccountTypes actType, String actHolderName, AccountStatus state, OverdraftProtection prot){ + accountNumber = actNumber; + type = actType; + accountHolderName = actHolderName; + status = state; + odp = prot; + //prompt for name and account type + //auto generate account number + } + + public void setAccountBalance(double d){ + this.accountBalance = d; + } + + public double getAccountBalance(){ + return this.accountBalance; + } + + public void setAccountHolderName(String s){ + this.accountHolderName = s; + } + + public String getAccountHolderName(){ + return this.accountHolderName; + } + + public void setAccountStatus(AccountStatus state){ + status = state; + } + + public AccountStatus getAccountStatus(){ + return this.status; + } + + public void setOverdraftProtection(OverdraftProtection type){ + odp = type; + } + + public OverdraftProtection getOverdraftProtection(){ + return this.odp; + } + + public void setInterestRate(double d){ + this.interestRate = d; + } + + public double getInterestRate(){ + return this.interestRate; + } + + public String balanceInquiry(String accountNumber){ + + //if account is frozen -- NO + return null; + } + + public void creditAccount(double amount, String accountNumber){ + //if account is frozen -- NO + } + + public void debitAccount(double ammount, String accountNumber){ + //if account is frozen -- NO + + } + + public void toggleFreezeOnAccount(String accountNumber){ + + } + + public void transferFundsFromAccountToAccount(double amount, String accountOneNumber, String accountTwoNumber){ + //if account is frozen -- NO + + } + + public void openAccount(){ + //call constructor + //prompt user for name and account type + //generate account number + } + + public void closeAccount(){ + + } + + public void createNewAccount(){ + + } + +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java new file mode 100644 index 0000000..96cf0fa --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java @@ -0,0 +1,11 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class CheckingAccount extends BankAccount { + public CheckingAccount(String actNumber, AccountTypes type, String actName, AccountStatus state){ + super(actNumber, AccountTypes.CHECKING, actName, AccountStatus.OPEN, OverdraftProtection.NO); + + } +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java new file mode 100644 index 0000000..3144a3b --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java @@ -0,0 +1,11 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class InvestmentAccount extends BankAccount { + public InvestmentAccount(String actNumber, AccountTypes type, String actName, AccountStatus state){ + super(actNumber, AccountTypes.INVESTMENT, actName, AccountStatus.OPEN, OverdraftProtection.NO); + + } +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.java new file mode 100644 index 0000000..1dd7a4c --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.java @@ -0,0 +1,7 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class Main { +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.java new file mode 100644 index 0000000..e1b05da --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.java @@ -0,0 +1,9 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public enum OverdraftProtection { + YES, NO, AUTOXFER //, no, auto-xfer + +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java new file mode 100644 index 0000000..7650bc3 --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java @@ -0,0 +1,12 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class SavingsAccount extends BankAccount{ + public SavingsAccount(String actNumber, AccountTypes type, String actName, AccountStatus state, OverdraftProtection opd){ + super(actNumber, AccountTypes.SAVINGS, actName, AccountStatus.OPEN, OverdraftProtection.NO); + + } + +} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/UserPrompt.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/UserPrompt.java new file mode 100644 index 0000000..c9e1067 --- /dev/null +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/UserPrompt.java @@ -0,0 +1,12 @@ +package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class UserPrompt { + + public void getUserName(){ + //get account holder name for creation + } + +} diff --git a/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java b/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java new file mode 100644 index 0000000..8f08ee5 --- /dev/null +++ b/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java @@ -0,0 +1,58 @@ +package wolfe.michael.AccessControlLabTest; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest.*; + +/** + * Created by michaelwolfe on 1/17/17. + */ +public class BankAccountTest { + + BankAccount ba; + @Before + public void setUp(){ + ba = new BankAccount(); + SavingsAccount sa = new SavingsAccount("001", AccountTypes.SAVINGS, "Mike", AccountStatus.OPEN, OverdraftProtection.NO); + sa.setAccountBalance(100); + sa.setInterestRate(1); + } + + @Test + public void setAndGetAccountHolderNameTest(){ + ba.setAccountHolderName("Mike"); + String expected = "Mike"; + String actual = ba.getAccountHolderName(); + Assert.assertEquals(expected, actual); + } + + @Test + public void getAccountStatusTest(){ + //ba.setAccountStatus(AccountStatus.OPEN); + AccountStatus expected = AccountStatus.OPEN; + AccountStatus actual = ba.getAccountStatus(); + Assert.assertEquals(expected, actual); + } + + @Test + public void setOverdraftProtectionTest(){ + + } + + @Test + public void balanceInquiryTest(){ + + } + + @Test + public void creditAccountTest(){ + + } + + @Test + public void debitAccountTest(){ + + } + +} diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountFunctions.class new file mode 100644 index 0000000000000000000000000000000000000000..433d5fb4e321c649884560f104784b5718b86ee4 GIT binary patch literal 405 zcmbV|%}N6?6ot>7&X10xErJi=PFeDy^?kzI}`J7nTDn52~GXx?XwnZqn1)zF;zGwh?}L^xn3sD1$T3~V?6 literal 0 HcmV?d00001 diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountStatus.class new file mode 100644 index 0000000000000000000000000000000000000000..a19503ff09e0146d6b26c51a0caa7bee0ca11bfb GIT binary patch literal 1340 zcmcIj|8LSz5dSym#sW6@wkaVk zlXH_J9!gl`a!Z2BWl6*%2BGz$xySHQd+#|1R%u|Hhlb^p>ZWN0LBn%H-*YshSGwHY zwt|qK@rG`whekLIstn17*3z5L=x2Ao^_pi9*E)6WRa0l!e>01O$A&Ys0)}?JFpKy? z!+U2jq&3^M_J)I=<+qKVLl!Yg+&W;e^4gJcY?K_s?U(e>x7~iVFoRN6%`*+BWB4{_ zFs326#(>zUe^Q`3sM)R^ZZjfrBV}{n{v-!`Xt00Fb3U1-Hf;2J; z7Wt+k!?191xx9Ragz0!LvCQTR6Rm0Wjw~~zN}f(OyWto?P@RDNo{#CM)txdu&joth z!cLAe07w#vND>bqv&>t-5lG=GmcVe0v{jOP$s@2&h@Bz+fi#Bev?n89lJGe!kMR}6 zBCD(l#m`8bLE!k<6#fQTlyekTa5M5#YY4?NmJz295Q`ftr$~N`+>_}pj*Ga%spD>h zS%rjq5n&$YEfvC7{VRm7D#lMCogft{vJfeAk)k9bWj^_haPbihYgZUyPVXj0nAcCh ZIDzweWnxIYuuhf7#!1(3pKLKa_yvE{QJVk& literal 0 HcmV?d00001 diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/AccountTypes.class new file mode 100644 index 0000000000000000000000000000000000000000..826c8cdb00058def88bad7ae5ae30f45e25d476b GIT binary patch literal 1342 zcmcIj?{Csz5Pn`Lv~(T6#3^(Bn$rQBLli$jmJx!Eh)h!?A;u4->sXi48rshIUnxtR z(P;MBKgxJ-M;wc0i3z?<-pk!RclX@&-XA}|dk<+& zIoCPjzJwH)8xqo77DYT@km}ow`m<*HDZ`7_JIC5HibGT1*9@yz({;mj>yGV>9IK`E zix;~)hU@Vd$G5%C`?rQ$VGz|?mvXBNa-CFBagUl~q&%S8%P_ul) zWl(eZ|Bzm&JG%x$qGj4f+aLCgQAg`rWD$e9J9`Yfxz>Sps1+^E9u!q?WZHvDe)f%~ zTaK<-U2SA?0uvU3tqqAx`cDQ7(W+^i-X_DsUkEnyT?WD1H)(P))g0KG=Z`2;IL94Q zRktR={i)Oq+aFeE-PtB>j;uQVNH?CCe6p$Owc6mLRd9)~dPYGB4;k7QujapQu7WHc zDY$`~3KB>vNbxI;Bt!h{$MW78BD&?+#4(f0Pt9ege_-ey_3?Om(sfI7-O3c~_imie zTG=Ym1C7(`7PhjS0YH*S1d@0F$wfW^jzA2Tu>giEq%D)=M;?QHLg)nH52P_%r8^q< zqJ+<4ae^-+6j60Qe+8V#X%#S+5w0b*fo=@`+EfqS~# zS-6N>oH}j?m}N+~6AM(6pv*_V5iUHYP3;L| i%&EP|81w287$<^ou23JX0wKiOvm)gy*KyeJm)<3+-LLmKY#v3L@TsEMq{)yN~83E zn{T)&bMug!U2ZDe>}BaumL3Z-f|rL<&|dk-YaYl_%dwwYvRS%k+p^u>^xVMrnq{k2 zdh>EswgW!nb=;r|!1k)35wCtI=-VLxS6)cJ?pp`Jp6>H-mu)~k?>U^E*6e!972#NKq&B(_=9cU8>P6ZIr#IJ>|4?$GP=aP5NppLGei()@4e~0>n}s~h znxOB8B2oj5;xh%QJFk_MDbRR*X0jGmrXBaEj^n=+bVX+#oi`?IU)G(TaUrp=b$lCZ z&sZ%k`lxYrSxX$qTCHedCh!`Krrh?W{8?7q$Q^nFy=&50nl@>iOp|7KG(|a+CTP;6bCfq}mhyrgzP;BI!9k_}IjYp2;hRVc z_^OZLKR}iQbHNCui6&JKM(9&aRQ2GcdeBupD5B5f1oWVt!>>=#3-syYA0&QP+s>mM z0}KJkfVlTCGQ&;uK7D{+3~&K01N?%W8T9iEP+aO#s<_;xk>a&38O1rH3*@ z#?H(15n5)rjy=39Q@q-xY@bJ{aUQ!DRLoh0nu%j(=!!~~psQ4fuu9m&EYihSl>HTh z6i5SFOyEiIAT&>5<@g`Ulw5`z*RBnYHp zlZLOIGw}tjMi_T+o*zTvJ%f7DY14e4Ut7$ARd&r<>a{Gx;7p zOicUZdzpD>nW1Hb8D`#AhfwzQz9cLLDv{xE(3NRhbYs>m2RagQN2Ds3r^>SFtBlYp zpjp2!qay}x+O$WoMPw!=vv0=JfT#_l;glbC< z(@4HhIllE106fkcws70Q8kQ{Fac~!P3-=t{$GQUx8(h@sL-a2*b|Nd`?d&n1i{xku zC?T9Z-miy4Snyx%_-|f^FA0spVo%P5N2<}>2?_6J58ODG>3%ADrkQFZBcpUeD1{Be zUIC-@m*^hR>i_W$oe@4;9llBxe!%mO__wgYtIbl6wH2nd2Mfgc5Pg#-H4cWRrIc?<`D{VpOK(Ojc@P=Z(8*-8#F--URWp$OWl~ zo)JF^F-~#-1yx9KFWAz~%$wbrowu|5`aVJCeC6 z*64vU(U(s$_bxI+XoMN$-d2ZD-O&e z!p9Pd-Bm-bxi6KOmhBO25u3>-iu^Ma^KK1uLui+f{|~YWR*_otIe0B+c36HWFUgc| zLOs-jESB$+g5k9p3SJc@TX^7L1Ird3I(URt3y&Q!+^H^sIp1;J}W!APQ^WoqMTf7oi*+*lof#vb+238nb7-QG4iYoiBvsJ;`FO$O< AvH$=8 literal 0 HcmV?d00001 diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..6583f44033f5af3b9c9896e8ae948187762330de GIT binary patch literal 369 zcma)&%}N6?6ot>7&QCjzw)h6!sSC4lrwCFgE~dJ$bf1aQrlbkXr21T46BPTk!mu_@KW)~HZs)SG zY|d-1q+Q6?#C(uxSelOTSbuu^rp4N*rPNkDD5bk@;$3LHtz{#QKhJd+#7r7@ODJFb zrd4`sV&@>r>y`YF6;fn`>G4JX?IDcfQemZg7thT~tAH^Q{+4)%FSjvsPGX;d>}m(v YvPe)cbJmf4X0@L)3{Y|+oG=qqe=Pl75dZ)H literal 0 HcmV?d00001 diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/OverdraftProtection.class new file mode 100644 index 0000000000000000000000000000000000000000..1b55455e54d7ddb21852e2ca39fbee72f3213fef GIT binary patch literal 1379 zcmcIkQBTuQ6#j14tz9W>%!z_1iYVJaDvD2A2n&J4q+!OwWEvmtN;isKn{*xiEggv% zjfQ7`l=0lM$cTgoleNh`Irn_`obP-+x4(XW`w3tTYiY<>)KEZCL0&;g!vvPZvaBMb zQE*uxo~W1%+TF zH!^C+PIwUVR`eX)(HZyh(pMab(|#WRMz>!@b}1}Wava&qY_l4p%H z+!xgGAjZr?#lx7eNb{Z=5l{6yIdNxeH!0}+{c*J fNcJ&qoq!1f=lyELka%H{I+q4T7x0MoBs~5DKf+>@ literal 0 HcmV?d00001 diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.class new file mode 100644 index 0000000000000000000000000000000000000000..00bd94b667f41f00f1cf09803074306ddb7f1bee GIT binary patch literal 1442 zcmcIkT~8B16g{^sEL&G8AL6%wpaMqr#kU#~Bw|d~ZFNh1o^A&i-0n2H(;9vjeIfC| zAK;HN-fjC}BOxSRcaxcW&&-^2bI)Xc{r>S2z#DAYcz}mC9^tW#CwN-MELJV7Sy(5` zzE!a@dqk^S-kInNHxluQ8<<4JCspsej*g|ois z&gfoj8s}Y^R{y6$V1((h#Pv1Zq~uy(ChbHVn|h*+42{xpb-PI@9q6_s%zG-9ey`J# zNkgx0Gf#|av>A00uf-OQbsvr~p$2Kn2aK8!l9K5 z9X!Xfg%=K9V#R@lId1Iqw`@|B@M(I=cOw2awu|6T&-b_W?0m4_{OErO2({d(M~3r# zt<~TAgrn(+ukf2t@M~Dd48MEXNBpykJldRf8O`v@&Z`0F^#FwdikB!|FjhdB$1>00 x{qr2%;%INQ9}aGF#wT%y*Jv13urS?Ft&3>o4x-DrQ#FxWqsF@$4#s~GY^H>zCKm2y*2 z8De$|D}|W}r#t*bhJK-2hO&6H=1%ci%Y{&eUr4Fic5EB(tSLmr|87rJ>-kNq+{D@X z-k&mT&6V$nQq=TxdTm!us!QF?k$(%1m*PQW2oW*->jVtL?rLsCGv`;;Qb~_J1hls9 z1fVq`q8Jn6lo{pd@EPo>ZzmMvo{X_Ub@nO1CQ?H5yS4eK$He_Mraz2qZOlj>VEY4g Cq-vu8 literal 0 HcmV?d00001 diff --git a/AccessControlLab/target/test-classes/wolfe/michael/AccessControlLabTest/BankAccountTest.class b/AccessControlLab/target/test-classes/wolfe/michael/AccessControlLabTest/BankAccountTest.class new file mode 100644 index 0000000000000000000000000000000000000000..f9fa4c0ca0bc55dce0332f45297e0a70466a07a6 GIT binary patch literal 2913 zcmcImeN!4o82>Gz2Y8KmK^twGXkIFU@l0adw5Dm$7-NHAL`iM)&jPES!8^S>Z1b_| zwAyKA@&WpxI(_!;0vB||87VU?d;9WxdG^_d`{&=k-vgM%>jZ{yPr>~JBDfbv3J(;_ z#_&}fU*nq?9>(!4zKdfHj}qv`_kB+`X&-&$(_`8EAa_2IO)i0XEXdwd1&a!vF+?hy zp_u>Gs&5H>NjQP*?Ts&JeI%XDq4p63<){ONV!xcWRd-_Sm*VY+h+eUA*&a33@D zq$kS^(FLm}7zXl&DGH6fim=ytrA{MS-m3C?ncIeZ4hEy{j^QxOc2Lz$E1!wF*Aec< zJ~?y9*;)sTi#RLsL&My5TINR9$fU6+%7$Z*>YQm>E_V&fB++EZ-qv>;a8KdN*cqr_e&9~fD+j2=W+4c#w3MbK3v1}eR4EwD= zI9Rns&G=y3A4}FmrEMrtvKn?(JTqiYq(Z4AcTCHGsJMm^hL!U(@gm0=LRT@2PZ?G( z5BhPAP}*`;G*D4dUTkN*mP^v4XTzR>$RH6WOFV{S5 zO0{Cw)cV;=hfrKyEHG?b9{7waK;@=TWO&tuK%9X-$JmYZ>AKJbvhaz{{htg$4e5g9 zv*IKFV+LiB^~>wLUy10<(@*8p08K5MuCVE@tZ`S?nAYM}EoK-xBgzsWRAa--Q|Zam zF{2{g`U}W8j#(1nhU}MDQ84ecoU{KBvCwFTfYLPEQOsXmiBdd;o=d zz}?I{L^e;*^CzP3(7UPi9YN7zM~ELGaf1GQHU;$G1`QLq ziYd}7Nr!#lfOHI>(28*)ze#ga+%5WLxZRYpL+g8JY&7!+qFU@2NiCL_{bLNSWT*au z*3NqkaoVktkrY`TAy&yd=A#6>Dz4xTz9gm;u})Ag(o~T46ihZ1ybcs-WIJHK+Rm&Y zO1s9Xy-Ccs$oK6Ks}`_EJ=P4dsvc|R6l=E0n)OsrEL!&bvzzpQ{j*~M@Q2{}(x*Cu aOm_si+Zp6RN08~xAP+l&=oE Date: Wed, 18 Jan 2017 01:42:22 -0500 Subject: [PATCH 2/2] Missing transactions record feature, UML and some unit tests..will complete tomorrow. --- AccessControlLab/.idea/vcs.xml | 7 + AccessControlLab/.idea/workspace.xml | 378 ++++++++++++------ .../AccessControlLabTest/BankAccount.java | 115 ++++-- .../AccessControlLabTest/CheckingAccount.java | 11 - .../InvestmentAccount.java | 5 +- .../AccessControlLabTest/SavingsAccount.java | 4 +- .../AccessControlLabTest/BankAccountTest.java | 66 ++- .../AccessControlLabTest/BankAccount.class | Bin 3587 -> 3921 bytes .../AccessControlLabTest/SavingsAccount.class | Bin 1442 -> 1425 bytes .../BankAccountTest.class | Bin 2913 -> 4045 bytes 10 files changed, 415 insertions(+), 171 deletions(-) create mode 100644 AccessControlLab/.idea/vcs.xml delete mode 100644 AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java diff --git a/AccessControlLab/.idea/vcs.xml b/AccessControlLab/.idea/vcs.xml new file mode 100644 index 0000000..9c56be1 --- /dev/null +++ b/AccessControlLab/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/AccessControlLab/.idea/workspace.xml b/AccessControlLab/.idea/workspace.xml index 129de08..d23cdf0 100644 --- a/AccessControlLab/.idea/workspace.xml +++ b/AccessControlLab/.idea/workspace.xml @@ -1,7 +1,17 @@ - + + + + + + + + + + + + + + + + + + + @@ -119,6 +132,8 @@ + + @@ -203,17 +218,16 @@ - - - + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + - - - - + + + + + + @@ -525,35 +595,35 @@ - - + + - - + + - + - + - + - + - + - - + + - - + + - - + + @@ -563,29 +633,29 @@ - - - + + - + - + + @@ -623,7 +693,9 @@ - + + @@ -631,16 +703,64 @@ + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -657,22 +777,43 @@ - + + + + + + + + + + + + + + + - - + + + + + + + + + @@ -680,86 +821,95 @@ - + - - + + - + - + - + - - + + - + - - + + - + - - + + - + - - + + - + - - - - - + + + - + + - - + + - + + - - - + + + + + + + + + - + - - + + - + + + + diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java index e52fa39..9878927 100644 --- a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.java @@ -1,5 +1,7 @@ package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; +import java.util.ArrayList; + /** * Created by michaelwolfe on 1/17/17. */ @@ -12,13 +14,11 @@ public class BankAccount { private double accountBalance; private String accountHolderName; private double interestRate; + private ArrayList transactions; //transaction log array list updated with a string builder - public BankAccount(){ - - } - public BankAccount(String actNumber, AccountTypes actType, String actHolderName, AccountStatus state, OverdraftProtection prot){ + public BankAccount(String actNumber, AccountTypes actType, String actHolderName, AccountStatus state, OverdraftProtection prot) { accountNumber = actNumber; type = actType; accountHolderName = actHolderName; @@ -28,82 +28,127 @@ public BankAccount(String actNumber, AccountTypes actType, String actHolderName, //auto generate account number } - public void setAccountBalance(double d){ + public void setAccountBalance(double d) { this.accountBalance = d; } - public double getAccountBalance(){ + public double getAccountBalance() { return this.accountBalance; } - public void setAccountHolderName(String s){ + public void setAccountHolderName(String s) { this.accountHolderName = s; } - public String getAccountHolderName(){ + public String getAccountHolderName() { return this.accountHolderName; } - public void setAccountStatus(AccountStatus state){ - status = state; + public void setAccountStatus(AccountStatus state) { + this.status = state; } - public AccountStatus getAccountStatus(){ + public AccountStatus getAccountStatus() { return this.status; } - public void setOverdraftProtection(OverdraftProtection type){ + public void setOverdraftProtection(OverdraftProtection type) { odp = type; } - public OverdraftProtection getOverdraftProtection(){ + public OverdraftProtection getOverdraftProtection() { return this.odp; } - public void setInterestRate(double d){ + public void setInterestRate(double d) { this.interestRate = d; } - public double getInterestRate(){ + public double getInterestRate() { return this.interestRate; } - public String balanceInquiry(String accountNumber){ - - //if account is frozen -- NO - return null; + public String balanceInquiry(String accountNumber) { + if (accountNumber.equals(this.accountNumber)) + if (this.getAccountStatus() == AccountStatus.FROZEN) + return "error"; + else + return Double.toString(this.accountBalance); + else + return "error"; } - public void creditAccount(double amount, String accountNumber){ - //if account is frozen -- NO + public boolean creditAccount(double amount, BankAccount receivingAccount) { + if (receivingAccount.status.equals(AccountStatus.OPEN)) { + receivingAccount.accountBalance += amount; + return true; + } else + return false; } - public void debitAccount(double ammount, String accountNumber){ - //if account is frozen -- NO - + public boolean debitAccount(double amount, BankAccount account) { + if (account.status.equals(AccountStatus.OPEN) && account.odp.equals(OverdraftProtection.NO)) { + account.accountBalance -= amount; + return true; + } else if ((!account.odp.equals(OverdraftProtection.NO)) && (account.accountBalance - amount) < 0) + return false; + else { + account.accountBalance -= amount; + return true; + } } - public void toggleFreezeOnAccount(String accountNumber){ + public boolean transferFundsFromAccountToAccount(double amount, BankAccount receivingAccount) { + if(checkAccountForSameHolderName(this, receivingAccount)) + if(receivingAccount.status.equals(AccountStatus.OPEN)){ + receivingAccount.creditAccount(amount, receivingAccount); + this.debitAccount(amount, this); + return true; + } + else + return false; + else + return false; } - public void transferFundsFromAccountToAccount(double amount, String accountOneNumber, String accountTwoNumber){ - //if account is frozen -- NO - + public boolean checkAccountForSameHolderName(BankAccount sender, BankAccount receiver){ + return sender.getAccountHolderName().equals(receiver.getAccountHolderName()); } - public void openAccount(){ - //call constructor - //prompt user for name and account type - //generate account number + public boolean openAccount(BankAccount account){ + if(this.status.equals(AccountStatus.CLOSED)) + return false; + else { + this.status = AccountStatus.OPEN; + return true; + } } - public void closeAccount(){ + public boolean closeAccount(BankAccount account){ + if(account.getAccountBalance() == 0) { + this.status = AccountStatus.CLOSED; + return true; + } + else + return false; + } + public class Transactions { + public String accountNumber; + public String accountHolderName; + public String transactionType; + public String transactionAmount; + public String newAccountBalance; } - public void createNewAccount(){ + /** + * Created by michaelwolfe on 1/17/17. + */ + public static class CheckingAccount extends BankAccount { + public CheckingAccount(String actNumber, String actName, AccountStatus state, OverdraftProtection prot){ + super(actNumber, AccountTypes.CHECKING, actName, state, prot); + } } - } diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java deleted file mode 100644 index 96cf0fa..0000000 --- a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/CheckingAccount.java +++ /dev/null @@ -1,11 +0,0 @@ -package wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest; - -/** - * Created by michaelwolfe on 1/17/17. - */ -public class CheckingAccount extends BankAccount { - public CheckingAccount(String actNumber, AccountTypes type, String actName, AccountStatus state){ - super(actNumber, AccountTypes.CHECKING, actName, AccountStatus.OPEN, OverdraftProtection.NO); - - } -} diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java index 3144a3b..02b6fe5 100644 --- a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/InvestmentAccount.java @@ -4,8 +4,7 @@ * Created by michaelwolfe on 1/17/17. */ public class InvestmentAccount extends BankAccount { - public InvestmentAccount(String actNumber, AccountTypes type, String actName, AccountStatus state){ - super(actNumber, AccountTypes.INVESTMENT, actName, AccountStatus.OPEN, OverdraftProtection.NO); - + public InvestmentAccount(String actNumber, String actName, AccountStatus state, OverdraftProtection prot){ + super(actNumber, AccountTypes.INVESTMENT, actName, state, prot); } } diff --git a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java index 7650bc3..d2d69ac 100644 --- a/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java +++ b/AccessControlLab/src/main/java/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/SavingsAccount.java @@ -4,8 +4,8 @@ * Created by michaelwolfe on 1/17/17. */ public class SavingsAccount extends BankAccount{ - public SavingsAccount(String actNumber, AccountTypes type, String actName, AccountStatus state, OverdraftProtection opd){ - super(actNumber, AccountTypes.SAVINGS, actName, AccountStatus.OPEN, OverdraftProtection.NO); + public SavingsAccount(String actNumber, String actName, AccountStatus state, OverdraftProtection prot){ + super(actNumber, AccountTypes.SAVINGS, actName, state, prot); } diff --git a/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java b/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java index 8f08ee5..31526c4 100644 --- a/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java +++ b/AccessControlLab/src/test/java/wolfe/michael/AccessControlLabTest/BankAccountTest.java @@ -5,18 +5,31 @@ import org.junit.Test; import wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest.*; +import static wolfe.michael.AccessControlLab.wolfe.michael.AccessControlLabTest.AccountStatus.FROZEN; + /** * Created by michaelwolfe on 1/17/17. */ public class BankAccountTest { BankAccount ba; + BankAccount.Transactions transactions; + SavingsAccount sa; + BankAccount.CheckingAccount ca; + InvestmentAccount ia; @Before public void setUp(){ - ba = new BankAccount(); - SavingsAccount sa = new SavingsAccount("001", AccountTypes.SAVINGS, "Mike", AccountStatus.OPEN, OverdraftProtection.NO); + + sa = new SavingsAccount("001", "Mike", AccountStatus.OPEN, OverdraftProtection.NO); sa.setAccountBalance(100); sa.setInterestRate(1); + ca = new BankAccount.CheckingAccount("002", "Mike", AccountStatus.OPEN, OverdraftProtection.NO); + ca.setAccountBalance(50); + ca.setInterestRate(2); + ia = new InvestmentAccount("003", "Mike", AccountStatus.OPEN, OverdraftProtection.NO); + ia.setAccountBalance(50); + ia.setInterestRate(2); + } @Test @@ -29,30 +42,71 @@ public void setAndGetAccountHolderNameTest(){ @Test public void getAccountStatusTest(){ - //ba.setAccountStatus(AccountStatus.OPEN); AccountStatus expected = AccountStatus.OPEN; - AccountStatus actual = ba.getAccountStatus(); + AccountStatus actual = sa.getAccountStatus(); + Assert.assertEquals(expected, actual); + } + + @Test + public void setAccountStatusTest(){ + AccountStatus expected = FROZEN; + sa.setAccountStatus(FROZEN); + AccountStatus actual = sa.getAccountStatus(); Assert.assertEquals(expected, actual); } @Test public void setOverdraftProtectionTest(){ + OverdraftProtection expected = OverdraftProtection.NO; + OverdraftProtection actual = sa.getOverdraftProtection(); + Assert.assertEquals(expected, actual); + } + @Test + public void getOverdraftProtectionTest(){ + sa.setOverdraftProtection(OverdraftProtection.AUTOXFER); + OverdraftProtection expected = OverdraftProtection.AUTOXFER; + OverdraftProtection actual = sa.getOverdraftProtection(); + Assert.assertEquals(expected, actual); } @Test - public void balanceInquiryTest(){ + public void setAndGetInterestRateTest(){ + double expected = 0.0; + sa.setInterestRate(0.0); + double actual = sa.getInterestRate(); + Assert.assertEquals(expected, actual, .000001); + } + @Test + public void getAccountBalanceTest(){ + String expected = Double.toString(100); + String actual = Double.toString(sa.getAccountBalance()); + Assert.assertEquals(expected, actual); } @Test public void creditAccountTest(){ - + sa.creditAccount(50.0, "001"); + double expected = 150.0; + double actual = sa.getAccountBalance(); + Assert.assertEquals(expected, actual, .000001); } @Test public void debitAccountTest(){ + sa.debitAccount(50.0, "001"); + double expected = 50.0; + double actual = sa.getAccountBalance(); + Assert.assertEquals(expected, actual, .000001); + } + @Test + public void transferFundsFromAccountToAccountTest(){ + boolean expected = true; + boolean actual = true;//some code } + + } diff --git a/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.class b/AccessControlLab/target/classes/wolfe/michael/AccessControlLab/wolfe/michael/AccessControlLabTest/BankAccount.class index bbb939d76e804724c8470810f829e8031424ca57..da2e97c92c9a5ec5902ab2ca4fe0d5f8e731a127 100644 GIT binary patch literal 3921 zcmcImU3U{z6x}z?M;oSJp;THerPk6kr9@OvEL4F~sg$OW2vPx=Or~W@I@3-jRNnmw zzW4`x6RnV?o}%Sw>sb=;GS2I1n<@T!>m@fi>51(TG`T{>e;exZ)WqJYuTIJ z)E8{JqI2C~6vd*zV6b@IDVI!lRo~{iX4#(UGDf#`kFW8ImTh?pLX4*m!glU3ej@%) z4?(y(KshYMGj}M@t4@g#>tC^K)6YdgFP6EIT5$}$d`EXJ`5r7ry~h>>k?R1VE4uw8 z5Ct>cqZ?jL3JK0-Xq8C3<}}BoBDo&jp-!oUis=Oqb%jLJi}F~a#Lt@tKX;{PD50T- zVKe-(5Va^U9(kw%)@(AAo;jF*fq{ktKZOE?bO(YKoHme!zz1Q2=cr<-Y}0B@=f4gM-CYRO)>WKsLL%4rJpofSNe*6Pg=HjtCssr z;8d7+!nD!LkQz^J>N`PA^%|~OvT8yWm`*PqGz(Q(T;G=W0oz~6EH)ubc&=_&HcWS^ zYL_ZYuCpEJrr-n zvVK?1z4}rz?^IpGT(V@#8EEPWXXJIDVGPR}-okMWgGgz3Th5MQSi?~aX&Aw%hIcTU z0Jj!lXgG)S36wOL7#4_`uIso7Y-rfTV}V4zs%~9@n{QqpO^m6_W|G&2(2M=UcE+eiEtg>aJN3Hp{OQTpwn=RRitC_RtR?>Ie7@auw)iFYx{ zH=^S`au8}ZMcas)o#I-TnoZL_s%B{-#<+6^8IF?S0{6&W@yzr-5)B?ng)+w7CzQ`& z^&YSLjANE;c<;s?Ua^U`ZBFQ>R&(+9c?-+*LeIsv1n!d8BbgRTq6JMqPDAvVg9>E~CxE z7~LnM2W0e+j2_XuPDZ8wz-W>2^;5LW_{eyRhD`kW-%_v{6+lrxsHh)QFg<^ou23JX0wKiOvm)gy*KyeJm)<3+-LLmKY#v3L@TsEMq{)yN~83E zn{T)&bMug!U2ZDe>}BaumL3Z-f|rL<&|dk-YaYl_%dwwYvRS%k+p^u>^xVMrnq{k2 zdh>EswgW!nb=;r|!1k)35wCtI=-VLxS6)cJ?pp`Jp6>H-mu)~k?>U^E*6e!972#NKq&B(_=9cU8>P6ZIr#IJ>|4?$GP=aP5NppLGei()@4e~0>n}s~h znxOB8B2oj5;xh%QJFk_MDbRR*X0jGmrXBaEj^n=+bVX+#oi`?IU)G(TaUrp=b$lCZ z&sZ%k`lxYrSxX$qTCHedCh!`Krrh?W{8?7q$Q^nFy=&50nl@>iOp|7KG(|a+CTP;6bCfq}mhyrgzP;BI!9k_}IjYp2;hRVc z_^OZLKR}iQbHNCui6&JKM(9&aRQ2GcdeBupD5B5f1oWVt!>>=#3-syYA0&QP+s>mM z0}KJkfVlTCGQ&;uK7D{+3~&K01N?%W8T9iEP+aO#s<_;xk>a&38O1rH3*@ z#?H(15n5)rjy=39Q@q-xY@bJ{aUQ!DRLoh0nu%j(=!!~~psQ4fuu9m&EYihSl>HTh z6i5SFOyEiIAT&>5<@g`Ulw5`z*RBnYHp zlZLOIGw}tjMi_T+o*zTvJ%>25yKLih(B(0~13*Fi{b6&oJ}>1W(|Y2nu3s;!(VT z_y?=0U+;HUSDkF%ZoIy?2Y>L_p*L}9(-J(W^!rh z+udfbp7IbcJE)-Qz(7r4qR!e_9ksjCcwf3X(&Lkp}-}I-8E)_~LR@NO5M^?IM9B*M*cqnrlTA8Cr?#5A9+d9RL6T delta 321 zcmXAjy-or_5XXPBw{qNZ;-QF&3ZkM!V_{-xC^RNk91WqdG0_+ry@JMyXCV6kCiWE2 zm{?d?`Y86c#yQ+gX8xbaj0>-Y)34w658#Yezy{TTO|}BIsfFaI`|S8MgxvYyaWHI) z)LX7&Z``&09RE!6cKDp$3tcz0mu}=m?nMT^_mtiVebxHz!8B{T5qp$;_9L2Jw>Aj{n{=-_LQl=!NHCp*1`B#n_C&vSbq2~(RWm(4I-VgX zGt3O{4LeoM5b6wdqxmI81x4-uJQ0h^v`JAtnWLD}JRP&FnwM!+Rw!fV_9_)ULs(O0 GSpNgg?ke5@ diff --git a/AccessControlLab/target/test-classes/wolfe/michael/AccessControlLabTest/BankAccountTest.class b/AccessControlLab/target/test-classes/wolfe/michael/AccessControlLabTest/BankAccountTest.class index f9fa4c0ca0bc55dce0332f45297e0a70466a07a6..8e1a3e0c4e25d72564f11531e5da2d421869ce63 100644 GIT binary patch literal 4045 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 aOm_si+Zp6RN08~xAP+l&=oE