William Brown před 6 roky
rodič
revize
3508b60831

+ 0
- 13
.idea/libraries/Maven__junit_junit_4_0.xml Zobrazit soubor

@@ -1,13 +0,0 @@
1
-<component name="libraryTable">
2
-  <library name="Maven: junit:junit:4.0">
3
-    <CLASSES>
4
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.0/junit-4.0.jar!/" />
5
-    </CLASSES>
6
-    <JAVADOC>
7
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.0/junit-4.0-javadoc.jar!/" />
8
-    </JAVADOC>
9
-    <SOURCES>
10
-      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.0/junit-4.0-sources.jar!/" />
11
-    </SOURCES>
12
-  </library>
13
-</component>

+ 13
- 0
.idea/libraries/Maven__junit_junit_4_12.xml Zobrazit soubor

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: junit:junit:4.12">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 13
- 0
.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml Zobrazit soubor

@@ -0,0 +1,13 @@
1
+<component name="libraryTable">
2
+  <library name="Maven: org.hamcrest:hamcrest-core:1.3">
3
+    <CLASSES>
4
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
5
+    </CLASSES>
6
+    <JAVADOC>
7
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-javadoc.jar!/" />
8
+    </JAVADOC>
9
+    <SOURCES>
10
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
11
+    </SOURCES>
12
+  </library>
13
+</component>

+ 220
- 119
.idea/workspace.xml Zobrazit soubor

@@ -2,22 +2,13 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="926ad23d-2ddc-41ae-980d-780dcc1811fa" name="Default" comment="">
5
-      <change afterPath="$PROJECT_DIR$/Checkbook/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/Checkbook/.idea/libraries/Maven__junit_junit_4_0.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/Checkbook/.idea/misc.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/Checkbook/.idea/modules.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/Checkbook/.idea/vcs.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/Checkbook/src/test/java/PayeeTest.java" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/Checkbook/src/test/java/TransactionTest.java" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_0.xml" beforeDir="false" />
13 8
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
14 9
       <change beforePath="$PROJECT_DIR$/Checkbook/Checkbook.iml" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/Checkbook.iml" afterDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/AccountBook.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/AccountBook.java" afterDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/Checkbook/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/pom.xml" afterDir="false" />
16 11
       <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java" afterDir="false" />
17
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/GenericAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/GenericAccount.java" afterDir="false" />
18
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/Payee.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/Payee.java" afterDir="false" />
19
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java" afterDir="false" />
20
-      <change beforePath="$PROJECT_DIR$/Checkbook/src/main/java/TransactionType.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/main/java/TransactionType.java" afterDir="false" />
21 12
       <change beforePath="$PROJECT_DIR$/Checkbook/src/test/java/CheckbookTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/Checkbook/src/test/java/CheckbookTest.java" afterDir="false" />
22 13
     </list>
23 14
     <ignored path="$PROJECT_DIR$/Checkbook/target/" />
@@ -34,25 +25,103 @@
34 25
     <session id="671637131">
35 26
       <usages-collector id="statistics.lifecycle.project">
36 27
         <counts>
37
-          <entry key="project.closed" value="3" />
28
+          <entry key="project.closed" value="8" />
29
+          <entry key="project.open.time.0" value="2" />
30
+          <entry key="project.open.time.1" value="2" />
38 31
           <entry key="project.open.time.12" value="1" />
39 32
           <entry key="project.open.time.15" value="1" />
40 33
           <entry key="project.open.time.2" value="1" />
41
-          <entry key="project.opened" value="4" />
34
+          <entry key="project.open.time.9" value="1" />
35
+          <entry key="project.opened" value="9" />
42 36
         </counts>
43 37
       </usages-collector>
44 38
       <usages-collector id="statistics.file.types.open">
45 39
         <counts>
46
-          <entry key="JAVA" value="19" />
40
+          <entry key="JAVA" value="23" />
41
+          <entry key="XML" value="1" />
47 42
         </counts>
48 43
       </usages-collector>
49 44
       <usages-collector id="statistics.file.types.edit">
50 45
         <counts>
51
-          <entry key="JAVA" value="2601" />
46
+          <entry key="JAVA" value="3904" />
47
+          <entry key="XML" value="2" />
52 48
         </counts>
53 49
       </usages-collector>
54 50
     </session>
55 51
   </component>
52
+  <component name="FileEditorManager">
53
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
54
+      <file pinned="false" current-in-tab="false">
55
+        <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java">
56
+          <provider selected="true" editor-type-id="text-editor">
57
+            <state relative-caret-position="-136">
58
+              <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
59
+              <folding>
60
+                <element signature="e#500#501#0" expanded="true" />
61
+                <element signature="e#542#543#0" expanded="true" />
62
+                <element signature="e#573#574#0" expanded="true" />
63
+                <element signature="e#618#619#0" expanded="true" />
64
+                <element signature="e#673#674#0" expanded="true" />
65
+                <element signature="e#701#702#0" expanded="true" />
66
+                <element signature="e#780#781#0" expanded="true" />
67
+                <element signature="e#832#833#0" expanded="true" />
68
+                <element signature="e#885#886#0" expanded="true" />
69
+                <element signature="e#940#941#0" expanded="true" />
70
+                <element signature="e#973#974#0" expanded="true" />
71
+                <element signature="e#1019#1020#0" expanded="true" />
72
+                <element signature="e#1057#1058#0" expanded="true" />
73
+                <element signature="e#1118#1119#0" expanded="true" />
74
+                <element signature="e#1171#1172#0" expanded="true" />
75
+                <element signature="e#1198#1199#0" expanded="true" />
76
+                <element signature="e#1236#1237#0" expanded="true" />
77
+                <element signature="e#1269#1270#0" expanded="true" />
78
+                <element signature="e#1335#1336#0" expanded="true" />
79
+                <element signature="e#1362#1363#0" expanded="true" />
80
+                <element signature="e#1430#1431#0" expanded="true" />
81
+                <element signature="e#1457#1458#0" expanded="true" />
82
+                <element signature="e#1511#1512#0" expanded="true" />
83
+                <element signature="e#1538#1539#0" expanded="true" />
84
+                <element signature="e#1593#1594#0" expanded="true" />
85
+                <element signature="e#1620#1621#0" expanded="true" />
86
+              </folding>
87
+            </state>
88
+          </provider>
89
+        </entry>
90
+      </file>
91
+      <file pinned="false" current-in-tab="true">
92
+        <entry file="file://$PROJECT_DIR$/Checkbook/src/test/java/CheckbookTest.java">
93
+          <provider selected="true" editor-type-id="text-editor">
94
+            <state relative-caret-position="533">
95
+              <caret line="137" column="49" selection-start-line="137" selection-start-column="49" selection-end-line="137" selection-end-column="49" />
96
+              <folding>
97
+                <element signature="imports" expanded="true" />
98
+                <element signature="e#1943#1944#0" expanded="true" />
99
+                <element signature="e#2003#2004#0" expanded="true" />
100
+                <element signature="e#2129#2130#0" expanded="true" />
101
+                <element signature="e#2189#2190#0" expanded="true" />
102
+                <element signature="e#2230#2231#0" expanded="true" />
103
+                <element signature="e#2265#2266#0" expanded="true" />
104
+                <element signature="e#2346#2347#0" expanded="true" />
105
+                <element signature="e#2381#2382#0" expanded="true" />
106
+                <element signature="e#2453#2454#0" expanded="true" />
107
+                <element signature="e#2488#2489#0" expanded="true" />
108
+                <element signature="e#2507#2508#0" expanded="true" />
109
+                <element signature="e#2542#2543#0" expanded="true" />
110
+                <element signature="e#2608#2609#0" expanded="true" />
111
+                <element signature="e#2643#2644#0" expanded="true" />
112
+                <element signature="e#2720#2721#0" expanded="true" />
113
+                <element signature="e#2741#2742#0" expanded="true" />
114
+                <element signature="e#2845#2846#0" expanded="true" />
115
+                <element signature="e#2881#2882#0" expanded="true" />
116
+                <element signature="e#2963#2964#0" expanded="true" />
117
+                <element signature="e#2999#3000#0" expanded="true" />
118
+              </folding>
119
+            </state>
120
+          </provider>
121
+        </entry>
122
+      </file>
123
+    </leaf>
124
+  </component>
56 125
   <component name="FileTemplateManagerImpl">
57 126
     <option name="RECENT_TEMPLATES">
58 127
       <list>
@@ -81,10 +150,11 @@
81 150
         <option value="$PROJECT_DIR$/Checkbook/src/main/java/TransactionType.java" />
82 151
         <option value="$PROJECT_DIR$/Checkbook/src/main/java/Payee.java" />
83 152
         <option value="$PROJECT_DIR$/Checkbook/src/test/java/PayeeTest.java" />
84
-        <option value="$PROJECT_DIR$/Checkbook/src/test/java/CheckbookTest.java" />
85
-        <option value="$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java" />
86 153
         <option value="$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java" />
87 154
         <option value="$PROJECT_DIR$/Checkbook/src/test/java/TransactionTest.java" />
155
+        <option value="$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java" />
156
+        <option value="$PROJECT_DIR$/Checkbook/pom.xml" />
157
+        <option value="$PROJECT_DIR$/Checkbook/src/test/java/CheckbookTest.java" />
88 158
       </list>
89 159
     </option>
90 160
   </component>
@@ -110,7 +180,6 @@
110 180
       <foldersAlwaysOnTop value="true" />
111 181
     </navigator>
112 182
     <panes>
113
-      <pane id="Scope" />
114 183
       <pane id="ProjectPane">
115 184
         <subPane>
116 185
           <expand>
@@ -163,13 +232,14 @@
163 232
           <select />
164 233
         </subPane>
165 234
       </pane>
235
+      <pane id="Scope" />
166 236
       <pane id="PackagesPane" />
167 237
     </panes>
168 238
   </component>
169 239
   <component name="PropertiesComponent">
170 240
     <property name="WebServerToolWindowFactoryState" value="false" />
171 241
     <property name="aspect.path.notification.shown" value="true" />
172
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544290071117" />
242
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1544476759507" />
173 243
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
174 244
     <property name="jdk.selected.JAVA_MODULE" value="1.8" />
175 245
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -199,7 +269,7 @@
199 269
       </list>
200 270
     </option>
201 271
   </component>
202
-  <component name="RunManager" selected="JUnit.TransactionTest">
272
+  <component name="RunManager" selected="JUnit.CheckbookTest.testToArray">
203 273
     <configuration default="true" type="Applet" factoryName="Applet">
204 274
       <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
205 275
       <method v="2">
@@ -212,53 +282,53 @@
212 282
         <option name="Make" enabled="true" />
213 283
       </method>
214 284
     </configuration>
215
-    <configuration name="TransactionTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
285
+    <configuration name="CheckbookTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
216 286
       <module name="Checkbook" />
217 287
       <option name="PACKAGE_NAME" value="" />
218
-      <option name="MAIN_CLASS_NAME" value="TransactionTest" />
288
+      <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
219 289
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
220 290
       <method v="2">
221 291
         <option name="Make" enabled="true" />
222 292
       </method>
223 293
     </configuration>
224
-    <configuration name="TransactionTest.testGetAmount" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
294
+    <configuration name="CheckbookTest.tesrRemoveCheckbook2False" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
225 295
       <module name="Checkbook" />
226 296
       <option name="PACKAGE_NAME" value="" />
227
-      <option name="MAIN_CLASS_NAME" value="TransactionTest" />
228
-      <option name="METHOD_NAME" value="testGetAmount" />
297
+      <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
298
+      <option name="METHOD_NAME" value="tesrRemoveCheckbook2False" />
229 299
       <option name="TEST_OBJECT" value="method" />
230 300
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
231 301
       <method v="2">
232 302
         <option name="Make" enabled="true" />
233 303
       </method>
234 304
     </configuration>
235
-    <configuration name="TransactionTest.testGetPayee" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
305
+    <configuration name="CheckbookTest.testRemoveCheckbook1False" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
236 306
       <module name="Checkbook" />
237 307
       <option name="PACKAGE_NAME" value="" />
238
-      <option name="MAIN_CLASS_NAME" value="TransactionTest" />
239
-      <option name="METHOD_NAME" value="testGetPayee" />
308
+      <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
309
+      <option name="METHOD_NAME" value="testRemoveCheckbook1False" />
240 310
       <option name="TEST_OBJECT" value="method" />
241 311
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
242 312
       <method v="2">
243 313
         <option name="Make" enabled="true" />
244 314
       </method>
245 315
     </configuration>
246
-    <configuration name="TransactionTest.testGetType" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
316
+    <configuration name="CheckbookTest.testRemoveCheckbook2True" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
247 317
       <module name="Checkbook" />
248 318
       <option name="PACKAGE_NAME" value="" />
249
-      <option name="MAIN_CLASS_NAME" value="TransactionTest" />
250
-      <option name="METHOD_NAME" value="testGetType" />
319
+      <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
320
+      <option name="METHOD_NAME" value="testRemoveCheckbook2True" />
251 321
       <option name="TEST_OBJECT" value="method" />
252 322
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
253 323
       <method v="2">
254 324
         <option name="Make" enabled="true" />
255 325
       </method>
256 326
     </configuration>
257
-    <configuration name="TransactionTest.testSetPayee" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
327
+    <configuration name="CheckbookTest.testToArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
258 328
       <module name="Checkbook" />
259 329
       <option name="PACKAGE_NAME" value="" />
260
-      <option name="MAIN_CLASS_NAME" value="TransactionTest" />
261
-      <option name="METHOD_NAME" value="testSetPayee" />
330
+      <option name="MAIN_CLASS_NAME" value="CheckbookTest" />
331
+      <option name="METHOD_NAME" value="testToArray" />
262 332
       <option name="TEST_OBJECT" value="method" />
263 333
       <option name="WORKING_DIRECTORY" value="%MODULE_WORKING_DIR%" />
264 334
       <method v="2">
@@ -289,19 +359,19 @@
289 359
       </method>
290 360
     </configuration>
291 361
     <list>
292
-      <item itemvalue="JUnit.TransactionTest.testGetType" />
293
-      <item itemvalue="JUnit.TransactionTest.testGetPayee" />
294
-      <item itemvalue="JUnit.TransactionTest.testSetPayee" />
295
-      <item itemvalue="JUnit.TransactionTest.testGetAmount" />
296
-      <item itemvalue="JUnit.TransactionTest" />
362
+      <item itemvalue="JUnit.CheckbookTest.testRemoveCheckbook2True" />
363
+      <item itemvalue="JUnit.CheckbookTest.testRemoveCheckbook1False" />
364
+      <item itemvalue="JUnit.CheckbookTest.tesrRemoveCheckbook2False" />
365
+      <item itemvalue="JUnit.CheckbookTest" />
366
+      <item itemvalue="JUnit.CheckbookTest.testToArray" />
297 367
     </list>
298 368
     <recent_temporary>
299 369
       <list>
300
-        <item itemvalue="JUnit.TransactionTest" />
301
-        <item itemvalue="JUnit.TransactionTest.testGetAmount" />
302
-        <item itemvalue="JUnit.TransactionTest.testSetPayee" />
303
-        <item itemvalue="JUnit.TransactionTest.testGetPayee" />
304
-        <item itemvalue="JUnit.TransactionTest.testGetType" />
370
+        <item itemvalue="JUnit.CheckbookTest.testToArray" />
371
+        <item itemvalue="JUnit.CheckbookTest" />
372
+        <item itemvalue="JUnit.CheckbookTest.tesrRemoveCheckbook2False" />
373
+        <item itemvalue="JUnit.CheckbookTest.testRemoveCheckbook1False" />
374
+        <item itemvalue="JUnit.CheckbookTest.testRemoveCheckbook2True" />
305 375
       </list>
306 376
     </recent_temporary>
307 377
   </component>
@@ -319,48 +389,53 @@
319 389
       <workItem from="1544191538734" duration="1332000" />
320 390
       <workItem from="1544197365543" duration="1931000" />
321 391
       <workItem from="1544211950857" duration="8147000" />
392
+      <workItem from="1544449898010" duration="374000" />
393
+      <workItem from="1544451949531" duration="1392000" />
394
+      <workItem from="1544469033704" duration="1000" />
395
+      <workItem from="1544470429599" duration="228000" />
396
+      <workItem from="1544474921708" duration="1151000" />
322 397
     </task>
323 398
     <servers />
324 399
   </component>
325 400
   <component name="TestHistory">
326
-    <history-entry file="TransactionTest_testGetDate - 2018.12.07 at 17h 41m 05s.xml">
327
-      <configuration name="TransactionTest.testGetDate" configurationId="JUnit" />
401
+    <history-entry file="CheckbookTest_testAddCheckbook1 - 2018.12.10 at 16h 10m 31s.xml">
402
+      <configuration name="CheckbookTest.testAddCheckbook1" configurationId="JUnit" />
328 403
     </history-entry>
329
-    <history-entry file="TransactionTest_testGetDate - 2018.12.07 at 17h 42m 49s.xml">
330
-      <configuration name="TransactionTest.testGetDate" configurationId="JUnit" />
404
+    <history-entry file="CheckbookTest_testAddCheckbook2 - 2018.12.10 at 16h 10m 35s.xml">
405
+      <configuration name="CheckbookTest.testAddCheckbook2" configurationId="JUnit" />
331 406
     </history-entry>
332
-    <history-entry file="TransactionTest_testGetDate2 - 2018.12.07 at 17h 44m 33s.xml">
333
-      <configuration name="TransactionTest.testGetDate2" configurationId="JUnit" />
407
+    <history-entry file="CheckbookTest_testRemoveCheckbook1True - 2018.12.10 at 16h 12m 31s.xml">
408
+      <configuration name="CheckbookTest.testRemoveCheckbook1True" configurationId="JUnit" />
334 409
     </history-entry>
335
-    <history-entry file="TransactionTest_testGetId1 - 2018.12.07 at 17h 44m 49s.xml">
336
-      <configuration name="TransactionTest.testGetId1" configurationId="JUnit" />
410
+    <history-entry file="CheckbookTest_testRemoveCheckbook2True - 2018.12.10 at 16h 12m 36s.xml">
411
+      <configuration name="CheckbookTest.testRemoveCheckbook2True" configurationId="JUnit" />
337 412
     </history-entry>
338
-    <history-entry file="TransactionTest_testGetDate1 - 2018.12.07 at 17h 44m 55s.xml">
339
-      <configuration name="TransactionTest.testGetDate1" configurationId="JUnit" />
413
+    <history-entry file="CheckbookTest_testRemoveCheckbook1False - 2018.12.10 at 16h 12m 39s.xml">
414
+      <configuration name="CheckbookTest.testRemoveCheckbook1False" configurationId="JUnit" />
340 415
     </history-entry>
341
-    <history-entry file="TransactionTest_testGetType - 2018.12.07 at 17h 50m 59s.xml">
342
-      <configuration name="TransactionTest.testGetType" configurationId="JUnit" />
416
+    <history-entry file="CheckbookTest_tesrRemoveCheckbook2False - 2018.12.10 at 16h 12m 41s.xml">
417
+      <configuration name="CheckbookTest.tesrRemoveCheckbook2False" configurationId="JUnit" />
343 418
     </history-entry>
344
-    <history-entry file="TransactionTest_testGetPayee - 2018.12.07 at 18h 02m 07s.xml">
345
-      <configuration name="TransactionTest.testGetPayee" configurationId="JUnit" />
419
+    <history-entry file="CheckbookTest - 2018.12.10 at 16h 12m 56s.xml">
420
+      <configuration name="CheckbookTest" configurationId="JUnit" />
346 421
     </history-entry>
347
-    <history-entry file="TransactionTest_testSetPayee - 2018.12.07 at 18h 20m 22s.xml">
348
-      <configuration name="TransactionTest.testSetPayee" configurationId="JUnit" />
422
+    <history-entry file="CheckbookTest_testToArray - 2018.12.10 at 16h 16m 22s.xml">
423
+      <configuration name="CheckbookTest.testToArray" configurationId="JUnit" />
349 424
     </history-entry>
350
-    <history-entry file="TransactionTest_testGetAmount - 2018.12.07 at 18h 22m 09s.xml">
351
-      <configuration name="TransactionTest.testGetAmount" configurationId="JUnit" />
425
+    <history-entry file="CheckbookTest_testToArray - 2018.12.10 at 16h 17m 30s.xml">
426
+      <configuration name="CheckbookTest.testToArray" configurationId="JUnit" />
352 427
     </history-entry>
353
-    <history-entry file="TransactionTest - 2018.12.07 at 18h 22m 33s.xml">
354
-      <configuration name="TransactionTest" configurationId="JUnit" />
428
+    <history-entry file="CheckbookTest_testToArray - 2018.12.10 at 16h 18m 17s.xml">
429
+      <configuration name="CheckbookTest.testToArray" configurationId="JUnit" />
355 430
     </history-entry>
356 431
   </component>
357 432
   <component name="TimeTrackingManager">
358
-    <option name="totallyTimeSpent" value="14669000" />
433
+    <option name="totallyTimeSpent" value="17815000" />
359 434
   </component>
360 435
   <component name="ToolWindowManager">
361 436
     <frame x="0" y="0" width="1280" height="800" extended-state="0" />
362 437
     <layout>
363
-      <window_info content_ui="combo" id="Project" order="0" weight="0.17252396" />
438
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2197092" />
364 439
       <window_info id="Structure" order="1" weight="0.25" />
365 440
       <window_info id="Image Layers" order="2" />
366 441
       <window_info id="Designer" order="3" />
@@ -369,16 +444,16 @@
369 444
       <window_info id="Favorites" order="6" side_tool="true" />
370 445
       <window_info anchor="bottom" id="Message" order="0" />
371 446
       <window_info anchor="bottom" id="Find" order="1" />
372
-      <window_info anchor="bottom" id="Run" order="2" weight="0.21089108" />
447
+      <window_info anchor="bottom" id="Run" order="2" weight="0.34657535" />
373 448
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
374 449
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
375 450
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
376 451
       <window_info anchor="bottom" id="TODO" order="6" />
377
-      <window_info anchor="bottom" id="Terminal" order="7" />
452
+      <window_info anchor="bottom" id="Terminal" order="7" weight="0.32876712" />
378 453
       <window_info anchor="bottom" id="Event Log" order="8" side_tool="true" />
379 454
       <window_info anchor="bottom" id="Version Control" order="9" />
380 455
       <window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
381
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.32921174" />
456
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32876712" />
382 457
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
383 458
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
384 459
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -399,9 +474,6 @@
399 474
   </component>
400 475
   <component name="editorHistoryManager">
401 476
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_161.jdk/Contents/Home/src.zip!/java/util/concurrent/atomic/AtomicReference.java" />
402
-    <entry file="file://$PROJECT_DIR$/Checkbook/pom.xml">
403
-      <provider selected="true" editor-type-id="text-editor" />
404
-    </entry>
405 477
     <entry file="file://$PROJECT_DIR$/README.md">
406 478
       <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
407 479
         <state split_layout="SPLIT">
@@ -426,20 +498,6 @@
426 498
         </state>
427 499
       </provider>
428 500
     </entry>
429
-    <entry file="file://$PROJECT_DIR$/Checkbook/src/test/java/PayeeTest.java">
430
-      <provider selected="true" editor-type-id="text-editor">
431
-        <state relative-caret-position="1032">
432
-          <caret line="73" column="44" selection-start-line="73" selection-start-column="44" selection-end-line="73" selection-end-column="44" />
433
-        </state>
434
-      </provider>
435
-    </entry>
436
-    <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/Payee.java">
437
-      <provider selected="true" editor-type-id="text-editor">
438
-        <state relative-caret-position="147">
439
-          <caret line="28" column="33" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="33" />
440
-        </state>
441
-      </provider>
442
-    </entry>
443 501
     <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/TransactionType.java">
444 502
       <provider selected="true" editor-type-id="text-editor">
445 503
         <state relative-caret-position="60">
@@ -458,55 +516,98 @@
458 516
       <provider selected="true" editor-type-id="text-editor">
459 517
         <state relative-caret-position="33">
460 518
           <caret line="6" column="30" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />
461
-          <folding>
462
-            <element signature="imports" expanded="true" />
463
-          </folding>
519
+        </state>
520
+      </provider>
521
+    </entry>
522
+    <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java">
523
+      <provider selected="true" editor-type-id="text-editor">
524
+        <state>
525
+          <caret column="27" lean-forward="true" selection-start-column="27" selection-end-column="27" />
526
+        </state>
527
+      </provider>
528
+    </entry>
529
+    <entry file="file://$PROJECT_DIR$/Checkbook/src/test/java/PayeeTest.java">
530
+      <provider selected="true" editor-type-id="text-editor">
531
+        <state relative-caret-position="1035">
532
+          <caret line="73" column="44" selection-start-line="73" selection-start-column="44" selection-end-line="73" selection-end-column="44" />
533
+        </state>
534
+      </provider>
535
+    </entry>
536
+    <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/Payee.java">
537
+      <provider selected="true" editor-type-id="text-editor">
538
+        <state relative-caret-position="300">
539
+          <caret line="28" column="33" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="33" />
540
+        </state>
541
+      </provider>
542
+    </entry>
543
+    <entry file="file://$PROJECT_DIR$/Checkbook/pom.xml">
544
+      <provider selected="true" editor-type-id="text-editor">
545
+        <state relative-caret-position="330">
546
+          <caret line="22" column="20" lean-forward="true" selection-start-line="22" selection-start-column="20" selection-end-line="22" selection-end-column="20" />
464 547
         </state>
465 548
       </provider>
466 549
     </entry>
467 550
     <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/Checkbook.java">
468 551
       <provider selected="true" editor-type-id="text-editor">
469
-        <state relative-caret-position="570">
470
-          <caret line="63" column="5" selection-start-line="63" selection-start-column="5" selection-end-line="63" selection-end-column="5" />
552
+        <state relative-caret-position="-136">
553
+          <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
471 554
           <folding>
472
-            <element signature="imports" expanded="true" />
555
+            <element signature="e#500#501#0" expanded="true" />
556
+            <element signature="e#542#543#0" expanded="true" />
557
+            <element signature="e#573#574#0" expanded="true" />
558
+            <element signature="e#618#619#0" expanded="true" />
559
+            <element signature="e#673#674#0" expanded="true" />
560
+            <element signature="e#701#702#0" expanded="true" />
473 561
             <element signature="e#780#781#0" expanded="true" />
474 562
             <element signature="e#832#833#0" expanded="true" />
563
+            <element signature="e#885#886#0" expanded="true" />
564
+            <element signature="e#940#941#0" expanded="true" />
565
+            <element signature="e#973#974#0" expanded="true" />
566
+            <element signature="e#1019#1020#0" expanded="true" />
475 567
             <element signature="e#1057#1058#0" expanded="true" />
476 568
             <element signature="e#1118#1119#0" expanded="true" />
569
+            <element signature="e#1171#1172#0" expanded="true" />
570
+            <element signature="e#1198#1199#0" expanded="true" />
571
+            <element signature="e#1236#1237#0" expanded="true" />
572
+            <element signature="e#1269#1270#0" expanded="true" />
573
+            <element signature="e#1335#1336#0" expanded="true" />
574
+            <element signature="e#1362#1363#0" expanded="true" />
575
+            <element signature="e#1430#1431#0" expanded="true" />
576
+            <element signature="e#1457#1458#0" expanded="true" />
577
+            <element signature="e#1511#1512#0" expanded="true" />
578
+            <element signature="e#1538#1539#0" expanded="true" />
579
+            <element signature="e#1593#1594#0" expanded="true" />
580
+            <element signature="e#1620#1621#0" expanded="true" />
477 581
           </folding>
478 582
         </state>
479 583
       </provider>
480 584
     </entry>
481 585
     <entry file="file://$PROJECT_DIR$/Checkbook/src/test/java/CheckbookTest.java">
482 586
       <provider selected="true" editor-type-id="text-editor">
483
-        <state relative-caret-position="105">
484
-          <caret line="9" column="1" lean-forward="true" selection-start-line="9" selection-start-column="1" selection-end-line="9" selection-end-column="1" />
587
+        <state relative-caret-position="533">
588
+          <caret line="137" column="49" selection-start-line="137" selection-start-column="49" selection-end-line="137" selection-end-column="49" />
485 589
           <folding>
486 590
             <element signature="imports" expanded="true" />
487
-          </folding>
488
-        </state>
489
-      </provider>
490
-    </entry>
491
-    <entry file="file://$PROJECT_DIR$/Checkbook/src/main/java/Transaction.java">
492
-      <provider selected="true" editor-type-id="text-editor">
493
-        <state>
494
-          <caret column="27" lean-forward="true" selection-start-column="27" selection-end-column="27" />
495
-          <folding>
496
-            <element signature="e#689#690#0" expanded="true" />
497
-            <element signature="e#720#721#0" expanded="true" />
498
-            <element signature="e#754#755#0" expanded="true" />
499
-            <element signature="e#787#788#0" expanded="true" />
500
-            <element signature="e#827#828#0" expanded="true" />
501
-            <element signature="e#855#856#0" expanded="true" />
502
-            <element signature="e#886#887#0" expanded="true" />
503
-            <element signature="e#913#914#0" expanded="true" />
504
-            <element signature="e#953#954#0" expanded="true" />
505
-            <element signature="e#985#986#0" expanded="true" />
506
-            <element signature="e#1016#1017#0" expanded="true" />
507
-            <element signature="e#1044#1045#0" expanded="true" />
508
-            <element signature="e#1085#1086#0" expanded="true" />
509
-            <element signature="e#1119#1120#0" expanded="true" />
591
+            <element signature="e#1943#1944#0" expanded="true" />
592
+            <element signature="e#2003#2004#0" expanded="true" />
593
+            <element signature="e#2129#2130#0" expanded="true" />
594
+            <element signature="e#2189#2190#0" expanded="true" />
595
+            <element signature="e#2230#2231#0" expanded="true" />
596
+            <element signature="e#2265#2266#0" expanded="true" />
597
+            <element signature="e#2346#2347#0" expanded="true" />
598
+            <element signature="e#2381#2382#0" expanded="true" />
599
+            <element signature="e#2453#2454#0" expanded="true" />
600
+            <element signature="e#2488#2489#0" expanded="true" />
601
+            <element signature="e#2507#2508#0" expanded="true" />
602
+            <element signature="e#2542#2543#0" expanded="true" />
603
+            <element signature="e#2608#2609#0" expanded="true" />
604
+            <element signature="e#2643#2644#0" expanded="true" />
605
+            <element signature="e#2720#2721#0" expanded="true" />
606
+            <element signature="e#2741#2742#0" expanded="true" />
607
+            <element signature="e#2845#2846#0" expanded="true" />
608
+            <element signature="e#2881#2882#0" expanded="true" />
609
+            <element signature="e#2963#2964#0" expanded="true" />
610
+            <element signature="e#2999#3000#0" expanded="true" />
510 611
           </folding>
511 612
         </state>
512 613
       </provider>

+ 2
- 1
Checkbook/Checkbook.iml Zobrazit soubor

@@ -10,6 +10,7 @@
10 10
     </content>
11 11
     <orderEntry type="inheritedJdk" />
12 12
     <orderEntry type="sourceFolder" forTests="false" />
13
-    <orderEntry type="library" name="Maven: junit:junit:4.0" level="project" />
13
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
14
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
14 15
   </component>
15 16
 </module>

+ 1
- 1
Checkbook/pom.xml Zobrazit soubor

@@ -23,7 +23,7 @@
23 23
         <dependency>
24 24
             <groupId>junit</groupId>
25 25
             <artifactId>junit</artifactId>
26
-            <version>4.0</version>
26
+            <version>4.12</version>
27 27
         </dependency>
28 28
     </dependencies>
29 29
 

+ 1
- 1
Checkbook/src/main/java/Checkbook.java Zobrazit soubor

@@ -28,7 +28,7 @@ public class Checkbook {
28 28
     }
29 29
 
30 30
     public boolean contains(Transaction transaction){
31
-        return transactions.contains(transaction);
31
+        return false;
32 32
     }
33 33
 
34 34
     public boolean add(Transaction transaction){

+ 133
- 1
Checkbook/src/test/java/CheckbookTest.java Zobrazit soubor

@@ -1,10 +1,142 @@
1
+import org.junit.Assert;
1 2
 import org.junit.Before;
3
+import org.junit.Test;
2 4
 
3
-import static org.junit.Assert.*;
5
+import java.util.Arrays;
4 6
 
5 7
 public class CheckbookTest {
6 8
 
9
+    private Checkbook checkbook1;
10
+    private Checkbook checkbook2;
11
+    private Payee owner;
12
+    private Transaction one;
13
+    private Transaction two;
14
+
7 15
     @Before
8 16
     public void setUp() throws Exception {
17
+        owner = new Payee("Brown", "William", "me@gmail.com");
18
+        checkbook1 = new Checkbook(owner, 100.50);
19
+        checkbook2 = new Checkbook(200.03);
20
+        one = new Transaction("Food", owner, TransactionType.DEBIT, 8.75);
21
+        two = new Transaction(null, null, null, null);
22
+    }
23
+
24
+    @Test
25
+    public void testSizeOfCheckbook1WhenEmpty(){
26
+        int expected = 0;
27
+        int actual = checkbook1.size();
28
+
29
+        Assert.assertEquals(expected, actual);
30
+    }
31
+
32
+    @Test
33
+    public void testSizeOfCheckbook1WithOne(){
34
+        checkbook1.add(one);
35
+
36
+        int expected = 1;
37
+        int actual = checkbook1.size();
38
+
39
+        Assert.assertEquals(expected, actual);
40
+    }
41
+
42
+    @Test
43
+    public void testSizeOfCheckbook2WhenEmpty(){
44
+        int expected = 0;
45
+        int actual = checkbook2.size();
46
+
47
+        Assert.assertEquals(expected, actual);
48
+    }
49
+
50
+    @Test
51
+    public void testSizeOfCheckbook2WithOne(){
52
+        checkbook2.add(one);
53
+
54
+        int expected = 1;
55
+        int actual = checkbook2.size();
56
+
57
+        Assert.assertEquals(expected, actual);
58
+    }
59
+
60
+    @Test
61
+    public void testIsEmptyCheckbook1True(){
62
+        Assert.assertTrue(checkbook1.isEmpty());
63
+    }
64
+
65
+    @Test
66
+    public void testIsEmptyCheckbook2True(){
67
+        Assert.assertTrue(checkbook2.isEmpty());
68
+    }
69
+
70
+    @Test
71
+    public void testIsEmptyCheckbook1False(){
72
+        checkbook1.add(one);
73
+        Assert.assertFalse(checkbook1.isEmpty());
74
+    }
75
+
76
+    @Test
77
+    public void testIsEmptyCheckbook2False(){
78
+        checkbook2.add(one);
79
+        Assert.assertFalse(checkbook2.isEmpty());
80
+    }
81
+
82
+    @Test
83
+    public void testContainsCheckbook1False(){
84
+        Assert.assertFalse(checkbook1.contains(two));
85
+    }
86
+
87
+    @Test
88
+    public void testContainsCheckbook2False(){
89
+        Assert.assertFalse(checkbook2.contains(two));
90
+    }
91
+
92
+    @Test
93
+    public void testContainsCheckbook1True(){
94
+        Assert.assertTrue(checkbook1.contains(one));
95
+    }
96
+
97
+    @Test
98
+    public void testContainsCheckbook2True(){
99
+        Assert.assertTrue(checkbook2.contains(one));
100
+    }
101
+
102
+    @Test
103
+    public void testAddCheckbook1(){
104
+        Assert.assertTrue(checkbook1.add(two));
105
+    }
106
+
107
+    @Test
108
+    public void testAddCheckbook2(){
109
+        Assert.assertTrue(checkbook2.add(two));
110
+    }
111
+
112
+    @Test
113
+    public void testRemoveCheckbook1True(){
114
+        Assert.assertTrue(checkbook1.remove(one));
115
+    }
116
+
117
+    @Test
118
+    public void testRemoveCheckbook2True(){
119
+        Assert.assertTrue(checkbook2.remove(one));
120
+    }
121
+
122
+    @Test
123
+    public void testRemoveCheckbook1False(){
124
+        Assert.assertFalse(checkbook1.remove(two));
125
+    }
126
+
127
+    @Test
128
+    public void testRemoveCheckbook2False(){
129
+        Assert.assertFalse(checkbook2.remove(two));
130
+    }
131
+
132
+    @Test
133
+    public void testToArray(){
134
+        Transaction[] expected = new Transaction[] {one};
135
+        Transaction[] actual = checkbook1.toArray();
136
+
137
+        System.out.println(Arrays.toString(expected));
138
+        System.out.println(Arrays.toString(actual));
139
+
140
+        Assert.assertArrayEquals(expected, actual);
9 141
     }
10 142
 }