Browse Source

committing the changes

thulasi 6 years ago
parent
commit
691fc28e36

+ 103
- 48
Checkbook/.idea/workspace.xml View File

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="6740fffe-7f4d-4976-ad48-af24e6914f17" name="Default Changelist" comment="">
4
     <list default="true" id="6740fffe-7f4d-4976-ad48-af24e6914f17" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_0.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/Checkbook.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook.iml" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/test/java/GenericAccountTest.java" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/src/main/java/Checkbook.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Checkbook.java" afterDir="false" />
7
       <change beforePath="$PROJECT_DIR$/src/main/java/Checkbook.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Checkbook.java" afterDir="false" />
9
       <change beforePath="$PROJECT_DIR$/src/main/java/GenericAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/GenericAccount.java" afterDir="false" />
8
       <change beforePath="$PROJECT_DIR$/src/main/java/GenericAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/GenericAccount.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/Payee.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Payee.java" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/src/main/java/Transaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/Transaction.java" afterDir="false" />
12
       <change beforePath="$PROJECT_DIR$/src/test/java/CheckbookTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/CheckbookTest.java" afterDir="false" />
9
       <change beforePath="$PROJECT_DIR$/src/test/java/CheckbookTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/CheckbookTest.java" afterDir="false" />
13
     </list>
10
     </list>
14
     <ignored path="$PROJECT_DIR$/target/" />
11
     <ignored path="$PROJECT_DIR$/target/" />
31
       </usages-collector>
28
       </usages-collector>
32
       <usages-collector id="statistics.file.extensions.open">
29
       <usages-collector id="statistics.file.extensions.open">
33
         <counts>
30
         <counts>
34
-          <entry key="java" value="10" />
31
+          <entry key="java" value="12" />
35
         </counts>
32
         </counts>
36
       </usages-collector>
33
       </usages-collector>
37
       <usages-collector id="statistics.file.types.open">
34
       <usages-collector id="statistics.file.types.open">
38
         <counts>
35
         <counts>
39
-          <entry key="JAVA" value="10" />
36
+          <entry key="JAVA" value="12" />
40
         </counts>
37
         </counts>
41
       </usages-collector>
38
       </usages-collector>
42
       <usages-collector id="statistics.file.extensions.edit">
39
       <usages-collector id="statistics.file.extensions.edit">
43
         <counts>
40
         <counts>
44
-          <entry key="java" value="3480" />
41
+          <entry key="java" value="4196" />
45
         </counts>
42
         </counts>
46
       </usages-collector>
43
       </usages-collector>
47
       <usages-collector id="statistics.file.types.edit">
44
       <usages-collector id="statistics.file.types.edit">
48
         <counts>
45
         <counts>
49
-          <entry key="JAVA" value="3480" />
46
+          <entry key="JAVA" value="4196" />
50
         </counts>
47
         </counts>
51
       </usages-collector>
48
       </usages-collector>
52
     </session>
49
     </session>
56
       <file pinned="false" current-in-tab="false">
53
       <file pinned="false" current-in-tab="false">
57
         <entry file="file://$PROJECT_DIR$/src/main/java/Checkbook.java">
54
         <entry file="file://$PROJECT_DIR$/src/main/java/Checkbook.java">
58
           <provider selected="true" editor-type-id="text-editor">
55
           <provider selected="true" editor-type-id="text-editor">
59
-            <state relative-caret-position="231">
60
-              <caret line="119" column="53" selection-start-line="119" selection-start-column="53" selection-end-line="119" selection-end-column="53" />
56
+            <state relative-caret-position="289">
57
+              <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
61
               <folding>
58
               <folding>
62
                 <element signature="imports" expanded="true" />
59
                 <element signature="imports" expanded="true" />
63
                 <element signature="e#841#842#0" expanded="true" />
60
                 <element signature="e#841#842#0" expanded="true" />
70
                 <element signature="e#3389#3390#0" expanded="true" />
67
                 <element signature="e#3389#3390#0" expanded="true" />
71
                 <element signature="e#3477#3478#0" expanded="true" />
68
                 <element signature="e#3477#3478#0" expanded="true" />
72
                 <element signature="e#3511#3512#0" expanded="true" />
69
                 <element signature="e#3511#3512#0" expanded="true" />
70
+                <element signature="e#3565#3566#0" expanded="true" />
71
+                <element signature="e#3601#3602#0" expanded="true" />
73
               </folding>
72
               </folding>
74
             </state>
73
             </state>
75
           </provider>
74
           </provider>
78
       <file pinned="false" current-in-tab="true">
77
       <file pinned="false" current-in-tab="true">
79
         <entry file="file://$PROJECT_DIR$/src/test/java/CheckbookTest.java">
78
         <entry file="file://$PROJECT_DIR$/src/test/java/CheckbookTest.java">
80
           <provider selected="true" editor-type-id="text-editor">
79
           <provider selected="true" editor-type-id="text-editor">
81
-            <state relative-caret-position="231">
82
-              <caret line="467" column="25" lean-forward="true" selection-start-line="467" selection-start-column="25" selection-end-line="467" selection-end-column="25" />
80
+            <state relative-caret-position="1752">
81
+              <caret line="248" column="46" selection-start-line="248" selection-start-column="46" selection-end-line="248" selection-end-column="46" />
83
               <folding>
82
               <folding>
84
                 <element signature="imports" expanded="true" />
83
                 <element signature="imports" expanded="true" />
85
               </folding>
84
               </folding>
103
       <file pinned="false" current-in-tab="false">
102
       <file pinned="false" current-in-tab="false">
104
         <entry file="file://$PROJECT_DIR$/src/main/java/GenericAccount.java">
103
         <entry file="file://$PROJECT_DIR$/src/main/java/GenericAccount.java">
105
           <provider selected="true" editor-type-id="text-editor">
104
           <provider selected="true" editor-type-id="text-editor">
106
-            <state relative-caret-position="15">
107
-              <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
105
+            <state relative-caret-position="141">
106
+              <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
107
+              <folding>
108
+                <element signature="e#310#311#0" expanded="true" />
109
+                <element signature="e#336#337#0" expanded="true" />
110
+                <element signature="e#382#383#0" expanded="true" />
111
+                <element signature="e#418#419#0" expanded="true" />
112
+                <element signature="e#555#556#0" expanded="true" />
113
+                <element signature="e#561#562#0" expanded="true" />
114
+                <element signature="e#600#601#0" expanded="true" />
115
+              </folding>
116
+            </state>
117
+          </provider>
118
+        </entry>
119
+      </file>
120
+      <file pinned="false" current-in-tab="false">
121
+        <entry file="file://$PROJECT_DIR$/src/test/java/GenericAccountTest.java">
122
+          <provider selected="true" editor-type-id="text-editor">
123
+            <state relative-caret-position="585">
124
+              <caret line="39" column="82" selection-start-line="39" selection-start-column="82" selection-end-line="39" selection-end-column="82" />
125
+              <folding>
126
+                <element signature="imports" expanded="true" />
127
+              </folding>
128
+            </state>
129
+          </provider>
130
+        </entry>
131
+      </file>
132
+      <file pinned="false" current-in-tab="false">
133
+        <entry file="file://$PROJECT_DIR$/src/main/java/AccountBook.java">
134
+          <provider selected="true" editor-type-id="text-editor">
135
+            <state relative-caret-position="45">
136
+              <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
108
             </state>
137
             </state>
109
           </provider>
138
           </provider>
110
         </entry>
139
         </entry>
138
       </file>
167
       </file>
139
     </leaf>
168
     </leaf>
140
   </component>
169
   </component>
170
+  <component name="FileTemplateManagerImpl">
171
+    <option name="RECENT_TEMPLATES">
172
+      <list>
173
+        <option value="Class" />
174
+      </list>
175
+    </option>
176
+  </component>
141
   <component name="Git.Settings">
177
   <component name="Git.Settings">
142
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
178
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
143
   </component>
179
   </component>
144
   <component name="IdeDocumentHistory">
180
   <component name="IdeDocumentHistory">
145
     <option name="CHANGED_PATHS">
181
     <option name="CHANGED_PATHS">
146
       <list>
182
       <list>
147
-        <option value="$PROJECT_DIR$/src/main/java/GenericAccount.java" />
148
         <option value="$PROJECT_DIR$/src/main/java/Transaction.java" />
183
         <option value="$PROJECT_DIR$/src/main/java/Transaction.java" />
149
         <option value="$PROJECT_DIR$/src/main/java/Payee.java" />
184
         <option value="$PROJECT_DIR$/src/main/java/Payee.java" />
185
+        <option value="$PROJECT_DIR$/src/main/java/GenericAccount.java" />
186
+        <option value="$PROJECT_DIR$/src/test/java/GenericAccountTest.java" />
150
         <option value="$PROJECT_DIR$/src/main/java/Checkbook.java" />
187
         <option value="$PROJECT_DIR$/src/main/java/Checkbook.java" />
151
         <option value="$PROJECT_DIR$/src/test/java/CheckbookTest.java" />
188
         <option value="$PROJECT_DIR$/src/test/java/CheckbookTest.java" />
152
       </list>
189
       </list>
218
   <component name="PropertiesComponent">
255
   <component name="PropertiesComponent">
219
     <property name="WebServerToolWindowFactoryState" value="false" />
256
     <property name="WebServerToolWindowFactoryState" value="false" />
220
     <property name="aspect.path.notification.shown" value="true" />
257
     <property name="aspect.path.notification.shown" value="true" />
221
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544369669468" />
258
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544371979297" />
222
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
259
     <property name="last_opened_file_path" value="$PROJECT_DIR$/pom.xml" />
223
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
260
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
224
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
261
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
268
         <option name="Make" enabled="true" />
305
         <option name="Make" enabled="true" />
269
       </method>
306
       </method>
270
     </configuration>
307
     </configuration>
271
-    <configuration name="CheckbookTest.test3GetAllCreditTransactions" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
308
+    <configuration name="CheckbookTest.test3GetAllDebitTransactions" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
272
       <module name="Checkbook" />
309
       <module name="Checkbook" />
273
       <option name="PACKAGE_NAME" value="" />
310
       <option name="PACKAGE_NAME" value="" />
274
       <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
311
       <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
275
-      <option name="METHOD_NAME" value="test3GetAllCreditTransactions" />
312
+      <option name="METHOD_NAME" value="test3GetAllDebitTransactions" />
276
       <option name="TEST_OBJECT" value="method" />
313
       <option name="TEST_OBJECT" value="method" />
277
       <method v="2">
314
       <method v="2">
278
         <option name="Make" enabled="true" />
315
         <option name="Make" enabled="true" />
279
       </method>
316
       </method>
280
     </configuration>
317
     </configuration>
281
-    <configuration name="CheckbookTest.test3GetAllDebitTransactions" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
318
+    <configuration name="GenericAccountTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
282
       <module name="Checkbook" />
319
       <module name="Checkbook" />
283
       <option name="PACKAGE_NAME" value="" />
320
       <option name="PACKAGE_NAME" value="" />
284
-      <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
285
-      <option name="METHOD_NAME" value="test3GetAllDebitTransactions" />
286
-      <option name="TEST_OBJECT" value="method" />
321
+      <option name="MAIN_CLASS_NAME" value="GenericAccountTest" />
287
       <method v="2">
322
       <method v="2">
288
         <option name="Make" enabled="true" />
323
         <option name="Make" enabled="true" />
289
       </method>
324
       </method>
290
     </configuration>
325
     </configuration>
291
     <list>
326
     <list>
292
-      <item itemvalue="JUnit.CheckbookTest.test3GetAllCreditTransactions" />
293
       <item itemvalue="JUnit.CheckbookTest.test3GetAllDebitTransactions" />
327
       <item itemvalue="JUnit.CheckbookTest.test3GetAllDebitTransactions" />
294
       <item itemvalue="JUnit.CheckbookTest.test1GetTransactionsForDate" />
328
       <item itemvalue="JUnit.CheckbookTest.test1GetTransactionsForDate" />
295
       <item itemvalue="JUnit.CheckbookTest.test2GetTransactionsForDate" />
329
       <item itemvalue="JUnit.CheckbookTest.test2GetTransactionsForDate" />
296
       <item itemvalue="JUnit.CheckbookTest" />
330
       <item itemvalue="JUnit.CheckbookTest" />
331
+      <item itemvalue="JUnit.GenericAccountTest" />
297
     </list>
332
     </list>
298
     <recent_temporary>
333
     <recent_temporary>
299
       <list>
334
       <list>
300
         <item itemvalue="JUnit.CheckbookTest" />
335
         <item itemvalue="JUnit.CheckbookTest" />
336
+        <item itemvalue="JUnit.GenericAccountTest" />
301
         <item itemvalue="JUnit.CheckbookTest.test1GetTransactionsForDate" />
337
         <item itemvalue="JUnit.CheckbookTest.test1GetTransactionsForDate" />
302
         <item itemvalue="JUnit.CheckbookTest.test2GetTransactionsForDate" />
338
         <item itemvalue="JUnit.CheckbookTest.test2GetTransactionsForDate" />
303
         <item itemvalue="JUnit.CheckbookTest.test3GetAllDebitTransactions" />
339
         <item itemvalue="JUnit.CheckbookTest.test3GetAllDebitTransactions" />
304
-        <item itemvalue="JUnit.CheckbookTest.test3GetAllCreditTransactions" />
305
       </list>
340
       </list>
306
     </recent_temporary>
341
     </recent_temporary>
307
   </component>
342
   </component>
317
       <updated>1544225864730</updated>
352
       <updated>1544225864730</updated>
318
       <workItem from="1544225868313" duration="8881000" />
353
       <workItem from="1544225868313" duration="8881000" />
319
       <workItem from="1544319987271" duration="10272000" />
354
       <workItem from="1544319987271" duration="10272000" />
320
-      <workItem from="1544361451727" duration="6640000" />
355
+      <workItem from="1544361451727" duration="8762000" />
321
     </task>
356
     </task>
322
     <servers />
357
     <servers />
323
   </component>
358
   </component>
324
   <component name="TestHistory">
359
   <component name="TestHistory">
325
-    <history-entry file="CheckbookTest - 2018.12.09 at 10h 20m 27s.xml">
326
-      <configuration name="CheckbookTest" configurationId="JUnit" />
327
-    </history-entry>
328
-    <history-entry file="CheckbookTest - 2018.12.09 at 10h 21m 17s.xml">
329
-      <configuration name="CheckbookTest" configurationId="JUnit" />
330
-    </history-entry>
331
     <history-entry file="CheckbookTest - 2018.12.09 at 10h 22m 07s.xml">
360
     <history-entry file="CheckbookTest - 2018.12.09 at 10h 22m 07s.xml">
332
       <configuration name="CheckbookTest" configurationId="JUnit" />
361
       <configuration name="CheckbookTest" configurationId="JUnit" />
333
     </history-entry>
362
     </history-entry>
352
     <history-entry file="CheckbookTest - 2018.12.09 at 10h 29m 28s.xml">
381
     <history-entry file="CheckbookTest - 2018.12.09 at 10h 29m 28s.xml">
353
       <configuration name="CheckbookTest" configurationId="JUnit" />
382
       <configuration name="CheckbookTest" configurationId="JUnit" />
354
     </history-entry>
383
     </history-entry>
384
+    <history-entry file="CheckbookTest - 2018.12.09 at 10h 34m 35s.xml">
385
+      <configuration name="CheckbookTest" configurationId="JUnit" />
386
+    </history-entry>
387
+    <history-entry file="GenericAccountTest - 2018.12.09 at 11h 07m 10s.xml">
388
+      <configuration name="GenericAccountTest" configurationId="JUnit" />
389
+    </history-entry>
355
   </component>
390
   </component>
356
   <component name="TimeTrackingManager">
391
   <component name="TimeTrackingManager">
357
-    <option name="totallyTimeSpent" value="25793000" />
392
+    <option name="totallyTimeSpent" value="27915000" />
358
   </component>
393
   </component>
359
   <component name="ToolWindowManager">
394
   <component name="ToolWindowManager">
360
     <frame x="0" y="23" width="1280" height="709" extended-state="0" />
395
     <frame x="0" y="23" width="1280" height="709" extended-state="0" />
361
-    <editor active="true" />
362
     <layout>
396
     <layout>
363
       <window_info id="Designer" order="0" />
397
       <window_info id="Designer" order="0" />
364
       <window_info id="UI Designer" order="1" />
398
       <window_info id="UI Designer" order="1" />
368
       <window_info content_ui="combo" id="Project" order="5" sideWeight="0.496633" visible="true" weight="0.105815835" />
402
       <window_info content_ui="combo" id="Project" order="5" sideWeight="0.496633" visible="true" weight="0.105815835" />
369
       <window_info id="Structure" order="6" sideWeight="0.503367" side_tool="true" weight="0.19063005" />
403
       <window_info id="Structure" order="6" sideWeight="0.503367" side_tool="true" weight="0.19063005" />
370
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
404
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
371
-      <window_info anchor="bottom" id="Terminal" order="1" />
405
+      <window_info anchor="bottom" id="Terminal" order="1" weight="0.32996634" />
372
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
406
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
373
       <window_info anchor="bottom" id="Message" order="3" />
407
       <window_info anchor="bottom" id="Message" order="3" />
374
       <window_info anchor="bottom" id="Find" order="4" />
408
       <window_info anchor="bottom" id="Find" order="4" />
426
     <option name="myLimit" value="2678400000" />
460
     <option name="myLimit" value="2678400000" />
427
   </component>
461
   </component>
428
   <component name="editorHistoryManager">
462
   <component name="editorHistoryManager">
429
-    <entry file="file://$PROJECT_DIR$/src/main/java/AccountBook.java">
430
-      <provider selected="true" editor-type-id="text-editor">
431
-        <state relative-caret-position="45">
432
-          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
433
-        </state>
434
-      </provider>
435
-    </entry>
436
     <entry file="file://$PROJECT_DIR$/src/main/java/TransactionType.java">
463
     <entry file="file://$PROJECT_DIR$/src/main/java/TransactionType.java">
437
       <provider selected="true" editor-type-id="text-editor" />
464
       <provider selected="true" editor-type-id="text-editor" />
438
     </entry>
465
     </entry>
472
         </state>
499
         </state>
473
       </provider>
500
       </provider>
474
     </entry>
501
     </entry>
502
+    <entry file="file://$PROJECT_DIR$/src/main/java/AccountBook.java">
503
+      <provider selected="true" editor-type-id="text-editor">
504
+        <state relative-caret-position="45">
505
+          <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" />
506
+        </state>
507
+      </provider>
508
+    </entry>
475
     <entry file="file://$PROJECT_DIR$/src/main/java/GenericAccount.java">
509
     <entry file="file://$PROJECT_DIR$/src/main/java/GenericAccount.java">
476
       <provider selected="true" editor-type-id="text-editor">
510
       <provider selected="true" editor-type-id="text-editor">
477
-        <state relative-caret-position="15">
478
-          <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
511
+        <state relative-caret-position="141">
512
+          <caret line="20" column="60" selection-start-line="20" selection-start-column="60" selection-end-line="20" selection-end-column="60" />
513
+          <folding>
514
+            <element signature="e#310#311#0" expanded="true" />
515
+            <element signature="e#336#337#0" expanded="true" />
516
+            <element signature="e#382#383#0" expanded="true" />
517
+            <element signature="e#418#419#0" expanded="true" />
518
+            <element signature="e#555#556#0" expanded="true" />
519
+            <element signature="e#561#562#0" expanded="true" />
520
+            <element signature="e#600#601#0" expanded="true" />
521
+          </folding>
522
+        </state>
523
+      </provider>
524
+    </entry>
525
+    <entry file="file://$PROJECT_DIR$/src/test/java/GenericAccountTest.java">
526
+      <provider selected="true" editor-type-id="text-editor">
527
+        <state relative-caret-position="585">
528
+          <caret line="39" column="82" selection-start-line="39" selection-start-column="82" selection-end-line="39" selection-end-column="82" />
529
+          <folding>
530
+            <element signature="imports" expanded="true" />
531
+          </folding>
479
         </state>
532
         </state>
480
       </provider>
533
       </provider>
481
     </entry>
534
     </entry>
482
     <entry file="file://$PROJECT_DIR$/src/main/java/Checkbook.java">
535
     <entry file="file://$PROJECT_DIR$/src/main/java/Checkbook.java">
483
       <provider selected="true" editor-type-id="text-editor">
536
       <provider selected="true" editor-type-id="text-editor">
484
-        <state relative-caret-position="231">
485
-          <caret line="119" column="53" selection-start-line="119" selection-start-column="53" selection-end-line="119" selection-end-column="53" />
537
+        <state relative-caret-position="289">
538
+          <caret line="72" lean-forward="true" selection-start-line="72" selection-end-line="72" />
486
           <folding>
539
           <folding>
487
             <element signature="imports" expanded="true" />
540
             <element signature="imports" expanded="true" />
488
             <element signature="e#841#842#0" expanded="true" />
541
             <element signature="e#841#842#0" expanded="true" />
495
             <element signature="e#3389#3390#0" expanded="true" />
548
             <element signature="e#3389#3390#0" expanded="true" />
496
             <element signature="e#3477#3478#0" expanded="true" />
549
             <element signature="e#3477#3478#0" expanded="true" />
497
             <element signature="e#3511#3512#0" expanded="true" />
550
             <element signature="e#3511#3512#0" expanded="true" />
551
+            <element signature="e#3565#3566#0" expanded="true" />
552
+            <element signature="e#3601#3602#0" expanded="true" />
498
           </folding>
553
           </folding>
499
         </state>
554
         </state>
500
       </provider>
555
       </provider>
501
     </entry>
556
     </entry>
502
     <entry file="file://$PROJECT_DIR$/src/test/java/CheckbookTest.java">
557
     <entry file="file://$PROJECT_DIR$/src/test/java/CheckbookTest.java">
503
       <provider selected="true" editor-type-id="text-editor">
558
       <provider selected="true" editor-type-id="text-editor">
504
-        <state relative-caret-position="231">
505
-          <caret line="467" column="25" lean-forward="true" selection-start-line="467" selection-start-column="25" selection-end-line="467" selection-end-column="25" />
559
+        <state relative-caret-position="1752">
560
+          <caret line="248" column="46" selection-start-line="248" selection-start-column="46" selection-end-line="248" selection-end-column="46" />
506
           <folding>
561
           <folding>
507
             <element signature="imports" expanded="true" />
562
             <element signature="imports" expanded="true" />
508
           </folding>
563
           </folding>

+ 25
- 1
Checkbook/src/main/java/GenericAccount.java View File

1
+import java.util.List;
1
 
2
 
2
-public class GenericAccount {
3
+public class GenericAccount<T extends AccountBook> {
4
+    private Payee payee;
5
+    private Checkbook checkbook;
6
+    private List<Transaction> transactions;
7
+    public GenericAccount(Payee payee, Checkbook checkbook){
8
+        this.payee = payee;
9
+        this.checkbook = checkbook;
10
+    }
3
 
11
 
12
+
13
+    public Payee getPayee() {
14
+        return this.payee;
15
+    }
16
+
17
+    public Checkbook getCheckbook() {
18
+        return this.checkbook;
19
+    }
20
+
21
+    public void setTransaction(List<Transaction> expected) {
22
+        this.transactions = expected;
23
+    }
24
+
25
+    public List<Transaction> getTransaction() {
26
+        return this.transactions;
27
+    }
4
 }
28
 }

+ 45
- 0
Checkbook/src/test/java/GenericAccountTest.java View File

1
+import junit.framework.Assert;
2
+import org.junit.Before;
3
+import org.junit.Test;
4
+
5
+import java.util.ArrayList;
6
+import java.util.List;
7
+
8
+public class GenericAccountTest {
9
+    Payee payee;
10
+    Checkbook checkbook;
11
+    GenericAccount genericAccount;
12
+
13
+    @Before
14
+    public void setup(){
15
+        payee = new Payee();
16
+        payee.setGivenName("thulasi");
17
+        payee.setFamilyName("puppala");
18
+        payee.setEmailAddress("thulasi@gmail.com");
19
+        checkbook = new Checkbook(payee, 20000);
20
+        genericAccount = new GenericAccount(payee, checkbook);
21
+    }
22
+
23
+    @Test
24
+    public void TestGetPayee(){
25
+        Payee expected = payee;
26
+        Payee actualPayee = genericAccount.getPayee();
27
+        Assert.assertEquals(expected, actualPayee);
28
+    }
29
+
30
+    @Test
31
+    public void TestGetCheckbook(){
32
+        Checkbook expected = checkbook;
33
+        Checkbook actual = genericAccount.getCheckbook();
34
+        Assert.assertEquals(expected, actual);
35
+    }
36
+
37
+    @Test
38
+    public void TestSetGetTransaction(){
39
+        List<Transaction> expected = new ArrayList<>();
40
+        expected.add(new Transaction("one", payee, TransactionType.DEBIT, 200.0));
41
+        genericAccount.setTransaction(expected);
42
+        List<Transaction> actual = genericAccount.getTransaction();
43
+        Assert.assertEquals(expected, actual);
44
+    }
45
+}