From 3c0269374d8b219fd5fba077bd102da8fab00823 Mon Sep 17 00:00:00 2001 From: David Trombello Date: Sat, 26 Oct 2019 12:11:56 -0400 Subject: [PATCH 1/9] classes and tests added --- pom.xml | 18 ++++++++++++++++++ src/main/java/AccountClasses/Account.java | 4 ++++ src/main/java/AccountClasses/Checking.java | 4 ++++ src/main/java/AccountClasses/Investment.java | 4 ++++ src/main/java/AccountClasses/Savings.java | 4 ++++ src/main/java/ConsoleClasses/Console.java | 4 ++++ src/main/java/ConsoleClasses/ConsoleMock.java | 4 ++++ src/main/java/Error.java | 2 ++ src/main/java/User.java | 2 ++ src/test/java/AccountClasses/CheckingTest.java | 7 +++++++ .../java/AccountClasses/InvestmentTest.java | 7 +++++++ src/test/java/AccountClasses/SavingsTest.java | 7 +++++++ src/test/java/UserTest.java | 7 +++++++ 13 files changed, 74 insertions(+) create mode 100644 src/main/java/AccountClasses/Account.java create mode 100644 src/main/java/AccountClasses/Checking.java create mode 100644 src/main/java/AccountClasses/Investment.java create mode 100644 src/main/java/AccountClasses/Savings.java create mode 100644 src/main/java/ConsoleClasses/Console.java create mode 100644 src/main/java/ConsoleClasses/ConsoleMock.java create mode 100644 src/main/java/Error.java create mode 100644 src/main/java/User.java create mode 100644 src/test/java/AccountClasses/CheckingTest.java create mode 100644 src/test/java/AccountClasses/InvestmentTest.java create mode 100644 src/test/java/AccountClasses/SavingsTest.java create mode 100644 src/test/java/UserTest.java diff --git a/pom.xml b/pom.xml index 9901415..74e0b84 100644 --- a/pom.xml +++ b/pom.xml @@ -8,5 +8,23 @@ project-2-atm 1.0-SNAPSHOT + + + org.junit.jupiter + junit-jupiter-engine + 5.4.2 + test + + + org.junit.jupiter + junit-jupiter-api + 5.4.2 + test + + + + + + \ No newline at end of file diff --git a/src/main/java/AccountClasses/Account.java b/src/main/java/AccountClasses/Account.java new file mode 100644 index 0000000..5393f43 --- /dev/null +++ b/src/main/java/AccountClasses/Account.java @@ -0,0 +1,4 @@ +package AccountClasses; + +public abstract class Account { +} diff --git a/src/main/java/AccountClasses/Checking.java b/src/main/java/AccountClasses/Checking.java new file mode 100644 index 0000000..419d5c3 --- /dev/null +++ b/src/main/java/AccountClasses/Checking.java @@ -0,0 +1,4 @@ +package AccountClasses; + +public class Checking { +} diff --git a/src/main/java/AccountClasses/Investment.java b/src/main/java/AccountClasses/Investment.java new file mode 100644 index 0000000..6e00eb1 --- /dev/null +++ b/src/main/java/AccountClasses/Investment.java @@ -0,0 +1,4 @@ +package AccountClasses; + +public class Investment { +} diff --git a/src/main/java/AccountClasses/Savings.java b/src/main/java/AccountClasses/Savings.java new file mode 100644 index 0000000..8d83a3d --- /dev/null +++ b/src/main/java/AccountClasses/Savings.java @@ -0,0 +1,4 @@ +package AccountClasses; + +public class Savings { +} diff --git a/src/main/java/ConsoleClasses/Console.java b/src/main/java/ConsoleClasses/Console.java new file mode 100644 index 0000000..82748c2 --- /dev/null +++ b/src/main/java/ConsoleClasses/Console.java @@ -0,0 +1,4 @@ +package ConsoleClasses; + +public class Console { +} diff --git a/src/main/java/ConsoleClasses/ConsoleMock.java b/src/main/java/ConsoleClasses/ConsoleMock.java new file mode 100644 index 0000000..6c92d70 --- /dev/null +++ b/src/main/java/ConsoleClasses/ConsoleMock.java @@ -0,0 +1,4 @@ +package ConsoleClasses; + +public class ConsoleMock { +} diff --git a/src/main/java/Error.java b/src/main/java/Error.java new file mode 100644 index 0000000..1cea6c0 --- /dev/null +++ b/src/main/java/Error.java @@ -0,0 +1,2 @@ +public class Error { +} diff --git a/src/main/java/User.java b/src/main/java/User.java new file mode 100644 index 0000000..52dda73 --- /dev/null +++ b/src/main/java/User.java @@ -0,0 +1,2 @@ +public class User { +} diff --git a/src/test/java/AccountClasses/CheckingTest.java b/src/test/java/AccountClasses/CheckingTest.java new file mode 100644 index 0000000..7967d58 --- /dev/null +++ b/src/test/java/AccountClasses/CheckingTest.java @@ -0,0 +1,7 @@ +package AccountClasses; + +import static org.junit.jupiter.api.Assertions.*; + +class CheckingTest { + +} \ No newline at end of file diff --git a/src/test/java/AccountClasses/InvestmentTest.java b/src/test/java/AccountClasses/InvestmentTest.java new file mode 100644 index 0000000..efa6b7c --- /dev/null +++ b/src/test/java/AccountClasses/InvestmentTest.java @@ -0,0 +1,7 @@ +package AccountClasses; + +import static org.junit.jupiter.api.Assertions.*; + +class InvestmentTest { + +} \ No newline at end of file diff --git a/src/test/java/AccountClasses/SavingsTest.java b/src/test/java/AccountClasses/SavingsTest.java new file mode 100644 index 0000000..a91050a --- /dev/null +++ b/src/test/java/AccountClasses/SavingsTest.java @@ -0,0 +1,7 @@ +package AccountClasses; + +import static org.junit.jupiter.api.Assertions.*; + +class SavingsTest { + +} \ No newline at end of file diff --git a/src/test/java/UserTest.java b/src/test/java/UserTest.java new file mode 100644 index 0000000..9cbe830 --- /dev/null +++ b/src/test/java/UserTest.java @@ -0,0 +1,7 @@ +package java; + +import static org.junit.jupiter.api.Assertions.*; + +class UserTest { + +} \ No newline at end of file From 600f89e23ba4f3adc3c010171d6e173bcc82a2c5 Mon Sep 17 00:00:00 2001 From: David Trombello Date: Sat, 26 Oct 2019 12:13:40 -0400 Subject: [PATCH 2/9] updated pom for apache --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 74e0b84..f279569 100644 --- a/pom.xml +++ b/pom.xml @@ -22,6 +22,11 @@ test + + org.apache.commons + commons-lang3 + 3.9 + From 58e2a02fe945c83716e7661fb17e0de29e2cfa90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kwam=C3=A8=20Warrick?= Date: Sat, 26 Oct 2019 12:55:54 -0400 Subject: [PATCH 3/9] I added in the scanner Package and Console Methods --- .DS_Store | Bin 0 -> 6148 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/main/.DS_Store | Bin 0 -> 6148 bytes src/main/java/ConsoleClasses/Console.java | 28 +++++++++++++++++++++- 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 .DS_Store create mode 100644 src/.DS_Store create mode 100644 src/main/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..dd08f579fc19d369bbefe5b2cdc2fd40d51a1586 GIT binary patch literal 6148 zcmeHK&2G~`5S~p^x(-6*fYcuMg2W-J(n5bEgk;k6&;t^}h#sJ7?K+~CTyGRRgf>m( z*J$6MkHQo1I54xjiAYnf5k)i7>^D0*vnzjV?|1<~vrd*3 z!KoewMOX~-cG&++z4u{p8aex;*6Gv^qfbe9c+_~dtFt0ZvTolbCvg`;z8oZ3tcPtq z$l~106W9SMJ?R}aR!5_a&CRCT*xDI4)o6RW)l{!uZjHyDTzS6!X8-u?{9<%DzPct} z@EgF7z{pdF6SzUck?<|(XQ|GX7RZYaX6j`J%M4#Ky{Ei=Fj%ra25-3HbFy}#f8XOpY+mKQu5%u6+M$OVhPUCke=LjYc4E zyg+*Jj0=+de+F>xQmn^Z=Ckn2{vE>H?z<9I$UM#)5Bp}HU%h_d52HfijVF?+mDM#N zG9t5)xpum8>_l!f8rIywB|e?HQP(r}nUulYcD-}IGj3+Lj%66Re%KkPWWU{kkgE$n zY|C*?j>7g(t>fqkA<`n<%;qMOQn{SBN|l3Y-kMaag}k-DSD8-JVtc1})M)kYA105} zr)Rwv96nSfn+9j_0>-?+J7*9EGQ0)fEPfV8NDL4I#K00TV2(Diz67;U3B&*~@VgA) z`Cx$}+6H5d>ga$$wE%!Aa4P{@{rUr1=m4}0#u~u`!gVU3PUWV>;HGonIvwV16CZ2T z>5Qv4!#d{8+;k}1G#=bi;f&iFX(R@SfzJ$J?+22_`~T$U{$B;rKnxHA%gF#w)t!0` zYBP81LX~*eTA(dZ6pV{C&QripS24umRh$D=0)7h(K-*xf5j-IDBcN!Yff)Ex20j3% C&RX>V literal 0 HcmV?d00001 diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..345b6ff945064e6b5b5be6cf9330845cf1d054d2 GIT binary patch literal 6148 zcmeHKQA+|r5Z+a*)rfou^6_4R9(+(s4I((q9()Tf>Y+mKQu5-u4Ly}IYOBuCke=LjYc4^ zyg+*Jj0=+de+F>xQtXDgY{=X%`?n8s+wV$LA+tDd)W0+P{Oa8Wem^P{-gqLJT3TKa zA|oxZ45O7`0w2)Q`( z!?qmNQru83~o9HuG3-OHu14W zozA#=Gpu9Y%uR>FP2<5W70$S=kw#*G82HQp_I@B)y#J4W?*CN~4a5L3u$T<+RNbl9 zpf+>2&Q*zbtp(ZwMZvgO<17UXbrnM_Ud1_3CE&Nv0JIIp8o>iXKLUyd8i;{EW#9wm C6 Date: Sat, 26 Oct 2019 13:08:02 -0400 Subject: [PATCH 4/9] Added Scanner for Doubles in Console class --- src/main/java/ConsoleClasses/Console.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/ConsoleClasses/Console.java b/src/main/java/ConsoleClasses/Console.java index 797419e..1ca12a1 100644 --- a/src/main/java/ConsoleClasses/Console.java +++ b/src/main/java/ConsoleClasses/Console.java @@ -26,5 +26,11 @@ public static Integer getIntegerInput(String prompt) { return userInputInt; } + public static Double getDoubleInput(String prompt) { + Scanner scanner = new Scanner(System.in); + println(prompt); + Double userInputDouble = scanner.nextDouble(); + return userInputDouble; + } } From 6d10c5fd5668fa7a0dd7564ecc20f80fe3cad616 Mon Sep 17 00:00:00 2001 From: KaneKopetski Date: Sat, 26 Oct 2019 13:22:00 -0400 Subject: [PATCH 5/9] Add DB Query classes --- src/main/java/Persistence/CreateTables.java | 63 +++++++++++++++++++++ src/main/java/Persistence/InsertQuery.java | 4 ++ src/main/java/Persistence/SelectQuery.java | 4 ++ src/main/java/Persistence/UpdateQuery.java | 4 ++ 4 files changed, 75 insertions(+) create mode 100644 src/main/java/Persistence/CreateTables.java create mode 100644 src/main/java/Persistence/InsertQuery.java create mode 100644 src/main/java/Persistence/SelectQuery.java create mode 100644 src/main/java/Persistence/UpdateQuery.java diff --git a/src/main/java/Persistence/CreateTables.java b/src/main/java/Persistence/CreateTables.java new file mode 100644 index 0000000..30c1741 --- /dev/null +++ b/src/main/java/Persistence/CreateTables.java @@ -0,0 +1,63 @@ +package Persistence; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; + +public class CreateTables { + // JDBC driver name and database URL + static final String JDBC_DRIVER = "org.h2.Driver"; + static final String DB_URL = "jdbc:h2:mem:atmDB"; + + // Database credentials + static final String USER = ""; + static final String PASS = ""; + + public static void main(String[] args) { + Connection conn = null; + Statement stmt = null; + try { + // STEP 1: Register JDBC driver + Class.forName(JDBC_DRIVER); + + //STEP 2: Open a connection + System.out.println("Connecting to database..."); + conn = DriverManager.getConnection(DB_URL,USER,PASS); + + //STEP 3: Execute a query + System.out.println("Creating table in given database..."); + stmt = conn.createStatement(); + String sql = "CREATE TABLE REGISTRATION " + + "(id INTEGER not NULL, " + + " first VARCHAR(255), " + + " last VARCHAR(255), " + + " age INTEGER, " + + " PRIMARY KEY ( id ))"; + stmt.executeUpdate(sql); + System.out.println("Created table in given database..."); + + // STEP 4: Clean-up environment + stmt.close(); + conn.close(); + } catch(SQLException se) { + //Handle errors for JDBC + se.printStackTrace(); + } catch(Exception e) { + //Handle errors for Class.forName + e.printStackTrace(); + } finally { + //finally block used to close resources + try{ + if(stmt!=null) stmt.close(); + } catch(SQLException se2) { + } // nothing we can do + try { + if(conn!=null) conn.close(); + } catch(SQLException se){ + se.printStackTrace(); + } //end finally try + } //end try + System.out.println("Goodbye!"); + } + } diff --git a/src/main/java/Persistence/InsertQuery.java b/src/main/java/Persistence/InsertQuery.java new file mode 100644 index 0000000..fc8fd69 --- /dev/null +++ b/src/main/java/Persistence/InsertQuery.java @@ -0,0 +1,4 @@ +package Persistence; + +public class InsertQuery { +} diff --git a/src/main/java/Persistence/SelectQuery.java b/src/main/java/Persistence/SelectQuery.java new file mode 100644 index 0000000..38d3252 --- /dev/null +++ b/src/main/java/Persistence/SelectQuery.java @@ -0,0 +1,4 @@ +package Persistence; + +public class SelectQuery { +} diff --git a/src/main/java/Persistence/UpdateQuery.java b/src/main/java/Persistence/UpdateQuery.java new file mode 100644 index 0000000..a2656b3 --- /dev/null +++ b/src/main/java/Persistence/UpdateQuery.java @@ -0,0 +1,4 @@ +package Persistence; + +public class UpdateQuery { +} From 734ca1b775c7c72a422882822d1c7a33aee09ce8 Mon Sep 17 00:00:00 2001 From: davidtrom <56596379+davidtrom@users.noreply.github.com> Date: Sat, 26 Oct 2019 17:00:16 -0400 Subject: [PATCH 6/9] Delete .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index dd08f579fc19d369bbefe5b2cdc2fd40d51a1586..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK&2G~`5S~p^x(-6*fYcuMg2W-J(n5bEgk;k6&;t^}h#sJ7?K+~CTyGRRgf>m( z*J$6MkHQo1I54xjiAYnf5k)i7>^D0*vnzjV?|1<~vrd*3 z!KoewMOX~-cG&++z4u{p8aex;*6Gv^qfbe9c+_~dtFt0ZvTolbCvg`;z8oZ3tcPtq z$l~106W9SMJ?R}aR!5_a&CRCT*xDI4)o6RW)l{!uZjHyDTzS6!X8-u?{9<%DzPct} z@EgF7z{pdF6SzUck?<|(XQ|GX7RZYaX6j`J%M4#Ky{Ei=Fj%ra25-3HbFy}#f8XOp Date: Sat, 26 Oct 2019 17:00:34 -0400 Subject: [PATCH 7/9] Delete .DS_Store --- src/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/.DS_Store diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index 397f77ba6fbdaf04b4b0cf7b9c588662b85657e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKQA+|r5Z+a*)rfou^6_4R9(+(s4I((q9()Tf>Y+mKQu5%u6+M$OVhPUCke=LjYc4E zyg+*Jj0=+de+F>xQmn^Z=Ckn2{vE>H?z<9I$UM#)5Bp}HU%h_d52HfijVF?+mDM#N zG9t5)xpum8>_l!f8rIywB|e?HQP(r}nUulYcD-}IGj3+Lj%66Re%KkPWWU{kkgE$n zY|C*?j>7g(t>fqkA<`n<%;qMOQn{SBN|l3Y-kMaag}k-DSD8-JVtc1})M)kYA105} zr)Rwv96nSfn+9j_0>-?+J7*9EGQ0)fEPfV8NDL4I#K00TV2(Diz67;U3B&*~@VgA) z`Cx$}+6H5d>ga$$wE%!Aa4P{@{rUr1=m4}0#u~u`!gVU3PUWV>;HGonIvwV16CZ2T z>5Qv4!#d{8+;k}1G#=bi;f&iFX(R@SfzJ$J?+22_`~T$U{$B;rKnxHA%gF#w)t!0` zYBP81LX~*eTA(dZ6pV{C&QripS24umRh$D=0)7h(K-*xf5j-IDBcN!Yff)Ex20j3% C&RX>V From c905c06edf8343ec256d6f5d4ad4f3697ef3f825 Mon Sep 17 00:00:00 2001 From: davidtrom <56596379+davidtrom@users.noreply.github.com> Date: Sat, 26 Oct 2019 17:00:43 -0400 Subject: [PATCH 8/9] Delete .DS_Store --- src/main/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/main/.DS_Store diff --git a/src/main/.DS_Store b/src/main/.DS_Store deleted file mode 100644 index 345b6ff945064e6b5b5be6cf9330845cf1d054d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKQA+|r5Z+a*)rfou^6_4R9(+(s4I((q9()Tf>Y+mKQu5-u4Ly}IYOBuCke=LjYc4^ zyg+*Jj0=+de+F>xQtXDgY{=X%`?n8s+wV$LA+tDd)W0+P{Oa8Wem^P{-gqLJT3TKa zA|oxZ45O7`0w2)Q`( z!?qmNQru83~o9HuG3-OHu14W zozA#=Gpu9Y%uR>FP2<5W70$S=kw#*G82HQp_I@B)y#J4W?*CN~4a5L3u$T<+RNbl9 zpf+>2&Q*zbtp(ZwMZvgO<17UXbrnM_Ud1_3CE&Nv0JIIp8o>iXKLUyd8i;{EW#9wm C6 Date: Sat, 26 Oct 2019 17:09:17 -0400 Subject: [PATCH 9/9] add account methods and configure tests --- pom.xml | 13 ++--- src/main/java/AccountClasses/Account.java | 38 ++++++++++++++ src/main/java/AccountClasses/Checking.java | 2 +- src/main/java/AccountClasses/Investment.java | 2 +- src/main/java/AccountClasses/Savings.java | 2 +- .../java/AccountClasses/CheckingTest.java | 52 ++++++++++++++++++- 6 files changed, 94 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index f279569..e5fd8d6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,18 +10,11 @@ - org.junit.jupiter - junit-jupiter-engine - 5.4.2 + junit + junit + 4.12 test - - org.junit.jupiter - junit-jupiter-api - 5.4.2 - test - - org.apache.commons commons-lang3 diff --git a/src/main/java/AccountClasses/Account.java b/src/main/java/AccountClasses/Account.java index 5393f43..f3d6aeb 100644 --- a/src/main/java/AccountClasses/Account.java +++ b/src/main/java/AccountClasses/Account.java @@ -1,4 +1,42 @@ package AccountClasses; public abstract class Account { + Double balance=0.00; + Integer counter=1; + String accountNum = "A" + counter; + + + public Account() { + balance = 0.00; + counter++; + //give account number; + } + + + + public Double getAccountBal() + { + return this.balance ; + } + + public String getAccountNum () + { + return this.accountNum; + } + + public Double withdraw(Double withdrawalAmt) { + //Error.checkIfEnough(withdrawalAmt, balance); + return this.balance - withdrawalAmt; + } + + public double deposit(Double depositAmt) { + + balance = balance + depositAmt; + return balance; + } + public Double transfer() + { + return null; + } + } diff --git a/src/main/java/AccountClasses/Checking.java b/src/main/java/AccountClasses/Checking.java index 419d5c3..73520ef 100644 --- a/src/main/java/AccountClasses/Checking.java +++ b/src/main/java/AccountClasses/Checking.java @@ -1,4 +1,4 @@ package AccountClasses; -public class Checking { +public class Checking extends Account { } diff --git a/src/main/java/AccountClasses/Investment.java b/src/main/java/AccountClasses/Investment.java index 6e00eb1..a93c6f2 100644 --- a/src/main/java/AccountClasses/Investment.java +++ b/src/main/java/AccountClasses/Investment.java @@ -1,4 +1,4 @@ package AccountClasses; -public class Investment { +public class Investment extends Account { } diff --git a/src/main/java/AccountClasses/Savings.java b/src/main/java/AccountClasses/Savings.java index 8d83a3d..9641666 100644 --- a/src/main/java/AccountClasses/Savings.java +++ b/src/main/java/AccountClasses/Savings.java @@ -1,4 +1,4 @@ package AccountClasses; -public class Savings { +public class Savings extends Account { } diff --git a/src/test/java/AccountClasses/CheckingTest.java b/src/test/java/AccountClasses/CheckingTest.java index 7967d58..77e9a8b 100644 --- a/src/test/java/AccountClasses/CheckingTest.java +++ b/src/test/java/AccountClasses/CheckingTest.java @@ -1,7 +1,55 @@ package AccountClasses; -import static org.junit.jupiter.api.Assertions.*; -class CheckingTest { +import org.junit.Assert; +import org.junit.Test; + +public class CheckingTest { + + + @Test + public void constructorTest() + { + Checking testCheck = new Checking(); + } + + @Test + public void withdrawTest () + { + Checking checkWithdraw = new Checking(); + Double expected = -20D; + Double actual = checkWithdraw.withdraw(20D); + Assert.assertEquals(expected, actual); + } + + @Test + public void withdrawTest2 () + { + Checking checkWithdraw = new Checking(); + Double expected = -50D; + Double actual = checkWithdraw.withdraw(50D); + Assert.assertEquals(expected, actual); + } + + @Test + public void getAccountBalTest1 () + { + Checking checkWithdraw = new Checking(); + Double expected = 0.0; + Double actual = checkWithdraw.getAccountBal(); + Assert.assertEquals(expected, actual); + } + + @Test + public void getAccountNum1 () { + Checking accountNum = new Checking(); + Checking accountNum2 = new Checking(); + Checking accountNum3 = new Checking(); + String expected = "A3"; + String actual = accountNum3.getAccountNum(); + Assert.assertEquals(expected, actual); + } + + } \ No newline at end of file