Next Commit

.idea/workspace.xml

@@ -3,7 +3,9 @@
   <component name="ChangeListManager">
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -19,8 +21,17 @@
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="30">
-              <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="35" selection-end-column="5" />
+            <state relative-caret-position="-383">
+              <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="CheckingAccountTest.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="389">
+              <caret line="74" column="12" selection-start-line="74" selection-start-column="12" selection-end-line="74" selection-end-column="12" />
             </state>
           </provider>
         </entry>
@@ -46,8 +57,8 @@
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="2010">
-              <caret line="134" column="83" selection-start-line="134" selection-start-column="83" selection-end-line="134" selection-end-column="83" />
+            <state relative-caret-position="668">
+              <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
@@ -103,13 +114,13 @@
         <option value="$PROJECT_DIR$/src/test/java/BankAccountTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/TestAtm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
       </list>
     </option>
@@ -133,7 +144,7 @@
   <component name="ProjectFrameBounds">
     <option name="y" value="22" />
     <option name="width" value="1280" />
-    <option name="height" value="691" />
+    <option name="height" value="705" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -142,7 +153,48 @@
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
-    <panes />
+    <panes>
+      <pane id="AndroidView" />
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="bankaccountlab" type="462c0819:PsiDirectoryNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+    </panes>
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
@@ -216,7 +268,7 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="CheckingAccountTest.testPay_WriteCheck" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="CheckingAccountTest.testGetAccountNumber" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="bankaccountlab" />
       <extension name="coverage">
         <pattern>
@@ -228,7 +280,7 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
-      <option name="METHOD_NAME" value="testPay_WriteCheck" />
+      <option name="METHOD_NAME" value="testGetAccountNumber" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -239,7 +291,7 @@
       </option>
       <patterns />
     </configuration>
-    <configuration name="CheckingAccountTest.test_Get_Balance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+    <configuration name="CheckingAccountTest.testPay_WriteCheck" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="bankaccountlab" />
       <extension name="coverage">
         <pattern>
@@ -251,7 +303,7 @@
       <option name="ALTERNATIVE_JRE_PATH" />
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
-      <option name="METHOD_NAME" value="test_Get_Balance" />
+      <option name="METHOD_NAME" value="testPay_WriteCheck" />
       <option name="TEST_OBJECT" value="method" />
       <option name="VM_PARAMETERS" value="-ea" />
       <option name="PARAMETERS" />
@@ -365,18 +417,18 @@
     </configuration>
     <list>
       <item itemvalue="JUnit.CheckingAccountTest" />
-      <item itemvalue="JUnit.CheckingAccountTest.test_Get_Balance" />
       <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
       <item itemvalue="JUnit.TestAtm.testGetBalance" />
       <item itemvalue="Application.MainApplication" />
+      <item itemvalue="JUnit.CheckingAccountTest.testGetAccountNumber" />
     </list>
     <recent_temporary>
       <list>
         <item itemvalue="Application.MainApplication" />
+        <item itemvalue="JUnit.CheckingAccountTest.testGetAccountNumber" />
         <item itemvalue="JUnit.TestAtm.testGetBalance" />
         <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
         <item itemvalue="JUnit.CheckingAccountTest" />
-        <item itemvalue="JUnit.CheckingAccountTest.test_Get_Balance" />
       </list>
     </recent_temporary>
   </component>
@@ -402,14 +454,12 @@
       <workItem from="1530104705459" duration="11034000" />
       <workItem from="1530147701778" duration="3578000" />
       <workItem from="1530226930930" duration="4715000" />
-      <workItem from="1530276094513" duration="1629000" />
+      <workItem from="1530276094513" duration="2364000" />
+      <workItem from="1530299154357" duration="1628000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="BankAccountTest - 2018.06.26 at 18h 50m 04s.xml">
-      <configuration name="BankAccountTest" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="CheckingAccountTest - 2018.06.26 at 19h 21m 50s.xml">
       <configuration name="CheckingAccountTest" configurationId="JUnit" />
     </history-entry>
@@ -437,16 +487,20 @@
     <history-entry file="TestAtm_testGetBalance - 2018.06.27 at 14h 45m 51s.xml">
       <configuration name="TestAtm.testGetBalance" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="CheckingAccountTest_testGetAccountNumber - 2018.06.29 at 15h 49m 31s.xml">
+      <configuration name="CheckingAccountTest.testGetAccountNumber" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="45871000" />
+    <option name="totallyTimeSpent" value="48234000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="22" width="1280" height="691" extended-state="6" />
+    <frame x="0" y="22" width="1280" height="705" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info anchor="right" id="Palette" order="3" />
       <window_info anchor="bottom" id="TODO" order="6" />
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32488114" />
       <window_info anchor="right" id="Palette&#9;" order="9" />
       <window_info id="Image Layers" order="7" />
       <window_info anchor="right" id="Capture Analysis" order="4" />
@@ -454,7 +508,7 @@
       <window_info anchor="right" id="Maven Projects" order="5" />
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
       <window_info anchor="bottom" id="Version Control" order="9" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32110092" />
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.23613313" />
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32901135" />
       <window_info id="Capture Tool" order="4" />
       <window_info id="Designer" order="2" />
@@ -466,7 +520,6 @@
       <window_info anchor="right" id="Theme Preview" order="7" />
       <window_info id="Favorites" order="5" side_tool="true" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32683486" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info id="Nl-Palette" order="6" />
@@ -675,17 +728,10 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="120">
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
-          <caret line="4" column="112" selection-start-line="4" selection-start-column="112" selection-end-line="4" selection-end-column="112" />
+        <state relative-caret-position="45">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
         </state>
       </provider>
     </entry>
@@ -700,31 +746,38 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
-          <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
+          <caret line="4" column="112" selection-start-line="4" selection-start-column="112" selection-end-line="4" selection-end-column="112" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="45">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
+        <state relative-caret-position="-383">
+          <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="60">
+          <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="30">
-          <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="35" selection-end-column="5" />
+        <state relative-caret-position="389">
+          <caret line="74" column="12" selection-start-line="74" selection-start-column="12" selection-end-line="74" selection-end-column="12" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="2010">
-          <caret line="134" column="83" selection-start-line="134" selection-start-column="83" selection-end-line="134" selection-end-column="83" />
+        <state relative-caret-position="668">
+          <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>

src/main/java/com/zipcodewilmington/bankaccountlab/Account.java

@@ -7,6 +7,7 @@ public abstract class Account {
     private String email;
     public int pin;
     public double balance;
+    protected long accountNumber;
 
 
     public Account(){
@@ -37,7 +38,6 @@ public abstract class Account {
 
 
 
-
     public void setEmail(String email){
         this.email = email;
     }
@@ -64,4 +64,9 @@ public abstract class Account {
         System.out.println(balance);
         return balance;
     }
+
+    public long getAccountNumber(){
+
+        return accountNumber;
+    }
 }

src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java

@@ -11,10 +11,15 @@ import java.util.Scanner;
 
 public class MainApplication {
 
-    private static String name;
-    private static String email;
-    private static String address;
-    private static int pin;
+    private String name;
+    private String email;
+    private String address;
+    private int pin;
+    private long accountNumber;
+   // private static String name;
+   // private static String email;
+   // private static String address;
+   // private static int pin;
     private boolean runCommandCenter = true;
     private CheckingAccount checkingAccount;
     private BusinessAccount businessAccount;
@@ -49,12 +54,12 @@ public class MainApplication {
         System.out.println("Create a pin number.");
         pin = scannerr.nextInt();
 
-        long accountNumber = Math.round(Math.random() * 999999999);
+        this.accountNumber = Math.round(Math.random() * 999999999);
             double balance = 00000.00;
 
-            createBusinessAccount(name, email, address, pin, accountNumber, balance);
-            createSavingsAccount(name, email, address, pin, accountNumber, balance);
-            createCheckingAccount(name, email, address, pin, accountNumber, balance);
+            createBusinessAccount(this.name, this.email, this.address, this.pin, this.accountNumber, balance);
+            createSavingsAccount(this.name, this.email, this.address, this.pin, this.accountNumber, balance);
+            createCheckingAccount(this.name, this.email, this.address, this.pin, this.accountNumber, balance);
 
         while(runCommandCenter){
             commandCenter();
@@ -68,7 +73,7 @@ public class MainApplication {
 
 
         System.out.println("Choose a command");
-        System.out.println("'1' - Get the balance of your Checking Account \n'2' - Get the balance of your Savings Account \n'3' - Get balance of your Business Account\n'4' - Deposit money to your Checking Account\n'5' - Deposit money to your Savings Account\n'6' - Deposit money to your Business Account\n'7' - Withdraw money from your Checking Account\n'8' - Withdraw money from your Savings Account\n'9' - Withdraw money from your Business Account\n'10' - Change the pin of your accounts\n'11' - Turn ATM off\n'12' - Forgot pin");
+        System.out.println("'1' - Get the balance of your Checking Account \n'2' - Get the balance of your Savings Account \n'3' - Get balance of your Business Account\n'4' - Deposit money to your Checking Account\n'5' - Deposit money to your Savings Account\n'6' - Deposit money to your Business Account\n'7' - Withdraw money from your Checking Account\n'8' - Withdraw money from your Savings Account\n'9' - Withdraw money from your Business Account\n'10' - Change the pin of your accounts\n'11' - Turn ATM off\n'12' - Forgot pin\n'13' - Forgot name\n'14' - Forgot email\n'15' - Forgot address\n'16' - Trick Input :)\n'17' - Get Account Number");
         int userInput = scanner.nextInt();
 
         switch(userInput){
@@ -133,7 +138,21 @@ public class MainApplication {
 
             case 12:
                 System.out.println("Your pin number is " + businessAccount.getPin());
+                break;
+
+            case 13:
+                System.out.println("Your name is " + businessAccount.getName());
+                break;
+
+            case 14:
+                System.out.println("Your email address is " + businessAccount.getEmail());
+                break;
+
+            case 15:
+                System.out.println("Your address is " + businessAccount.getAddress());
 
+            case 17:
+                System.out.println("Your account number is " + businessAccount.getAccountNumber());
         }
 
     }

src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java

@@ -66,5 +66,16 @@ public class CheckingAccountTest {
         Assert.assertEquals(541.73 , 555.55 - amountToPay, 541.73);
     }
 
+    @Test
+    public void testGetAccountNumber(){
+        CheckingAccount checkingAccount = new CheckingAccount();
+
+        MainApplication mainApplication = new MainApplication();
+
+        long actual = checkingAccount.getAccountNumber();
+
+        Assert.assertTrue(actual > 0 && actual < 999999999);
+    }
+
 
 }