Arin Turpin před 8 roky
rodič
revize
8419a8eeaa

+ 95
- 42
.idea/workspace.xml Zobrazit soubor

3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
4
     <list default="true" id="268ab437-e0d5-4447-8401-9f321aad6d50" name="Default" comment="">
5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6
+      <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" />
6
       <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" />
7
       <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" />
8
+      <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" />
7
     </list>
9
     </list>
8
     <ignored path="$PROJECT_DIR$/out/" />
10
     <ignored path="$PROJECT_DIR$/out/" />
9
     <ignored path="$PROJECT_DIR$/target/" />
11
     <ignored path="$PROJECT_DIR$/target/" />
19
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
21
       <file leaf-file-name="Account.java" pinned="false" current-in-tab="false">
20
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
22
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
21
           <provider selected="true" editor-type-id="text-editor">
23
           <provider selected="true" editor-type-id="text-editor">
22
-            <state relative-caret-position="30">
23
-              <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="35" selection-end-column="5" />
24
+            <state relative-caret-position="-383">
25
+              <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
26
+            </state>
27
+          </provider>
28
+        </entry>
29
+      </file>
30
+      <file leaf-file-name="CheckingAccountTest.java" pinned="false" current-in-tab="false">
31
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
32
+          <provider selected="true" editor-type-id="text-editor">
33
+            <state relative-caret-position="389">
34
+              <caret line="74" column="12" selection-start-line="74" selection-start-column="12" selection-end-line="74" selection-end-column="12" />
24
             </state>
35
             </state>
25
           </provider>
36
           </provider>
26
         </entry>
37
         </entry>
46
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
57
       <file leaf-file-name="MainApplication.java" pinned="false" current-in-tab="true">
47
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
58
         <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
48
           <provider selected="true" editor-type-id="text-editor">
59
           <provider selected="true" editor-type-id="text-editor">
49
-            <state relative-caret-position="2010">
50
-              <caret line="134" column="83" selection-start-line="134" selection-start-column="83" selection-end-line="134" selection-end-column="83" />
60
+            <state relative-caret-position="668">
61
+              <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
51
               <folding>
62
               <folding>
52
                 <element signature="imports" expanded="true" />
63
                 <element signature="imports" expanded="true" />
53
               </folding>
64
               </folding>
103
         <option value="$PROJECT_DIR$/src/test/java/BankAccountTest.java" />
114
         <option value="$PROJECT_DIR$/src/test/java/BankAccountTest.java" />
104
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
115
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BankAccount.java" />
105
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
116
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/BankAccountTest.java" />
106
-        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
107
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
117
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java" />
108
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
118
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java" />
109
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java" />
119
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java" />
110
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
120
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/CheckingAccount.java" />
111
-        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
112
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/TestAtm.java" />
121
         <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/TestAtm.java" />
122
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java" />
123
+        <option value="$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java" />
113
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
124
         <option value="$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java" />
114
       </list>
125
       </list>
115
     </option>
126
     </option>
133
   <component name="ProjectFrameBounds">
144
   <component name="ProjectFrameBounds">
134
     <option name="y" value="22" />
145
     <option name="y" value="22" />
135
     <option name="width" value="1280" />
146
     <option name="width" value="1280" />
136
-    <option name="height" value="691" />
147
+    <option name="height" value="705" />
137
   </component>
148
   </component>
138
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
149
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
139
     <ConfirmationsSetting value="2" id="Add" />
150
     <ConfirmationsSetting value="2" id="Add" />
142
     <navigator proportions="" version="1">
153
     <navigator proportions="" version="1">
143
       <foldersAlwaysOnTop value="true" />
154
       <foldersAlwaysOnTop value="true" />
144
     </navigator>
155
     </navigator>
145
-    <panes />
156
+    <panes>
157
+      <pane id="AndroidView" />
158
+      <pane id="Scope" />
159
+      <pane id="PackagesPane" />
160
+      <pane id="ProjectPane">
161
+        <subPane>
162
+          <expand>
163
+            <path>
164
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
165
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
166
+            </path>
167
+            <path>
168
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
169
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
170
+              <item name="src" type="462c0819:PsiDirectoryNode" />
171
+            </path>
172
+            <path>
173
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
174
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
175
+              <item name="src" type="462c0819:PsiDirectoryNode" />
176
+              <item name="test" type="462c0819:PsiDirectoryNode" />
177
+            </path>
178
+            <path>
179
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
180
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
181
+              <item name="src" type="462c0819:PsiDirectoryNode" />
182
+              <item name="test" type="462c0819:PsiDirectoryNode" />
183
+              <item name="java" type="462c0819:PsiDirectoryNode" />
184
+            </path>
185
+            <path>
186
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="b2602c69:ProjectViewProjectNode" />
187
+              <item name="ZCW-Inheritance-AbstractBankAccount" type="462c0819:PsiDirectoryNode" />
188
+              <item name="src" type="462c0819:PsiDirectoryNode" />
189
+              <item name="test" type="462c0819:PsiDirectoryNode" />
190
+              <item name="java" type="462c0819:PsiDirectoryNode" />
191
+              <item name="bankaccountlab" type="462c0819:PsiDirectoryNode" />
192
+            </path>
193
+          </expand>
194
+          <select />
195
+        </subPane>
196
+      </pane>
197
+    </panes>
146
   </component>
198
   </component>
147
   <component name="PropertiesComponent">
199
   <component name="PropertiesComponent">
148
     <property name="WebServerToolWindowFactoryState" value="false" />
200
     <property name="WebServerToolWindowFactoryState" value="false" />
216
       </option>
268
       </option>
217
       <patterns />
269
       <patterns />
218
     </configuration>
270
     </configuration>
219
-    <configuration name="CheckingAccountTest.testPay_WriteCheck" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
271
+    <configuration name="CheckingAccountTest.testGetAccountNumber" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
220
       <module name="bankaccountlab" />
272
       <module name="bankaccountlab" />
221
       <extension name="coverage">
273
       <extension name="coverage">
222
         <pattern>
274
         <pattern>
228
       <option name="ALTERNATIVE_JRE_PATH" />
280
       <option name="ALTERNATIVE_JRE_PATH" />
229
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
281
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
230
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
282
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
231
-      <option name="METHOD_NAME" value="testPay_WriteCheck" />
283
+      <option name="METHOD_NAME" value="testGetAccountNumber" />
232
       <option name="TEST_OBJECT" value="method" />
284
       <option name="TEST_OBJECT" value="method" />
233
       <option name="VM_PARAMETERS" value="-ea" />
285
       <option name="VM_PARAMETERS" value="-ea" />
234
       <option name="PARAMETERS" />
286
       <option name="PARAMETERS" />
239
       </option>
291
       </option>
240
       <patterns />
292
       <patterns />
241
     </configuration>
293
     </configuration>
242
-    <configuration name="CheckingAccountTest.test_Get_Balance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
294
+    <configuration name="CheckingAccountTest.testPay_WriteCheck" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
243
       <module name="bankaccountlab" />
295
       <module name="bankaccountlab" />
244
       <extension name="coverage">
296
       <extension name="coverage">
245
         <pattern>
297
         <pattern>
251
       <option name="ALTERNATIVE_JRE_PATH" />
303
       <option name="ALTERNATIVE_JRE_PATH" />
252
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
304
       <option name="PACKAGE_NAME" value="com.zipcodewilmington.bankaccountlab" />
253
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
305
       <option name="MAIN_CLASS_NAME" value="com.zipcodewilmington.bankaccountlab.CheckingAccountTest" />
254
-      <option name="METHOD_NAME" value="test_Get_Balance" />
306
+      <option name="METHOD_NAME" value="testPay_WriteCheck" />
255
       <option name="TEST_OBJECT" value="method" />
307
       <option name="TEST_OBJECT" value="method" />
256
       <option name="VM_PARAMETERS" value="-ea" />
308
       <option name="VM_PARAMETERS" value="-ea" />
257
       <option name="PARAMETERS" />
309
       <option name="PARAMETERS" />
365
     </configuration>
417
     </configuration>
366
     <list>
418
     <list>
367
       <item itemvalue="JUnit.CheckingAccountTest" />
419
       <item itemvalue="JUnit.CheckingAccountTest" />
368
-      <item itemvalue="JUnit.CheckingAccountTest.test_Get_Balance" />
369
       <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
420
       <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
370
       <item itemvalue="JUnit.TestAtm.testGetBalance" />
421
       <item itemvalue="JUnit.TestAtm.testGetBalance" />
371
       <item itemvalue="Application.MainApplication" />
422
       <item itemvalue="Application.MainApplication" />
423
+      <item itemvalue="JUnit.CheckingAccountTest.testGetAccountNumber" />
372
     </list>
424
     </list>
373
     <recent_temporary>
425
     <recent_temporary>
374
       <list>
426
       <list>
375
         <item itemvalue="Application.MainApplication" />
427
         <item itemvalue="Application.MainApplication" />
428
+        <item itemvalue="JUnit.CheckingAccountTest.testGetAccountNumber" />
376
         <item itemvalue="JUnit.TestAtm.testGetBalance" />
429
         <item itemvalue="JUnit.TestAtm.testGetBalance" />
377
         <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
430
         <item itemvalue="JUnit.CheckingAccountTest.testPay_WriteCheck" />
378
         <item itemvalue="JUnit.CheckingAccountTest" />
431
         <item itemvalue="JUnit.CheckingAccountTest" />
379
-        <item itemvalue="JUnit.CheckingAccountTest.test_Get_Balance" />
380
       </list>
432
       </list>
381
     </recent_temporary>
433
     </recent_temporary>
382
   </component>
434
   </component>
402
       <workItem from="1530104705459" duration="11034000" />
454
       <workItem from="1530104705459" duration="11034000" />
403
       <workItem from="1530147701778" duration="3578000" />
455
       <workItem from="1530147701778" duration="3578000" />
404
       <workItem from="1530226930930" duration="4715000" />
456
       <workItem from="1530226930930" duration="4715000" />
405
-      <workItem from="1530276094513" duration="1629000" />
457
+      <workItem from="1530276094513" duration="2364000" />
458
+      <workItem from="1530299154357" duration="1628000" />
406
     </task>
459
     </task>
407
     <servers />
460
     <servers />
408
   </component>
461
   </component>
409
   <component name="TestHistory">
462
   <component name="TestHistory">
410
-    <history-entry file="BankAccountTest - 2018.06.26 at 18h 50m 04s.xml">
411
-      <configuration name="BankAccountTest" configurationId="JUnit" />
412
-    </history-entry>
413
     <history-entry file="CheckingAccountTest - 2018.06.26 at 19h 21m 50s.xml">
463
     <history-entry file="CheckingAccountTest - 2018.06.26 at 19h 21m 50s.xml">
414
       <configuration name="CheckingAccountTest" configurationId="JUnit" />
464
       <configuration name="CheckingAccountTest" configurationId="JUnit" />
415
     </history-entry>
465
     </history-entry>
437
     <history-entry file="TestAtm_testGetBalance - 2018.06.27 at 14h 45m 51s.xml">
487
     <history-entry file="TestAtm_testGetBalance - 2018.06.27 at 14h 45m 51s.xml">
438
       <configuration name="TestAtm.testGetBalance" configurationId="JUnit" />
488
       <configuration name="TestAtm.testGetBalance" configurationId="JUnit" />
439
     </history-entry>
489
     </history-entry>
490
+    <history-entry file="CheckingAccountTest_testGetAccountNumber - 2018.06.29 at 15h 49m 31s.xml">
491
+      <configuration name="CheckingAccountTest.testGetAccountNumber" configurationId="JUnit" />
492
+    </history-entry>
440
   </component>
493
   </component>
441
   <component name="TimeTrackingManager">
494
   <component name="TimeTrackingManager">
442
-    <option name="totallyTimeSpent" value="45871000" />
495
+    <option name="totallyTimeSpent" value="48234000" />
443
   </component>
496
   </component>
444
   <component name="ToolWindowManager">
497
   <component name="ToolWindowManager">
445
-    <frame x="0" y="22" width="1280" height="691" extended-state="6" />
498
+    <frame x="0" y="22" width="1280" height="705" extended-state="0" />
446
     <editor active="true" />
499
     <editor active="true" />
447
     <layout>
500
     <layout>
448
       <window_info anchor="right" id="Palette" order="3" />
501
       <window_info anchor="right" id="Palette" order="3" />
449
       <window_info anchor="bottom" id="TODO" order="6" />
502
       <window_info anchor="bottom" id="TODO" order="6" />
503
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32488114" />
450
       <window_info anchor="right" id="Palette&#9;" order="9" />
504
       <window_info anchor="right" id="Palette&#9;" order="9" />
451
       <window_info id="Image Layers" order="7" />
505
       <window_info id="Image Layers" order="7" />
452
       <window_info anchor="right" id="Capture Analysis" order="4" />
506
       <window_info anchor="right" id="Capture Analysis" order="4" />
454
       <window_info anchor="right" id="Maven Projects" order="5" />
508
       <window_info anchor="right" id="Maven Projects" order="5" />
455
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
509
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
456
       <window_info anchor="bottom" id="Version Control" order="9" />
510
       <window_info anchor="bottom" id="Version Control" order="9" />
457
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32110092" />
511
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.23613313" />
458
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32901135" />
512
       <window_info anchor="bottom" id="Terminal" order="7" weight="0.32901135" />
459
       <window_info id="Capture Tool" order="4" />
513
       <window_info id="Capture Tool" order="4" />
460
       <window_info id="Designer" order="2" />
514
       <window_info id="Designer" order="2" />
466
       <window_info anchor="right" id="Theme Preview" order="7" />
520
       <window_info anchor="right" id="Theme Preview" order="7" />
467
       <window_info id="Favorites" order="5" side_tool="true" />
521
       <window_info id="Favorites" order="5" side_tool="true" />
468
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
522
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
469
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32683486" />
470
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
523
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
471
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
524
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
472
       <window_info id="Nl-Palette" order="6" />
525
       <window_info id="Nl-Palette" order="6" />
675
         </state>
728
         </state>
676
       </provider>
729
       </provider>
677
     </entry>
730
     </entry>
678
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
679
-      <provider selected="true" editor-type-id="text-editor">
680
-        <state relative-caret-position="120">
681
-          <caret line="8" lean-forward="true" selection-start-line="8" selection-end-line="8" />
682
-        </state>
683
-      </provider>
684
-    </entry>
685
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
731
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
686
       <provider selected="true" editor-type-id="text-editor">
732
       <provider selected="true" editor-type-id="text-editor">
687
-        <state relative-caret-position="60">
688
-          <caret line="4" column="112" selection-start-line="4" selection-start-column="112" selection-end-line="4" selection-end-column="112" />
733
+        <state relative-caret-position="45">
734
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
689
         </state>
735
         </state>
690
       </provider>
736
       </provider>
691
     </entry>
737
     </entry>
700
         </state>
746
         </state>
701
       </provider>
747
       </provider>
702
     </entry>
748
     </entry>
703
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
749
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/SavingsAccount.java">
704
       <provider selected="true" editor-type-id="text-editor">
750
       <provider selected="true" editor-type-id="text-editor">
705
         <state relative-caret-position="60">
751
         <state relative-caret-position="60">
706
-          <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
752
+          <caret line="4" column="112" selection-start-line="4" selection-start-column="112" selection-end-line="4" selection-end-column="112" />
707
         </state>
753
         </state>
708
       </provider>
754
       </provider>
709
     </entry>
755
     </entry>
710
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Atm.java">
756
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
711
       <provider selected="true" editor-type-id="text-editor">
757
       <provider selected="true" editor-type-id="text-editor">
712
-        <state relative-caret-position="45">
713
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
758
+        <state relative-caret-position="-383">
759
+          <caret line="9" column="33" selection-start-line="9" selection-start-column="33" selection-end-line="9" selection-end-column="33" />
714
         </state>
760
         </state>
715
       </provider>
761
       </provider>
716
     </entry>
762
     </entry>
717
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/Account.java">
763
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/BusinessAccount.java">
764
+      <provider selected="true" editor-type-id="text-editor">
765
+        <state relative-caret-position="60">
766
+          <caret line="4" column="113" selection-start-line="4" selection-start-column="113" selection-end-line="4" selection-end-column="113" />
767
+        </state>
768
+      </provider>
769
+    </entry>
770
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java">
718
       <provider selected="true" editor-type-id="text-editor">
771
       <provider selected="true" editor-type-id="text-editor">
719
-        <state relative-caret-position="30">
720
-          <caret line="32" column="4" selection-start-line="32" selection-start-column="4" selection-end-line="35" selection-end-column="5" />
772
+        <state relative-caret-position="389">
773
+          <caret line="74" column="12" selection-start-line="74" selection-start-column="12" selection-end-line="74" selection-end-column="12" />
721
         </state>
774
         </state>
722
       </provider>
775
       </provider>
723
     </entry>
776
     </entry>
724
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
777
     <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java">
725
       <provider selected="true" editor-type-id="text-editor">
778
       <provider selected="true" editor-type-id="text-editor">
726
-        <state relative-caret-position="2010">
727
-          <caret line="134" column="83" selection-start-line="134" selection-start-column="83" selection-end-line="134" selection-end-column="83" />
779
+        <state relative-caret-position="668">
780
+          <caret line="45" column="8" selection-start-line="45" selection-start-column="8" selection-end-line="45" selection-end-column="8" />
728
           <folding>
781
           <folding>
729
             <element signature="imports" expanded="true" />
782
             <element signature="imports" expanded="true" />
730
           </folding>
783
           </folding>

+ 6
- 1
src/main/java/com/zipcodewilmington/bankaccountlab/Account.java Zobrazit soubor

7
     private String email;
7
     private String email;
8
     public int pin;
8
     public int pin;
9
     public double balance;
9
     public double balance;
10
+    protected long accountNumber;
10
 
11
 
11
 
12
 
12
     public Account(){
13
     public Account(){
37
 
38
 
38
 
39
 
39
 
40
 
40
-
41
     public void setEmail(String email){
41
     public void setEmail(String email){
42
         this.email = email;
42
         this.email = email;
43
     }
43
     }
64
         System.out.println(balance);
64
         System.out.println(balance);
65
         return balance;
65
         return balance;
66
     }
66
     }
67
+
68
+    public long getAccountNumber(){
69
+
70
+        return accountNumber;
71
+    }
67
 }
72
 }

+ 28
- 9
src/main/java/com/zipcodewilmington/bankaccountlab/MainApplication.java Zobrazit soubor

11
 
11
 
12
 public class MainApplication {
12
 public class MainApplication {
13
 
13
 
14
-    private static String name;
15
-    private static String email;
16
-    private static String address;
17
-    private static int pin;
14
+    private String name;
15
+    private String email;
16
+    private String address;
17
+    private int pin;
18
+    private long accountNumber;
19
+   // private static String name;
20
+   // private static String email;
21
+   // private static String address;
22
+   // private static int pin;
18
     private boolean runCommandCenter = true;
23
     private boolean runCommandCenter = true;
19
     private CheckingAccount checkingAccount;
24
     private CheckingAccount checkingAccount;
20
     private BusinessAccount businessAccount;
25
     private BusinessAccount businessAccount;
49
         System.out.println("Create a pin number.");
54
         System.out.println("Create a pin number.");
50
         pin = scannerr.nextInt();
55
         pin = scannerr.nextInt();
51
 
56
 
52
-        long accountNumber = Math.round(Math.random() * 999999999);
57
+        this.accountNumber = Math.round(Math.random() * 999999999);
53
             double balance = 00000.00;
58
             double balance = 00000.00;
54
 
59
 
55
-            createBusinessAccount(name, email, address, pin, accountNumber, balance);
56
-            createSavingsAccount(name, email, address, pin, accountNumber, balance);
57
-            createCheckingAccount(name, email, address, pin, accountNumber, balance);
60
+            createBusinessAccount(this.name, this.email, this.address, this.pin, this.accountNumber, balance);
61
+            createSavingsAccount(this.name, this.email, this.address, this.pin, this.accountNumber, balance);
62
+            createCheckingAccount(this.name, this.email, this.address, this.pin, this.accountNumber, balance);
58
 
63
 
59
         while(runCommandCenter){
64
         while(runCommandCenter){
60
             commandCenter();
65
             commandCenter();
68
 
73
 
69
 
74
 
70
         System.out.println("Choose a command");
75
         System.out.println("Choose a command");
71
-        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");
76
+        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");
72
         int userInput = scanner.nextInt();
77
         int userInput = scanner.nextInt();
73
 
78
 
74
         switch(userInput){
79
         switch(userInput){
133
 
138
 
134
             case 12:
139
             case 12:
135
                 System.out.println("Your pin number is " + businessAccount.getPin());
140
                 System.out.println("Your pin number is " + businessAccount.getPin());
141
+                break;
142
+
143
+            case 13:
144
+                System.out.println("Your name is " + businessAccount.getName());
145
+                break;
146
+
147
+            case 14:
148
+                System.out.println("Your email address is " + businessAccount.getEmail());
149
+                break;
150
+
151
+            case 15:
152
+                System.out.println("Your address is " + businessAccount.getAddress());
136
 
153
 
154
+            case 17:
155
+                System.out.println("Your account number is " + businessAccount.getAccountNumber());
137
         }
156
         }
138
 
157
 
139
     }
158
     }

+ 11
- 0
src/test/java/com/zipcodewilmington/bankaccountlab/CheckingAccountTest.java Zobrazit soubor

66
         Assert.assertEquals(541.73 , 555.55 - amountToPay, 541.73);
66
         Assert.assertEquals(541.73 , 555.55 - amountToPay, 541.73);
67
     }
67
     }
68
 
68
 
69
+    @Test
70
+    public void testGetAccountNumber(){
71
+        CheckingAccount checkingAccount = new CheckingAccount();
72
+
73
+        MainApplication mainApplication = new MainApplication();
74
+
75
+        long actual = checkingAccount.getAccountNumber();
76
+
77
+        Assert.assertTrue(actual > 0 && actual < 999999999);
78
+    }
79
+
69
 
80
 
70
 }
81
 }