Nathan Hall il y a 6 ans
Parent
révision
f8fee63f69

+ 200
- 230
.idea/workspace.xml Voir le fichier

@@ -2,12 +2,9 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="bb34a630-99d6-43f1-88af-777f3bc41c8e" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
7 5
       <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/io/zipcoder/interfaces/Instructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
11 8
     </list>
12 9
     <ignored path="$PROJECT_DIR$/target/" />
13 10
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -20,30 +17,30 @@
20 17
     <session id="1702614893">
21 18
       <usages-collector id="statistics.lifecycle.project">
22 19
         <counts>
23
-          <entry key="project.closed" value="2" />
20
+          <entry key="project.closed" value="3" />
24 21
           <entry key="project.open.time.17" value="1" />
25
-          <entry key="project.open.time.2" value="2" />
26
-          <entry key="project.opened" value="3" />
22
+          <entry key="project.open.time.2" value="3" />
23
+          <entry key="project.opened" value="4" />
27 24
         </counts>
28 25
       </usages-collector>
29 26
       <usages-collector id="statistics.file.extensions.open">
30 27
         <counts>
31
-          <entry key="java" value="42" />
28
+          <entry key="java" value="43" />
32 29
         </counts>
33 30
       </usages-collector>
34 31
       <usages-collector id="statistics.file.types.open">
35 32
         <counts>
36
-          <entry key="JAVA" value="42" />
33
+          <entry key="JAVA" value="43" />
37 34
         </counts>
38 35
       </usages-collector>
39 36
       <usages-collector id="statistics.file.extensions.edit">
40 37
         <counts>
41
-          <entry key="java" value="5067" />
38
+          <entry key="java" value="5650" />
42 39
         </counts>
43 40
       </usages-collector>
44 41
       <usages-collector id="statistics.file.types.edit">
45 42
         <counts>
46
-          <entry key="JAVA" value="5067" />
43
+          <entry key="JAVA" value="5650" />
47 44
         </counts>
48 45
       </usages-collector>
49 46
     </session>
@@ -51,113 +48,90 @@
51 48
   <component name="FileEditorManager">
52 49
     <splitter split-orientation="horizontal" split-proportion="0.59292036">
53 50
       <split-first>
54
-        <splitter split-orientation="horizontal" split-proportion="0.22431506">
55
-          <split-first>
56
-            <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
57
-              <file pinned="false" current-in-tab="true">
58
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
59
-                  <provider selected="true" editor-type-id="text-editor">
60
-                    <state relative-caret-position="75">
61
-                      <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
62
-                    </state>
63
-                  </provider>
64
-                </entry>
65
-              </file>
66
-            </leaf>
67
-          </split-first>
68
-          <split-second>
69
-            <leaf>
70
-              <file pinned="false" current-in-tab="false">
71
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
72
-                  <provider selected="true" editor-type-id="text-editor">
73
-                    <state relative-caret-position="30">
74
-                      <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
75
-                    </state>
76
-                  </provider>
77
-                </entry>
78
-              </file>
79
-              <file pinned="false" current-in-tab="false">
80
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
81
-                  <provider selected="true" editor-type-id="text-editor">
82
-                    <state relative-caret-position="165">
83
-                      <caret line="11" selection-start-line="11" selection-end-line="11" />
84
-                      <folding>
85
-                        <element signature="e#171#172#0" expanded="true" />
86
-                        <element signature="e#202#203#0" expanded="true" />
87
-                        <element signature="e#263#264#0" expanded="true" />
88
-                        <element signature="e#300#301#0" expanded="true" />
89
-                      </folding>
90
-                    </state>
91
-                  </provider>
92
-                </entry>
93
-              </file>
94
-              <file pinned="false" current-in-tab="false">
95
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
96
-                  <provider selected="true" editor-type-id="text-editor">
97
-                    <state relative-caret-position="492">
98
-                      <caret line="63" selection-start-line="63" selection-end-line="63" />
99
-                      <folding>
100
-                        <element signature="imports" expanded="true" />
101
-                        <element signature="e#232#241#0" expanded="true" />
102
-                        <element signature="e#209#210#0" expanded="true" />
103
-                        <element signature="e#240#241#0" expanded="true" />
104
-                      </folding>
105
-                    </state>
106
-                  </provider>
107
-                </entry>
108
-              </file>
109
-              <file pinned="false" current-in-tab="false">
110
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
111
-                  <provider selected="true" editor-type-id="text-editor">
112
-                    <state relative-caret-position="120">
113
-                      <caret line="8" selection-start-line="8" selection-end-line="8" />
114
-                      <folding>
115
-                        <element signature="e#137#138#0" expanded="true" />
116
-                        <element signature="e#168#169#0" expanded="true" />
117
-                      </folding>
118
-                    </state>
119
-                  </provider>
120
-                </entry>
121
-              </file>
122
-              <file pinned="false" current-in-tab="false">
123
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
124
-                  <provider selected="true" editor-type-id="text-editor">
125
-                    <state relative-caret-position="105">
126
-                      <caret line="7" column="24" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="24" />
127
-                      <folding>
128
-                        <element signature="imports" expanded="true" />
129
-                        <element signature="e#255#267#0" expanded="true" />
130
-                        <element signature="e#229#230#0" expanded="true" />
131
-                        <element signature="e#256#257#0" expanded="true" />
132
-                      </folding>
133
-                    </state>
134
-                  </provider>
135
-                </entry>
136
-              </file>
137
-              <file pinned="false" current-in-tab="true">
138
-                <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
139
-                  <provider selected="true" editor-type-id="text-editor">
140
-                    <state relative-caret-position="30">
141
-                      <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
142
-                      <folding>
143
-                        <element signature="e#624#625#0" expanded="true" />
144
-                        <element signature="e#655#656#0" expanded="true" />
145
-                      </folding>
146
-                    </state>
147
-                  </provider>
148
-                </entry>
149
-              </file>
150
-            </leaf>
151
-          </split-second>
152
-        </splitter>
51
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
52
+          <file pinned="false" current-in-tab="false">
53
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
54
+              <provider selected="true" editor-type-id="text-editor">
55
+                <state relative-caret-position="30">
56
+                  <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
57
+                </state>
58
+              </provider>
59
+            </entry>
60
+          </file>
61
+          <file pinned="false" current-in-tab="false">
62
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
63
+              <provider selected="true" editor-type-id="text-editor">
64
+                <state relative-caret-position="225">
65
+                  <caret line="15" column="45" lean-forward="true" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
66
+                  <folding>
67
+                    <element signature="e#171#172#0" expanded="true" />
68
+                    <element signature="e#202#203#0" expanded="true" />
69
+                  </folding>
70
+                </state>
71
+              </provider>
72
+            </entry>
73
+          </file>
74
+          <file pinned="false" current-in-tab="false">
75
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
76
+              <provider selected="true" editor-type-id="text-editor">
77
+                <state relative-caret-position="428">
78
+                  <caret line="52" column="8" selection-start-line="52" selection-start-column="8" selection-end-line="52" selection-end-column="58" />
79
+                  <folding>
80
+                    <element signature="imports" expanded="true" />
81
+                  </folding>
82
+                </state>
83
+              </provider>
84
+            </entry>
85
+          </file>
86
+          <file pinned="false" current-in-tab="false">
87
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
88
+              <provider selected="true" editor-type-id="text-editor">
89
+                <state relative-caret-position="285">
90
+                  <caret line="19" selection-start-line="19" selection-end-line="19" />
91
+                  <folding>
92
+                    <element signature="e#137#138#0" expanded="true" />
93
+                    <element signature="e#168#169#0" expanded="true" />
94
+                  </folding>
95
+                </state>
96
+              </provider>
97
+            </entry>
98
+          </file>
99
+          <file pinned="false" current-in-tab="false">
100
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
101
+              <provider selected="true" editor-type-id="text-editor">
102
+                <state relative-caret-position="105">
103
+                  <caret line="7" column="24" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="24" />
104
+                  <folding>
105
+                    <element signature="imports" expanded="true" />
106
+                  </folding>
107
+                </state>
108
+              </provider>
109
+            </entry>
110
+          </file>
111
+          <file pinned="false" current-in-tab="true">
112
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
113
+              <provider selected="true" editor-type-id="text-editor">
114
+                <state relative-caret-position="-120">
115
+                  <caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="72" />
116
+                  <folding>
117
+                    <element signature="e#805#806#0" expanded="true" />
118
+                    <element signature="e#836#837#0" expanded="true" />
119
+                    <element signature="e#1010#1011#0" expanded="true" />
120
+                    <element signature="e#1052#1053#0" expanded="true" />
121
+                  </folding>
122
+                </state>
123
+              </provider>
124
+            </entry>
125
+          </file>
126
+        </leaf>
153 127
       </split-first>
154 128
       <split-second>
155
-        <leaf>
129
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
156 130
           <file pinned="false" current-in-tab="false">
157 131
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
158 132
               <provider selected="true" editor-type-id="text-editor">
159
-                <state relative-caret-position="488">
160
-                  <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
133
+                <state relative-caret-position="795">
134
+                  <caret line="53" selection-start-line="53" selection-end-line="53" />
161 135
                   <folding>
162 136
                     <element signature="imports" expanded="true" />
163 137
                   </folding>
@@ -169,7 +143,7 @@
169 143
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
170 144
               <provider selected="true" editor-type-id="text-editor">
171 145
                 <state relative-caret-position="105">
172
-                  <caret line="7" column="34" lean-forward="true" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
146
+                  <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
173 147
                   <folding>
174 148
                     <element signature="imports" expanded="true" />
175 149
                   </folding>
@@ -181,7 +155,7 @@
181 155
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
182 156
               <provider selected="true" editor-type-id="text-editor">
183 157
                 <state relative-caret-position="330">
184
-                  <caret line="22" column="5" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="22" selection-end-column="5" />
158
+                  <caret line="22" column="5" selection-start-line="11" selection-start-column="4" selection-end-line="22" selection-end-column="5" />
185 159
                   <folding>
186 160
                     <element signature="imports" expanded="true" />
187 161
                   </folding>
@@ -204,8 +178,8 @@
204 178
           <file pinned="false" current-in-tab="true">
205 179
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
206 180
               <provider selected="true" editor-type-id="text-editor">
207
-                <state relative-caret-position="255">
208
-                  <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
181
+                <state relative-caret-position="105">
182
+                  <caret line="10" selection-start-line="10" selection-end-line="10" />
209 183
                 </state>
210 184
               </provider>
211 185
             </entry>
@@ -244,8 +218,8 @@
244 218
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
245 219
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
246 220
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
247
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
248 221
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
222
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
249 223
       </list>
250 224
     </option>
251 225
   </component>
@@ -263,9 +237,9 @@
263 237
     </option>
264 238
   </component>
265 239
   <component name="ProjectFrameBounds">
266
-    <option name="x" value="-332" />
267
-    <option name="y" value="-1023" />
268
-    <option name="width" value="1902" />
240
+    <option name="x" value="-268" />
241
+    <option name="y" value="-1011" />
242
+    <option name="width" value="1838" />
269 243
     <option name="height" value="929" />
270 244
   </component>
271 245
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -274,7 +248,6 @@
274 248
       <foldersAlwaysOnTop value="true" />
275 249
     </navigator>
276 250
     <panes>
277
-      <pane id="Scope" />
278 251
       <pane id="ProjectPane">
279 252
         <subPane>
280 253
           <expand>
@@ -334,12 +307,13 @@
334 307
         </subPane>
335 308
       </pane>
336 309
       <pane id="PackagesPane" />
310
+      <pane id="Scope" />
337 311
     </panes>
338 312
   </component>
339 313
   <component name="PropertiesComponent">
340 314
     <property name="WebServerToolWindowFactoryState" value="false" />
341 315
     <property name="aspect.path.notification.shown" value="true" />
342
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542316323338" />
316
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1542323589169" />
343 317
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
344 318
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
345 319
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
@@ -369,7 +343,7 @@
369 343
       </list>
370 344
     </option>
371 345
   </component>
372
-  <component name="RunManager" selected="JUnit.InstructorsTest.InstructorsTest">
346
+  <component name="RunManager" selected="JUnit.ZipCodeWilmingtonTest.testHostLecture">
373 347
     <configuration name="InstructorsTest.InstructorsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
374 348
       <module name="interfaces-1" />
375 349
       <extension name="coverage">
@@ -386,7 +360,7 @@
386 360
         <option name="Make" enabled="true" />
387 361
       </method>
388 362
     </configuration>
389
-    <configuration name="PeopleTest.findByIdTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
363
+    <configuration name="PeopleTest.removeTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
390 364
       <module name="interfaces-1" />
391 365
       <extension name="coverage">
392 366
         <pattern>
@@ -396,13 +370,13 @@
396 370
       </extension>
397 371
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
398 372
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
399
-      <option name="METHOD_NAME" value="findByIdTest" />
373
+      <option name="METHOD_NAME" value="removeTest2" />
400 374
       <option name="TEST_OBJECT" value="method" />
401 375
       <method v="2">
402 376
         <option name="Make" enabled="true" />
403 377
       </method>
404 378
     </configuration>
405
-    <configuration name="PeopleTest.removeTest2" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
379
+    <configuration name="PeopleTest.removeTestByPerson" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
406 380
       <module name="interfaces-1" />
407 381
       <extension name="coverage">
408 382
         <pattern>
@@ -412,13 +386,13 @@
412 386
       </extension>
413 387
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
414 388
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
415
-      <option name="METHOD_NAME" value="removeTest2" />
389
+      <option name="METHOD_NAME" value="removeTestByPerson" />
416 390
       <option name="TEST_OBJECT" value="method" />
417 391
       <method v="2">
418 392
         <option name="Make" enabled="true" />
419 393
       </method>
420 394
     </configuration>
421
-    <configuration name="PeopleTest.removeTestByPerson" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
395
+    <configuration name="StudentsTest.StudentsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
422 396
       <module name="interfaces-1" />
423 397
       <extension name="coverage">
424 398
         <pattern>
@@ -427,14 +401,14 @@
427 401
         </pattern>
428 402
       </extension>
429 403
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
430
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
431
-      <option name="METHOD_NAME" value="removeTestByPerson" />
404
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
405
+      <option name="METHOD_NAME" value="StudentsTest" />
432 406
       <option name="TEST_OBJECT" value="method" />
433 407
       <method v="2">
434 408
         <option name="Make" enabled="true" />
435 409
       </method>
436 410
     </configuration>
437
-    <configuration name="StudentsTest.StudentsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
411
+    <configuration name="ZipCodeWilmingtonTest.testHostLecture" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
438 412
       <module name="interfaces-1" />
439 413
       <extension name="coverage">
440 414
         <pattern>
@@ -443,27 +417,27 @@
443 417
         </pattern>
444 418
       </extension>
445 419
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
446
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
447
-      <option name="METHOD_NAME" value="StudentsTest" />
420
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
421
+      <option name="METHOD_NAME" value="testHostLecture" />
448 422
       <option name="TEST_OBJECT" value="method" />
449 423
       <method v="2">
450 424
         <option name="Make" enabled="true" />
451 425
       </method>
452 426
     </configuration>
453 427
     <list>
454
-      <item itemvalue="JUnit.PeopleTest.findByIdTest" />
455 428
       <item itemvalue="JUnit.PeopleTest.removeTestByPerson" />
456 429
       <item itemvalue="JUnit.PeopleTest.removeTest2" />
457 430
       <item itemvalue="JUnit.StudentsTest.StudentsTest" />
458 431
       <item itemvalue="JUnit.InstructorsTest.InstructorsTest" />
432
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture" />
459 433
     </list>
460 434
     <recent_temporary>
461 435
       <list>
436
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture" />
462 437
         <item itemvalue="JUnit.InstructorsTest.InstructorsTest" />
463 438
         <item itemvalue="JUnit.StudentsTest.StudentsTest" />
464 439
         <item itemvalue="JUnit.PeopleTest.removeTest2" />
465 440
         <item itemvalue="JUnit.PeopleTest.removeTestByPerson" />
466
-        <item itemvalue="JUnit.PeopleTest.findByIdTest" />
467 441
       </list>
468 442
     </recent_temporary>
469 443
   </component>
@@ -479,49 +453,51 @@
479 453
       <updated>1541925109764</updated>
480 454
       <workItem from="1541925113078" duration="5099000" />
481 455
       <workItem from="1541965822791" duration="598000" />
482
-      <workItem from="1542139054328" duration="29492000" />
456
+      <workItem from="1542139054328" duration="29849000" />
457
+      <workItem from="1542318964341" duration="4613000" />
483 458
     </task>
484 459
     <servers />
485 460
   </component>
486 461
   <component name="TestHistory">
487
-    <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 13h 52m 03s.xml">
488
-      <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
462
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 16m 47s.xml">
463
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
489 464
     </history-entry>
490
-    <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 13h 54m 02s.xml">
491
-      <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
465
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 35m 53s.xml">
466
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
492 467
     </history-entry>
493
-    <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 13h 55m 05s.xml">
494
-      <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
468
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 37m 05s.xml">
469
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
495 470
     </history-entry>
496
-    <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 13h 59m 24s.xml">
497
-      <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
471
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 39m 25s.xml">
472
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
498 473
     </history-entry>
499
-    <history-entry file="PeopleTest_addTest - 2018.11.14 at 14h 03m 47s.xml">
500
-      <configuration name="PeopleTest.addTest" configurationId="JUnit" />
474
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 39m 46s.xml">
475
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
501 476
     </history-entry>
502
-    <history-entry file="PeopleTest_findByIdTest - 2018.11.14 at 14h 05m 48s.xml">
503
-      <configuration name="PeopleTest.findByIdTest" configurationId="JUnit" />
477
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 40m 07s.xml">
478
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
504 479
     </history-entry>
505
-    <history-entry file="PeopleTest_removeTestByPerson - 2018.11.14 at 14h 10m 44s.xml">
506
-      <configuration name="PeopleTest.removeTestByPerson" configurationId="JUnit" />
480
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 48m 52s.xml">
481
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
507 482
     </history-entry>
508
-    <history-entry file="PeopleTest_removeTest2 - 2018.11.14 at 14h 11m 36s.xml">
509
-      <configuration name="PeopleTest.removeTest2" configurationId="JUnit" />
483
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 49m 25s.xml">
484
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
510 485
     </history-entry>
511
-    <history-entry file="StudentsTest_StudentsTest - 2018.11.14 at 17h 28m 11s.xml">
512
-      <configuration name="StudentsTest.StudentsTest" configurationId="JUnit" />
486
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 17h 51m 12s.xml">
487
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
513 488
     </history-entry>
514
-    <history-entry file="InstructorsTest_InstructorsTest - 2018.11.14 at 17h 37m 47s.xml">
515
-      <configuration name="InstructorsTest.InstructorsTest" configurationId="JUnit" />
489
+    <history-entry file="ZipCodeWilmingtonTest_testHostLecture - 2018.11.15 at 18h 05m 35s.xml">
490
+      <configuration name="ZipCodeWilmingtonTest.testHostLecture" configurationId="JUnit" />
516 491
     </history-entry>
517 492
   </component>
518 493
   <component name="TimeTrackingManager">
519
-    <option name="totallyTimeSpent" value="35189000" />
494
+    <option name="totallyTimeSpent" value="40159000" />
520 495
   </component>
521 496
   <component name="ToolWindowManager">
522
-    <frame x="-332" y="-1023" width="1902" height="929" extended-state="0" />
497
+    <frame x="-268" y="-1011" width="1838" height="929" extended-state="0" />
498
+    <editor active="true" />
523 499
     <layout>
524
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.088709675" />
500
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.19042316" />
525 501
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
526 502
       <window_info id="Image Layers" order="2" />
527 503
       <window_info id="Designer" order="3" />
@@ -530,16 +506,16 @@
530 506
       <window_info id="Favorites" order="6" side_tool="true" />
531 507
       <window_info anchor="bottom" id="Message" order="0" />
532 508
       <window_info anchor="bottom" id="Find" order="1" />
533
-      <window_info anchor="bottom" id="Run" order="2" weight="0.37961596" />
509
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.37960687" />
534 510
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
535 511
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
536 512
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
537 513
       <window_info anchor="bottom" id="TODO" order="6" />
538 514
       <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
539 515
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
540
-      <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.17199017" />
516
+      <window_info anchor="bottom" id="Terminal" order="9" weight="0.17199017" />
541 517
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
542
-      <window_info anchor="bottom" id="Messages" order="11" weight="0.3264402" />
518
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32555282" />
543 519
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
544 520
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
545 521
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -613,60 +589,84 @@
613 589
         </state>
614 590
       </provider>
615 591
     </entry>
616
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
592
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
617 593
       <provider selected="true" editor-type-id="text-editor">
618
-        <state relative-caret-position="105">
619
-          <caret line="7" column="34" lean-forward="true" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
594
+        <state relative-caret-position="253">
595
+          <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
620 596
           <folding>
621 597
             <element signature="imports" expanded="true" />
598
+            <element signature="e#571#572#0" expanded="true" />
599
+            <element signature="e#612#613#0" expanded="true" />
600
+            <element signature="e#646#647#0" expanded="true" />
601
+            <element signature="e#693#694#0" expanded="true" />
602
+            <element signature="e#749#750#0" expanded="true" />
603
+            <element signature="e#789#790#0" expanded="true" />
604
+            <element signature="e#821#822#0" expanded="true" />
605
+            <element signature="e#874#875#0" expanded="true" />
606
+            <element signature="e#904#905#0" expanded="true" />
607
+            <element signature="e#952#953#0" expanded="true" />
622 608
           </folding>
623 609
         </state>
624 610
       </provider>
625 611
     </entry>
626
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
612
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
627 613
       <provider selected="true" editor-type-id="text-editor">
628
-        <state relative-caret-position="75">
629
-          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
614
+        <state relative-caret-position="795">
615
+          <caret line="53" selection-start-line="53" selection-end-line="53" />
616
+          <folding>
617
+            <element signature="imports" expanded="true" />
618
+          </folding>
630 619
         </state>
631 620
       </provider>
632 621
     </entry>
633
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
622
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
634 623
       <provider selected="true" editor-type-id="text-editor">
635
-        <state relative-caret-position="330">
636
-          <caret line="22" column="5" lean-forward="true" selection-start-line="11" selection-start-column="4" selection-end-line="22" selection-end-column="5" />
624
+        <state relative-caret-position="105">
625
+          <caret line="7" column="34" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
637 626
           <folding>
638 627
             <element signature="imports" expanded="true" />
639 628
           </folding>
640 629
         </state>
641 630
       </provider>
642 631
     </entry>
643
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
632
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
644 633
       <provider selected="true" editor-type-id="text-editor">
645
-        <state relative-caret-position="488">
646
-          <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
634
+        <state relative-caret-position="330">
635
+          <caret line="22" column="5" selection-start-line="11" selection-start-column="4" selection-end-line="22" selection-end-column="5" />
647 636
           <folding>
648 637
             <element signature="imports" expanded="true" />
649 638
           </folding>
650 639
         </state>
651 640
       </provider>
652 641
     </entry>
653
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
642
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
654 643
       <provider selected="true" editor-type-id="text-editor">
655
-        <state relative-caret-position="105">
656
-          <caret line="7" column="24" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="24" />
644
+        <state relative-caret-position="195">
645
+          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
657 646
           <folding>
658 647
             <element signature="imports" expanded="true" />
659
-            <element signature="e#255#267#0" expanded="true" />
660
-            <element signature="e#229#230#0" expanded="true" />
661
-            <element signature="e#256#257#0" expanded="true" />
662 648
           </folding>
663 649
         </state>
664 650
       </provider>
665 651
     </entry>
652
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
653
+      <provider selected="true" editor-type-id="text-editor">
654
+        <state relative-caret-position="75">
655
+          <caret line="5" column="11" selection-start-line="5" selection-start-column="11" selection-end-line="5" selection-end-column="11" />
656
+        </state>
657
+      </provider>
658
+    </entry>
659
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
660
+      <provider selected="true" editor-type-id="text-editor">
661
+        <state relative-caret-position="30">
662
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
663
+        </state>
664
+      </provider>
665
+    </entry>
666 666
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
667 667
       <provider selected="true" editor-type-id="text-editor">
668
-        <state relative-caret-position="120">
669
-          <caret line="8" selection-start-line="8" selection-end-line="8" />
668
+        <state relative-caret-position="285">
669
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
670 670
           <folding>
671 671
             <element signature="e#137#138#0" expanded="true" />
672 672
             <element signature="e#168#169#0" expanded="true" />
@@ -674,30 +674,20 @@
674 674
         </state>
675 675
       </provider>
676 676
     </entry>
677
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
677
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
678 678
       <provider selected="true" editor-type-id="text-editor">
679
-        <state relative-caret-position="253">
680
-          <caret line="19" column="9" selection-start-line="19" selection-start-column="9" selection-end-line="19" selection-end-column="9" />
679
+        <state relative-caret-position="105">
680
+          <caret line="7" column="24" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="24" />
681 681
           <folding>
682 682
             <element signature="imports" expanded="true" />
683
-            <element signature="e#571#572#0" expanded="true" />
684
-            <element signature="e#612#613#0" expanded="true" />
685
-            <element signature="e#646#647#0" expanded="true" />
686
-            <element signature="e#693#694#0" expanded="true" />
687
-            <element signature="e#749#750#0" expanded="true" />
688
-            <element signature="e#789#790#0" expanded="true" />
689
-            <element signature="e#821#822#0" expanded="true" />
690
-            <element signature="e#874#875#0" expanded="true" />
691
-            <element signature="e#904#905#0" expanded="true" />
692
-            <element signature="e#952#953#0" expanded="true" />
693 683
           </folding>
694 684
         </state>
695 685
       </provider>
696 686
     </entry>
697
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
687
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
698 688
       <provider selected="true" editor-type-id="text-editor">
699
-        <state relative-caret-position="195">
700
-          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
689
+        <state relative-caret-position="428">
690
+          <caret line="52" column="8" selection-start-line="52" selection-start-column="8" selection-end-line="52" selection-end-column="58" />
701 691
           <folding>
702 692
             <element signature="imports" expanded="true" />
703 693
           </folding>
@@ -706,51 +696,31 @@
706 696
     </entry>
707 697
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
708 698
       <provider selected="true" editor-type-id="text-editor">
709
-        <state relative-caret-position="255">
710
-          <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
711
-        </state>
712
-      </provider>
713
-    </entry>
714
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
715
-      <provider selected="true" editor-type-id="text-editor">
716
-        <state relative-caret-position="30">
717
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
718
-        </state>
719
-      </provider>
720
-    </entry>
721
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
722
-      <provider selected="true" editor-type-id="text-editor">
723
-        <state relative-caret-position="492">
724
-          <caret line="63" selection-start-line="63" selection-end-line="63" />
725
-          <folding>
726
-            <element signature="imports" expanded="true" />
727
-            <element signature="e#232#241#0" expanded="true" />
728
-            <element signature="e#209#210#0" expanded="true" />
729
-            <element signature="e#240#241#0" expanded="true" />
730
-          </folding>
699
+        <state relative-caret-position="105">
700
+          <caret line="10" selection-start-line="10" selection-end-line="10" />
731 701
         </state>
732 702
       </provider>
733 703
     </entry>
734 704
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
735 705
       <provider selected="true" editor-type-id="text-editor">
736
-        <state relative-caret-position="165">
737
-          <caret line="11" selection-start-line="11" selection-end-line="11" />
706
+        <state relative-caret-position="225">
707
+          <caret line="15" column="45" lean-forward="true" selection-start-line="15" selection-start-column="45" selection-end-line="15" selection-end-column="45" />
738 708
           <folding>
739 709
             <element signature="e#171#172#0" expanded="true" />
740 710
             <element signature="e#202#203#0" expanded="true" />
741
-            <element signature="e#263#264#0" expanded="true" />
742
-            <element signature="e#300#301#0" expanded="true" />
743 711
           </folding>
744 712
         </state>
745 713
       </provider>
746 714
     </entry>
747 715
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
748 716
       <provider selected="true" editor-type-id="text-editor">
749
-        <state relative-caret-position="30">
750
-          <caret line="2" column="22" selection-start-line="2" selection-start-column="22" selection-end-line="2" selection-end-column="22" />
717
+        <state relative-caret-position="-120">
718
+          <caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="72" />
751 719
           <folding>
752
-            <element signature="e#624#625#0" expanded="true" />
753
-            <element signature="e#655#656#0" expanded="true" />
720
+            <element signature="e#805#806#0" expanded="true" />
721
+            <element signature="e#836#837#0" expanded="true" />
722
+            <element signature="e#1010#1011#0" expanded="true" />
723
+            <element signature="e#1052#1053#0" expanded="true" />
754 724
           </folding>
755 725
         </state>
756 726
       </provider>

+ 20
- 3
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java Voir le fichier

@@ -3,17 +3,19 @@ package io.zipcoder.interfaces;
3 3
 public class ZipCodeWilmington {
4 4
 
5 5
     private static final ZipCodeWilmington INSTANCE = new ZipCodeWilmington();
6
-    private Learner[] cohort;
6
+
7 7
 
8 8
     private ZipCodeWilmington() {
9 9
 
10 10
     }
11 11
 
12
-    private static final Students students = new Students();
13
-    private static final Instructors instructors = new Instructors();
12
+    private static final Students students = Students.getINSTANCE();
13
+    private static final Instructors instructors = Instructors.getINSTANCE();
14
+    private Learner[] cohort = new Learner[students.studentList.size()];
14 15
 
15 16
     public void hostLecture(Teacher teacher, double numberOfHours) {
16 17
 
18
+        addLearners(students);
17 19
 
18 20
         instructors.lecture((Learner[]) students.studentList.toArray(), numberOfHours);
19 21
 
@@ -25,7 +27,22 @@ public class ZipCodeWilmington {
25 27
     }
26 28
 
27 29
 
30
+
31
+    public void addLearners(Students students){
32
+        for (int i = 0; i < students.studentList.size(); i++){
33
+            cohort[i] = students.studentList.get(i);
34
+        }
35
+
36
+    }
37
+
38
+
28 39
     public static ZipCodeWilmington getINSTANCE() {
29 40
         return INSTANCE;
30 41
     }
42
+
43
+    public Student getStudent(){
44
+        return students.studentList.get(1);
45
+    }
46
+
47
+
31 48
 }

+ 9
- 2
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java Voir le fichier

@@ -1,5 +1,6 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
+import org.junit.Assert;
3 4
 import org.junit.Test;
4 5
 
5 6
 import static org.junit.Assert.*;
@@ -8,6 +9,7 @@ public class ZipCodeWilmingtonTest {
8 9
 
9 10
 
10 11
     ZipCodeWilmington zcw = ZipCodeWilmington.getINSTANCE();
12
+
11 13
     long id = 1;
12 14
     double numHours = 39;
13 15
 
@@ -16,8 +18,13 @@ public class ZipCodeWilmingtonTest {
16 18
 
17 19
         zcw.hostLecture(id, numHours);
18 20
 
19
-        double expected = 1;
20
-//        double actual = zcw.
21
+        double expected = 6;
22
+        double actual = zcw.getStudent().getTotalStudyTime();
23
+//
24
+        Assert.assertEquals(expected, actual);
25
+
26
+
27
+
21 28
 
22 29
     }
23 30
 }