From edcff3b2e4d2162b0e5afeb105b0f2b5b14608d0 Mon Sep 17 00:00:00 2001 From: Andres Holland Date: Wed, 18 Jan 2017 16:21:09 -0500 Subject: [PATCH 1/3] Initial Submit. Not complete. Will update later today. --- .idea/.name | 1 + .idea/compiler.xml | 16 + .idea/libraries/Maven__junit_junit_4_12.xml | 13 + .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 + .idea/misc.xml | 51 + .idea/modules.xml | 8 + .idea/uiDesigner.xml | 124 +++ .idea/vcs.xml | 6 + .idea/workspace.xml | 868 ++++++++++++++++++ Access_Control_Lab.iml | 17 + pom.xml | 26 + src/main/java/holland/andres/Account.java | 48 + .../java/holland/andres/BalanceInquiry.java | 12 + src/main/java/holland/andres/ChangeName.java | 7 + .../java/holland/andres/CloseAccount.java | 10 + .../java/holland/andres/CreditAccount.java | 14 + .../java/holland/andres/DebitAccount.java | 20 + src/main/java/holland/andres/Main.java | 15 + target/classes/holland/andres/Account.class | Bin 0 -> 1516 bytes .../holland/andres/BalanceInquiry.class | Bin 0 -> 887 bytes .../classes/holland/andres/ChangeName.class | Bin 0 -> 572 bytes .../classes/holland/andres/CloseAccount.class | Bin 0 -> 651 bytes .../holland/andres/CreditAccount.class | Bin 0 -> 812 bytes .../classes/holland/andres/DebitAccount.class | Bin 0 -> 929 bytes target/classes/holland/andres/Main.class | Bin 0 -> 856 bytes .../holland/andres/AccountTest.class | Bin 0 -> 288 bytes 26 files changed, 1269 insertions(+) create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml 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 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/uiDesigner.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 create mode 100644 src/main/java/holland/andres/Account.java create mode 100644 src/main/java/holland/andres/BalanceInquiry.java create mode 100644 src/main/java/holland/andres/ChangeName.java create mode 100644 src/main/java/holland/andres/CloseAccount.java create mode 100644 src/main/java/holland/andres/CreditAccount.java create mode 100644 src/main/java/holland/andres/DebitAccount.java create mode 100644 src/main/java/holland/andres/Main.java create mode 100644 target/classes/holland/andres/Account.class create mode 100644 target/classes/holland/andres/BalanceInquiry.class create mode 100644 target/classes/holland/andres/ChangeName.class create mode 100644 target/classes/holland/andres/CloseAccount.class create mode 100644 target/classes/holland/andres/CreditAccount.class create mode 100644 target/classes/holland/andres/DebitAccount.class create mode 100644 target/classes/holland/andres/Main.class create mode 100644 target/test-classes/holland/andres/AccountTest.class diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..c2ba6ab --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +BankAccount \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..be05be0 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file 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/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/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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..74519a3 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,868 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + project + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1484684547653 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No facets are configured + + + + + + + + + + + + + + + 1.8 + + + + + + + + Access_Control_Lab + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Access_Control_Lab.iml b/Access_Control_Lab.iml new file mode 100644 index 0000000..03320bd --- /dev/null +++ b/Access_Control_Lab.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..88bf5d0 --- /dev/null +++ b/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + holland.andres + BankAccount + 1.0-SNAPSHOT + + + junit + junit + RELEASE + + + + + junit + junit + 4.12 + test + + + + \ No newline at end of file diff --git a/src/main/java/holland/andres/Account.java b/src/main/java/holland/andres/Account.java new file mode 100644 index 0000000..ab502af --- /dev/null +++ b/src/main/java/holland/andres/Account.java @@ -0,0 +1,48 @@ +package holland.andres; + +public class Account { + + private String accountName; + private String accountType; + private static int accountNumber = 0; + private String accountStatus = "open"; + private boolean overdraftProtection; + private double accountBalance = 0; + private double interest; + + protected void createAccount (String name, String type, boolean overdraft, double interestRate) { + accountName = name; + accountType = type; + accountNumber++; + overdraftProtection = overdraft; + interest = interestRate; + } + + protected void setAccountName (String name) { + if (accountStatus != "closed") { + accountName = name; + } + } + + protected String getAccountStatus () { + return accountStatus; + } + + protected void setAccountStatus (String status) { + accountStatus = status; + } + + protected double getAccountBalance () { + return accountBalance; + } + + protected void setAccountBalance (double balance) { + accountBalance = balance; + } + + protected boolean getOverdraftProtection () { + return overdraftProtection; + } + } + + diff --git a/src/main/java/holland/andres/BalanceInquiry.java b/src/main/java/holland/andres/BalanceInquiry.java new file mode 100644 index 0000000..e6d475a --- /dev/null +++ b/src/main/java/holland/andres/BalanceInquiry.java @@ -0,0 +1,12 @@ +package holland.andres; + +public class BalanceInquiry { + public void inquire (Account account) { + String status = account.getAccountStatus(); + if (status.equalsIgnoreCase("open") || + status.equalsIgnoreCase("closed")) { + double balance = account.getAccountBalance(); + System.out.println(balance); + } + } +} diff --git a/src/main/java/holland/andres/ChangeName.java b/src/main/java/holland/andres/ChangeName.java new file mode 100644 index 0000000..f2e8da6 --- /dev/null +++ b/src/main/java/holland/andres/ChangeName.java @@ -0,0 +1,7 @@ +package holland.andres; + +public class ChangeName { + public void change (Account account, String name) { + account.setAccountName(name); + } +} diff --git a/src/main/java/holland/andres/CloseAccount.java b/src/main/java/holland/andres/CloseAccount.java new file mode 100644 index 0000000..26fcda0 --- /dev/null +++ b/src/main/java/holland/andres/CloseAccount.java @@ -0,0 +1,10 @@ +package holland.andres; + +public class CloseAccount { + + public void close (Account account) { + double balance = account.getAccountBalance(); + account.setAccountBalance(balance); + account.setAccountStatus("closed"); + } +} diff --git a/src/main/java/holland/andres/CreditAccount.java b/src/main/java/holland/andres/CreditAccount.java new file mode 100644 index 0000000..60c6449 --- /dev/null +++ b/src/main/java/holland/andres/CreditAccount.java @@ -0,0 +1,14 @@ +package holland.andres; + +public class CreditAccount { + + public boolean credit (Account account, double amount) { + String status = account.getAccountStatus(); + double balance = account.getAccountBalance(); + if (status.equalsIgnoreCase("open")) { + account.setAccountBalance(balance + amount); + return true; + } + return false; + } +} diff --git a/src/main/java/holland/andres/DebitAccount.java b/src/main/java/holland/andres/DebitAccount.java new file mode 100644 index 0000000..8700644 --- /dev/null +++ b/src/main/java/holland/andres/DebitAccount.java @@ -0,0 +1,20 @@ +package holland.andres; + +public class DebitAccount { + + public boolean debit (Account account, double amount) { + String status = account.getAccountStatus(); + boolean overdraft = account.getOverdraftProtection(); + double balance = account.getAccountBalance(); + if (status.equalsIgnoreCase("open") && + !overdraft) { + account.setAccountBalance(balance - amount); + return true; + } + else if (status.equalsIgnoreCase("open") && amount < balance) { + account.setAccountBalance(balance - amount); + return true; + } + return false; + } +} diff --git a/src/main/java/holland/andres/Main.java b/src/main/java/holland/andres/Main.java new file mode 100644 index 0000000..23b6d60 --- /dev/null +++ b/src/main/java/holland/andres/Main.java @@ -0,0 +1,15 @@ +package holland.andres; + +public class Main { + + public static void main(String[] args) { + + Account account1 = new Account(); + Account account2 = new Account(); + account1.createAccount("andres holland","checking",true,3); + account2.createAccount("wendy","checking",false,0); + ChangeName changeName = new ChangeName(); + changeName.change(account2,"andres"); + } + +} diff --git a/target/classes/holland/andres/Account.class b/target/classes/holland/andres/Account.class new file mode 100644 index 0000000000000000000000000000000000000000..219897019828126a308ede6f8af27e09d38a0281 GIT binary patch literal 1516 zcmZ`(+fEZv6kXE}(+fij1d2A~vtRIxW*Q@cT7> z30qrfNu-oM%eT$I4lfi`D;EV{yxCooTwH098b}*5kwgW0oBwNKQ)9yp!U`={hr3h} zi2VmqV%xc)O7&uWX2y{1Osx@`JrJWruF^gFIuO5#eo-q@Olq&)fFhr7c54?g*s%1H zRS#Q|-SSR-%YN>N2I!%}c`-0LMlr^2c_+53qkx=_VH9=riCtcVehlas#E^~=6xn90 z?ltUv1;y^IqT+ZEH}{S>LYU&@>KyeH5(1dJguv#S74Y)R(sE@bxsrukS(IxA91e^z zj`OsNBzHi+@dJucNHmc&a!sgT5)%Yg`499s&HBn*@Ykn!KFo@Tn*AsT#3b4q0h}Ofn{um4zp%da8qn77@{4 zNc}2iF&7a@L`2k2=ZH*qC2|Av;p1f*C#=(qnSa{eB2pod>VJsTXf?+jH~GKY8m3N1 j(jU(end?F%joZ;AmZS#SndGbpLzE6XQ#{>~fD3;CiBS1$ literal 0 HcmV?d00001 diff --git a/target/classes/holland/andres/BalanceInquiry.class b/target/classes/holland/andres/BalanceInquiry.class new file mode 100644 index 0000000000000000000000000000000000000000..9b9f765798d57786ca80011b028adc80dac183f7 GIT binary patch literal 887 zcmaJ<*>2N76g|@{PK_Z=(v;GLP+A~PLrvMGA|z;qR1_8|C=a|j&M0-|*sT|&zVRFI z7w`}y9{2!03US7(H^HV-;6RXy~|xwGytYczqTd zxS``FZfR(0Fa?TFT;GkK3gnt*PawY=45UE0$%Oyk^BB};)W+X0-Bq;2S0P1Ao1fJ)n4mQDh0$I zBYScsu=uYc3W#DmPB=xib7+6CEp{GS-8gjpAsg%6APF7$!c`h-XXn~dcmo$;XlNPO zM4S49Bk60nZD0!)$sI3<q`!w%K z6w47Wf`l{ICroZ&z2#P8HkI~>yRD`2&ZhZjM+)Tm++}mm>|qVF{2bM920|^H=S4;q zt)MNmzCnCRuP^Z|rpX-2^c9o<%%MWd7e{@)n2|tZZNrS5hfU IM9g6MH|Da*IsgCw literal 0 HcmV?d00001 diff --git a/target/classes/holland/andres/ChangeName.class b/target/classes/holland/andres/ChangeName.class new file mode 100644 index 0000000000000000000000000000000000000000..f8c692dbe38fecb9cca2d2590c1513e17d42a170 GIT binary patch literal 572 zcmZ`$O;5r=5Pic(s}%uJ5X6JtieHUqjENyJ9vVDgxG!Y`OUgDW#sB3+6A%6Xf0S{y zG$Db|WM}eb-n@B}{{DUc0Jz7wg91(*)X}hUYNJW89+XzeBO&j0hJ->d8cRaOS6cR$ z^O20-#3p6?!83VlKP9AxIJ7*4^Yi z1wpjbN!Oo=cj2+Z#2X~B(vz<7VvALq(A+i1hBa?7_O>Jl&LCRGfqYixfXdp`o#B>H zgk_^u!Wr6x*3J_M)wTBPXeNV%(Ac17mk`PenPkA+PpG@w);dF6BG3QAd^wP@!qH~r zaVE~it1r+;+TP=6+Tf9Wj-?d=4h|R*<3o;S_=UytoUQAdPvq9q4%b;SU1Jn3R;*0H TsFzVmRV`F;lv=7WFNfoQ^ZtF3 literal 0 HcmV?d00001 diff --git a/target/classes/holland/andres/CloseAccount.class b/target/classes/holland/andres/CloseAccount.class new file mode 100644 index 0000000000000000000000000000000000000000..4f023f0687a0fdf161ff4acc76e652bc2e11ed2b GIT binary patch literal 651 zcmaJ;O;5r=5PeHqinS_KK@?H&D@76;&lnShn3xbfV7PeNmIg{{o0Q`J@`8y6e}F&A zI9nhXj5g`a&di&6Z+1Vw-ai0b;8cT(Z4E{22(z0(N%%b#Wfl7j=}Ry0;wuKptaTaW zX4rEXHrig`-jAPcH+tl@PZ^^fI^6H_$P@7_DaQkE#87SzLf_{>&!RtaM^@7hNA9)b zgySG?Fer|Q8A|3daE=kwDxWqm6#s$|$mT@k&@k3w&^qBba@<=_D9rt2JsFGGe2`TzVI73zpv52p4J=jCni5Ut@4YLJ^z3;}e;ASq7u9QUP zM!zev*%B*f7o|?j<1yW3-fS;eJ8|R%{YI^eD$?|h;!A;vwa97|S>zdc zO(#hSI-T_?0BcyMh~5@ivZDD35@hnZ`UI)Fx;cSVH{=PF#ULXAq@fVIM!Z>K7DFr4 YN{zFj;*^6yV->1yVk=RZCqxQ`Z&*}|MF0Q* literal 0 HcmV?d00001 diff --git a/target/classes/holland/andres/CreditAccount.class b/target/classes/holland/andres/CreditAccount.class new file mode 100644 index 0000000000000000000000000000000000000000..130f26d03c33143e484516d56cf0866fb890c75e GIT binary patch literal 812 zcmaJ<%Wl&^6g`vJaWO6>p$%y%p$#v)fm%pxcnAp+At6O{5tIeHi8D%FxiU(bmEIBU`X#FdXVDebQ3Wz?P zESGsf4voQ){2+a@nEJy!4dW^MT4TvTK>GGDDbhf_3`;G)@!Qvh4lcm9aNEHh+;!l> z<1CVQDz>oapo@DB?qi<<{-;#n@)?PP@sSG1vU#pzA(**SwH(oKA!6P2{wAY-mib~S zh}T8=zx11nW=Op+WR$&{#!0GrGNbqn_fJ$k?s|60;1t(z``!q2N76g`u8$>P!`Bq60OrL0Z@4QnMJsze)AMT#g=P#$=jBqnv0+F(2V7C?ML zUw8=;4?H723UMY|qq11?9pAZU&OPUjfByRR9l(7&P9cdaDXinF3L7e1OW=A6H*ixW zw@lnNVG9^F*K?z7fw*02323{1*AZB3xSsQJaNKr+*RtK`PPXB9WWOZ?SLKsUEjn~V zfwjh=-|tJWTjd)#VYTkG-ROCz;}5*(nSkC^xxlJ@9yrC+OK${BIX)p!{1=XT<*{NF z5OpSDB%=WpWE)5FL{_PxS8Yat>-E?+>7O`3H;``?TJg6f0Uer2HT^-*arRv0EHkfm zQ}I|xA#I{$p^S=!JGg6M6ID*ff9H56?pYl10}BuFNMPkZ-UXJi4m`rhagX*6?2v@^BL>*c`aPu;EY$Z>!lVpkl+ueo)|b@q!}${Rjz`oUj7R4WmH~ZG)9|o zT;R7g24E3O%-953Ms@fHbkYL*l_6qJHOBas&Zs>xmbI)tgz*vCy#5Ibm7-zyhA_3$ zSs`Z^jSrvaOYu{3#i06^DN(5~V6sz!9h0<>Mu}O4s%lhIr=C4ll*Vl$sbiv1eO*Lu jqW;!&p&3e39Z0Z^>gQ3ew7X>L+30CJ%4yS6O-YP z;p_i#3z*V%gQ*|21-6s<-^4CT+_0VrSni1VRaZ_}?rt*Vnxatu6pO`&hon2 zmM*Y>GS*mcqMNyzKq+o-f9|KcJ5uf!wo^b8ErIMe?ATQ#5wRdNdXR?viAg2 z*CJ3}jO%^>T)B}z(G8W1)NL)b>hesNkxy^+oOAJH1e(?4SZ*e{99rw)042UGy;5LN zSmSQ<=Fke-Z2b!2=ghs%JvRf>*xVZl!|zJf(=3*uw*)iSCn=!ofc<-M^0j literal 0 HcmV?d00001 diff --git a/target/test-classes/holland/andres/AccountTest.class b/target/test-classes/holland/andres/AccountTest.class new file mode 100644 index 0000000000000000000000000000000000000000..20b7cd633443ae8ae608a963185961ea55082004 GIT binary patch literal 288 zcmZ`!O>4qH5PcK#(Z<+_$Ku6X+k;Eb6`=^8f*us_n{}xxX%>=A|5r~15B>mulyo8< zytugcDO5HzjmlUN;1PX1AJ Date: Thu, 19 Jan 2017 08:09:52 -0500 Subject: [PATCH 2/3] Added Unit Tests and Made Small Changes To Program --- .idea/compiler.xml | 2 +- .idea/workspace.xml | 418 ++++++++++++++---- Access_Control_Lab.iml | 2 +- src/main/java/holland/andres/Account.java | 41 +- .../java/holland/andres/DebitAccount.java | 4 +- src/main/java/holland/andres/Main.java | 10 +- src/test/java/holland/andres/AccountTest.java | 38 ++ .../java/holland/andres/ChangeNameTest.java | 26 ++ .../java/holland/andres/CloseAccountTest.java | 25 ++ .../holland/andres/CreditAccountTest.java | 37 ++ .../java/holland/andres/DebitAccountTest.java | 51 +++ target/classes/holland/andres/Account.class | Bin 1516 -> 1695 bytes .../holland/andres/BalanceInquiry.class | Bin 887 -> 921 bytes .../classes/holland/andres/ChangeName.class | Bin 572 -> 572 bytes .../classes/holland/andres/CloseAccount.class | Bin 651 -> 651 bytes .../holland/andres/CreditAccount.class | Bin 812 -> 846 bytes .../classes/holland/andres/DebitAccount.class | Bin 929 -> 980 bytes target/classes/holland/andres/Main.class | Bin 856 -> 828 bytes .../holland/andres/AccountTest.class | Bin 288 -> 1646 bytes .../holland/andres/ChangeNameTest.class | Bin 0 -> 1235 bytes .../holland/andres/CloseAccountTest.class | Bin 0 -> 1218 bytes .../holland/andres/CreditAccountTest.class | Bin 0 -> 1481 bytes .../holland/andres/DebitAccountTest.class | Bin 0 -> 1905 bytes 23 files changed, 536 insertions(+), 118 deletions(-) create mode 100644 src/test/java/holland/andres/AccountTest.java create mode 100644 src/test/java/holland/andres/ChangeNameTest.java create mode 100644 src/test/java/holland/andres/CloseAccountTest.java create mode 100644 src/test/java/holland/andres/CreditAccountTest.java create mode 100644 src/test/java/holland/andres/DebitAccountTest.java create mode 100644 target/test-classes/holland/andres/ChangeNameTest.class create mode 100644 target/test-classes/holland/andres/CloseAccountTest.class create mode 100644 target/test-classes/holland/andres/CreditAccountTest.class create mode 100644 target/test-classes/holland/andres/DebitAccountTest.class diff --git a/.idea/compiler.xml b/.idea/compiler.xml index be05be0..6a906ca 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -10,7 +10,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 74519a3..601028e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,32 +2,29 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -43,18 +40,7 @@ - - - - - - - - - - - - + @@ -100,7 +92,7 @@ @@ -121,9 +113,9 @@ + - @@ -157,6 +149,10 @@ @@ -209,9 +205,9 @@ - + - + @@ -226,25 +222,135 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -627,12 +733,20 @@ - - + + + + + + - - + + + + + + @@ -647,47 +761,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + file://$PROJECT_DIR$/src/test/java/holland/andres/CloseAccountTest.java + 8 + + + + file://$PROJECT_DIR$/src/test/java/holland/andres/CloseAccountTest.java + 6 + + + + @@ -719,44 +912,55 @@ - + + + + - - + + - + + - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - + - - - + - - - + + + + + - + @@ -764,6 +968,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -772,7 +1004,6 @@ - @@ -781,11 +1012,13 @@ - + - - - + + + + + @@ -854,6 +1087,7 @@ + Maven: junit:junit:4.12