Преглед на файлове

completed instructos and tests pass

mpierse преди 6 години
родител
ревизия
8496837afe

+ 243
- 224
.idea/workspace.xml Целия файл

@@ -2,10 +2,15 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="7c067e32-f3c4-46c3-90e9-a9b9f12f1b24" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" afterDir="false" />
7 7
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
10
+      <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" />
11
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" afterDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" afterDir="false" />
9 14
     </list>
10 15
     <ignored path="$PROJECT_DIR$/target/" />
11 16
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -18,33 +23,33 @@
18 23
     <session id="-1479912162">
19 24
       <usages-collector id="statistics.lifecycle.project">
20 25
         <counts>
21
-          <entry key="project.closed" value="4" />
22
-          <entry key="project.open.time.1" value="3" />
26
+          <entry key="project.closed" value="7" />
27
+          <entry key="project.open.time.1" value="6" />
23 28
           <entry key="project.open.time.7" value="1" />
24 29
           <entry key="project.open.time.8" value="1" />
25
-          <entry key="project.opened" value="5" />
30
+          <entry key="project.opened" value="8" />
26 31
         </counts>
27 32
       </usages-collector>
28 33
       <usages-collector id="statistics.file.extensions.open">
29 34
         <counts>
30 35
           <entry key="class" value="7" />
31
-          <entry key="java" value="14" />
36
+          <entry key="java" value="25" />
32 37
         </counts>
33 38
       </usages-collector>
34 39
       <usages-collector id="statistics.file.types.open">
35 40
         <counts>
36 41
           <entry key="CLASS" value="7" />
37
-          <entry key="JAVA" value="14" />
42
+          <entry key="JAVA" value="25" />
38 43
         </counts>
39 44
       </usages-collector>
40 45
       <usages-collector id="statistics.file.extensions.edit">
41 46
         <counts>
42
-          <entry key="java" value="3158" />
47
+          <entry key="java" value="4376" />
43 48
         </counts>
44 49
       </usages-collector>
45 50
       <usages-collector id="statistics.file.types.edit">
46 51
         <counts>
47
-          <entry key="JAVA" value="3158" />
52
+          <entry key="JAVA" value="4376" />
48 53
         </counts>
49 54
       </usages-collector>
50 55
       <usages-collector id="statistics.js.language.service.starts" />
@@ -54,122 +59,127 @@
54 59
     </session>
55 60
   </component>
56 61
   <component name="FileEditorManager">
57
-    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
58
-      <file pinned="false" current-in-tab="false">
59
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
60
-          <provider selected="true" editor-type-id="text-editor">
61
-            <state relative-caret-position="105">
62
-              <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
63
-              <folding>
64
-                <element signature="e#135#136#0" expanded="true" />
65
-                <element signature="e#161#162#0" expanded="true" />
66
-              </folding>
67
-            </state>
68
-          </provider>
69
-        </entry>
70
-      </file>
71
-      <file pinned="false" current-in-tab="false">
72
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
73
-          <provider selected="true" editor-type-id="text-editor">
74
-            <state relative-caret-position="150">
75
-              <caret line="14" column="40" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
76
-              <folding>
77
-                <element signature="e#355#356#0" expanded="true" />
78
-              </folding>
79
-            </state>
80
-          </provider>
81
-        </entry>
82
-      </file>
83
-      <file pinned="false" current-in-tab="false">
84
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
85
-          <provider selected="true" editor-type-id="text-editor">
86
-            <state relative-caret-position="90">
87
-              <caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
88
-            </state>
89
-          </provider>
90
-        </entry>
91
-      </file>
92
-      <file pinned="false" current-in-tab="false">
93
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
94
-          <provider selected="true" editor-type-id="text-editor">
95
-            <state relative-caret-position="438">
96
-              <caret line="41" column="29" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="29" />
97
-              <folding>
98
-                <element signature="imports" expanded="true" />
99
-              </folding>
100
-            </state>
101
-          </provider>
102
-        </entry>
103
-      </file>
104
-      <file pinned="false" current-in-tab="false">
105
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
106
-          <provider selected="true" editor-type-id="text-editor">
107
-            <state relative-caret-position="-90">
108
-              <caret line="5" selection-start-line="5" selection-end-line="5" />
109
-              <folding>
110
-                <element signature="imports" expanded="true" />
111
-              </folding>
112
-            </state>
113
-          </provider>
114
-        </entry>
115
-      </file>
116
-      <file pinned="false" current-in-tab="false">
117
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
118
-          <provider selected="true" editor-type-id="text-editor">
119
-            <state relative-caret-position="150">
120
-              <caret line="10" column="43" lean-forward="true" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="43" />
121
-              <folding>
122
-                <element signature="imports" expanded="true" />
123
-              </folding>
124
-            </state>
125
-          </provider>
126
-        </entry>
127
-      </file>
128
-      <file pinned="false" current-in-tab="true">
129
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
130
-          <provider selected="true" editor-type-id="text-editor">
131
-            <state relative-caret-position="135">
132
-              <caret line="9" column="42" lean-forward="true" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
133
-              <folding>
134
-                <element signature="e#230#231#0" expanded="true" />
135
-              </folding>
136
-            </state>
137
-          </provider>
138
-        </entry>
139
-      </file>
140
-      <file pinned="false" current-in-tab="false">
141
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
142
-          <provider selected="true" editor-type-id="text-editor">
143
-            <state relative-caret-position="413">
144
-              <caret line="42" column="23" lean-forward="true" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
145
-              <folding>
146
-                <element signature="imports" expanded="true" />
147
-                <element signature="e#139#147#0" expanded="true" />
148
-                <element signature="e#251#252#0" expanded="true" />
149
-                <element signature="e#291#292#0" expanded="true" />
150
-                <element signature="e#332#333#0" expanded="true" />
151
-                <element signature="e#373#374#0" expanded="true" />
152
-                <element signature="e#1005#1006#0" expanded="true" />
153
-                <element signature="e#1030#1031#0" expanded="true" />
154
-              </folding>
155
-            </state>
156
-          </provider>
157
-        </entry>
158
-      </file>
159
-      <file pinned="false" current-in-tab="false">
160
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
161
-          <provider selected="true" editor-type-id="text-editor">
162
-            <state relative-caret-position="180">
163
-              <caret line="14" column="55" selection-start-line="14" selection-start-column="55" selection-end-line="14" selection-end-column="55" />
164
-              <folding>
165
-                <element signature="e#125#126#0" expanded="true" />
166
-                <element signature="e#150#151#0" expanded="true" />
167
-              </folding>
168
-            </state>
169
-          </provider>
170
-        </entry>
171
-      </file>
172
-    </leaf>
62
+    <splitter split-orientation="horizontal" split-proportion="0.5">
63
+      <split-first>
64
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
65
+          <file pinned="false" current-in-tab="false">
66
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
67
+              <provider selected="true" editor-type-id="text-editor">
68
+                <state relative-caret-position="334">
69
+                  <caret line="27" column="39" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
70
+                  <folding>
71
+                    <element signature="imports" expanded="true" />
72
+                  </folding>
73
+                </state>
74
+              </provider>
75
+            </entry>
76
+          </file>
77
+          <file pinned="false" current-in-tab="false">
78
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
79
+              <provider selected="true" editor-type-id="text-editor">
80
+                <state relative-caret-position="90">
81
+                  <caret line="6" column="59" selection-start-line="6" selection-start-column="59" selection-end-line="6" selection-end-column="59" />
82
+                </state>
83
+              </provider>
84
+            </entry>
85
+          </file>
86
+          <file pinned="false" current-in-tab="false">
87
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
88
+              <provider selected="true" editor-type-id="text-editor">
89
+                <state relative-caret-position="105">
90
+                  <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
91
+                  <folding>
92
+                    <element signature="imports" expanded="true" />
93
+                  </folding>
94
+                </state>
95
+              </provider>
96
+            </entry>
97
+          </file>
98
+          <file pinned="false" current-in-tab="false">
99
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
100
+              <provider selected="true" editor-type-id="text-editor">
101
+                <state relative-caret-position="15">
102
+                  <caret line="1" selection-start-line="1" selection-end-line="1" />
103
+                </state>
104
+              </provider>
105
+            </entry>
106
+          </file>
107
+          <file pinned="false" current-in-tab="true">
108
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
109
+              <provider selected="true" editor-type-id="text-editor">
110
+                <state>
111
+                  <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
112
+                  <folding>
113
+                    <element signature="imports" expanded="true" />
114
+                  </folding>
115
+                </state>
116
+              </provider>
117
+            </entry>
118
+          </file>
119
+          <file pinned="false" current-in-tab="false">
120
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
121
+              <provider selected="true" editor-type-id="text-editor">
122
+                <state relative-caret-position="180">
123
+                  <caret line="12" column="5" lean-forward="true" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
124
+                  <folding>
125
+                    <element signature="e#323#324#0" expanded="true" />
126
+                    <element signature="e#347#348#0" 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/io/zipcoder/interfaces/People.java">
134
+              <provider selected="true" editor-type-id="text-editor">
135
+                <state relative-caret-position="342">
136
+                  <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
137
+                  <folding>
138
+                    <element signature="imports" expanded="true" />
139
+                    <element signature="e#1005#1006#0" expanded="true" />
140
+                    <element signature="e#1053#1054#0" expanded="true" />
141
+                  </folding>
142
+                </state>
143
+              </provider>
144
+            </entry>
145
+          </file>
146
+          <file pinned="false" current-in-tab="false">
147
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
148
+              <provider selected="true" editor-type-id="text-editor">
149
+                <state relative-caret-position="300">
150
+                  <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
151
+                </state>
152
+              </provider>
153
+            </entry>
154
+          </file>
155
+        </leaf>
156
+      </split-first>
157
+      <split-second>
158
+        <leaf>
159
+          <file pinned="false" current-in-tab="false">
160
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
161
+              <provider selected="true" editor-type-id="text-editor">
162
+                <state>
163
+                  <caret column="31" selection-start-column="31" selection-end-column="31" />
164
+                </state>
165
+              </provider>
166
+            </entry>
167
+          </file>
168
+          <file pinned="false" current-in-tab="true">
169
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
170
+              <provider selected="true" editor-type-id="text-editor">
171
+                <state relative-caret-position="300">
172
+                  <caret line="20" column="23" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
173
+                  <folding>
174
+                    <element signature="imports" expanded="true" />
175
+                  </folding>
176
+                </state>
177
+              </provider>
178
+            </entry>
179
+          </file>
180
+        </leaf>
181
+      </split-second>
182
+    </splitter>
173 183
   </component>
174 184
   <component name="FileTemplateManagerImpl">
175 185
     <option name="RECENT_TEMPLATES">
@@ -188,15 +198,17 @@
188 198
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
189 199
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
190 200
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
201
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
202
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
203
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
191 204
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
205
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
192 206
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
193
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
194 207
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
195 208
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
196
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
197
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
198 209
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
199
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
210
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
211
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" />
200 212
       </list>
201 213
     </option>
202 214
   </component>
@@ -282,7 +294,7 @@
282 294
   <component name="PropertiesComponent">
283 295
     <property name="WebServerToolWindowFactoryState" value="false" />
284 296
     <property name="aspect.path.notification.shown" value="true" />
285
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541514227666" />
297
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541629628624" />
286 298
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
287 299
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
288 300
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -304,8 +316,8 @@
304 316
       </list>
305 317
     </option>
306 318
   </component>
307
-  <component name="RunManager" selected="JUnit.TestStudents">
308
-    <configuration name="TestPeople" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
319
+  <component name="RunManager" selected="JUnit.TestInstructors">
320
+    <configuration name="TestInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
309 321
       <module name="interfaces-1" />
310 322
       <extension name="coverage">
311 323
         <pattern>
@@ -314,12 +326,12 @@
314 326
         </pattern>
315 327
       </extension>
316 328
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
317
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
329
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestInstructors" />
318 330
       <method v="2">
319 331
         <option name="Make" enabled="true" />
320 332
       </method>
321 333
     </configuration>
322
-    <configuration name="TestPeople.testGetArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
334
+    <configuration name="TestInstructors.testInitializationSetupInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
323 335
       <module name="interfaces-1" />
324 336
       <extension name="coverage">
325 337
         <pattern>
@@ -328,14 +340,14 @@
328 340
         </pattern>
329 341
       </extension>
330 342
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
331
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
332
-      <option name="METHOD_NAME" value="testGetArray" />
343
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestInstructors" />
344
+      <option name="METHOD_NAME" value="testInitializationSetupInstructors" />
333 345
       <option name="TEST_OBJECT" value="method" />
334 346
       <method v="2">
335 347
         <option name="Make" enabled="true" />
336 348
       </method>
337 349
     </configuration>
338
-    <configuration name="TestPeople.testRemoveAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
350
+    <configuration name="TestInstructors.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
339 351
       <module name="interfaces-1" />
340 352
       <extension name="coverage">
341 353
         <pattern>
@@ -344,8 +356,8 @@
344 356
         </pattern>
345 357
       </extension>
346 358
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
347
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
348
-      <option name="METHOD_NAME" value="testRemoveAll" />
359
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestInstructors" />
360
+      <option name="METHOD_NAME" value="testSingletonInstance" />
349 361
       <option name="TEST_OBJECT" value="method" />
350 362
       <method v="2">
351 363
         <option name="Make" enabled="true" />
@@ -365,7 +377,7 @@
365 377
         <option name="Make" enabled="true" />
366 378
       </method>
367 379
     </configuration>
368
-    <configuration name="TestStudents.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
380
+    <configuration name="TestStudents.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
369 381
       <module name="interfaces-1" />
370 382
       <extension name="coverage">
371 383
         <pattern>
@@ -375,26 +387,26 @@
375 387
       </extension>
376 388
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
377 389
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestStudents" />
378
-      <option name="METHOD_NAME" value="testSingletonInstance" />
390
+      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
379 391
       <option name="TEST_OBJECT" value="method" />
380 392
       <method v="2">
381 393
         <option name="Make" enabled="true" />
382 394
       </method>
383 395
     </configuration>
384 396
     <list>
385
-      <item itemvalue="JUnit.TestPeople" />
386
-      <item itemvalue="JUnit.TestPeople.testGetArray" />
387
-      <item itemvalue="JUnit.TestPeople.testRemoveAll" />
388
-      <item itemvalue="JUnit.TestStudents.testSingletonInstance" />
389 397
       <item itemvalue="JUnit.TestStudents" />
398
+      <item itemvalue="JUnit.TestStudents.testInitializationSetupStudents" />
399
+      <item itemvalue="JUnit.TestInstructors" />
400
+      <item itemvalue="JUnit.TestInstructors.testSingletonInstance" />
401
+      <item itemvalue="JUnit.TestInstructors.testInitializationSetupInstructors" />
390 402
     </list>
391 403
     <recent_temporary>
392 404
       <list>
405
+        <item itemvalue="JUnit.TestInstructors" />
406
+        <item itemvalue="JUnit.TestInstructors.testInitializationSetupInstructors" />
393 407
         <item itemvalue="JUnit.TestStudents" />
394
-        <item itemvalue="JUnit.TestStudents.testSingletonInstance" />
395
-        <item itemvalue="JUnit.TestPeople.testRemoveAll" />
396
-        <item itemvalue="JUnit.TestPeople.testGetArray" />
397
-        <item itemvalue="JUnit.TestPeople" />
408
+        <item itemvalue="JUnit.TestStudents.testInitializationSetupStudents" />
409
+        <item itemvalue="JUnit.TestInstructors.testSingletonInstance" />
398 410
       </list>
399 411
     </recent_temporary>
400 412
   </component>
@@ -412,49 +424,53 @@
412 424
       <workItem from="1541427202096" duration="269000" />
413 425
       <workItem from="1541458673202" duration="384000" />
414 426
       <workItem from="1541470434468" duration="1563000" />
415
-      <workItem from="1541510571713" duration="3247000" />
427
+      <workItem from="1541510571713" duration="3589000" />
428
+      <workItem from="1541555249448" duration="2472000" />
429
+      <workItem from="1541610186260" duration="3053000" />
430
+      <workItem from="1541625651457" duration="2683000" />
416 431
     </task>
417 432
     <servers />
418 433
   </component>
419 434
   <component name="TestHistory">
420
-    <history-entry file="TestInstructor_testLecture - 2018.11.03 at 16h 47m 00s.xml">
421
-      <configuration name="TestInstructor.testLecture" configurationId="JUnit" />
435
+    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.07 at 13h 13m 38s.xml">
436
+      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
422 437
     </history-entry>
423
-    <history-entry file="TestPeople - 2018.11.05 at 21h 18m 22s.xml">
424
-      <configuration name="TestPeople" configurationId="JUnit" />
438
+    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.07 at 13h 14m 15s.xml">
439
+      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
425 440
     </history-entry>
426
-    <history-entry file="TestPeople_testAdd - 2018.11.05 at 21h 18m 49s.xml">
427
-      <configuration name="TestPeople.testAdd" configurationId="JUnit" />
441
+    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.07 at 13h 19m 45s.xml">
442
+      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
428 443
     </history-entry>
429
-    <history-entry file="TestPeople_testAdd - 2018.11.05 at 21h 24m 35s.xml">
430
-      <configuration name="TestPeople.testAdd" configurationId="JUnit" />
444
+    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.07 at 13h 20m 13s.xml">
445
+      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
431 446
     </history-entry>
432
-    <history-entry file="TestPeople_testAdd - 2018.11.05 at 21h 24m 59s.xml">
433
-      <configuration name="TestPeople.testAdd" configurationId="JUnit" />
447
+    <history-entry file="TestInstructors - 2018.11.07 at 16h 31m 46s.xml">
448
+      <configuration name="TestInstructors" configurationId="JUnit" />
434 449
     </history-entry>
435
-    <history-entry file="TestPeople - 2018.11.05 at 21h 26m 15s.xml">
436
-      <configuration name="TestPeople" configurationId="JUnit" />
450
+    <history-entry file="TestInstructors - 2018.11.07 at 17h 21m 33s.xml">
451
+      <configuration name="TestInstructors" configurationId="JUnit" />
437 452
     </history-entry>
438
-    <history-entry file="TestPeople_testRemoveByPerson - 2018.11.05 at 21h 30m 26s.xml">
439
-      <configuration name="TestPeople.testRemoveByPerson" configurationId="JUnit" />
453
+    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.07 at 17h 22m 12s.xml">
454
+      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
440 455
     </history-entry>
441
-    <history-entry file="TestPeople - 2018.11.06 at 08h 36m 49s.xml">
442
-      <configuration name="TestPeople" configurationId="JUnit" />
456
+    <history-entry file="TestStudents - 2018.11.07 at 17h 22m 15s.xml">
457
+      <configuration name="TestStudents" configurationId="JUnit" />
443 458
     </history-entry>
444
-    <history-entry file="TestPeople_testGetArray - 2018.11.06 at 08h 46m 24s.xml">
445
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
459
+    <history-entry file="TestInstructors - 2018.11.07 at 17h 22m 24s.xml">
460
+      <configuration name="TestInstructors" configurationId="JUnit" />
446 461
     </history-entry>
447
-    <history-entry file="TestPeople_testRemoveAll - 2018.11.06 at 08h 48m 44s.xml">
448
-      <configuration name="TestPeople.testRemoveAll" configurationId="JUnit" />
462
+    <history-entry file="TestInstructors - 2018.11.07 at 17h 22m 48s.xml">
463
+      <configuration name="TestInstructors" configurationId="JUnit" />
449 464
     </history-entry>
450 465
   </component>
451 466
   <component name="TimeTrackingManager">
452
-    <option name="totallyTimeSpent" value="13555000" />
467
+    <option name="totallyTimeSpent" value="22105000" />
453 468
   </component>
454 469
   <component name="ToolWindowManager">
455 470
     <frame x="0" y="23" width="1440" height="807" extended-state="6" />
471
+    <editor active="true" />
456 472
     <layout>
457
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2639485" />
473
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16309012" />
458 474
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
459 475
       <window_info id="Image Layers" order="2" />
460 476
       <window_info id="Designer" order="3" />
@@ -463,7 +479,7 @@
463 479
       <window_info id="Favorites" order="6" side_tool="true" />
464 480
       <window_info anchor="bottom" id="Message" order="0" />
465 481
       <window_info anchor="bottom" id="Find" order="1" />
466
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32804233" />
482
+      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.29090908" />
467 483
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
468 484
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
469 485
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -472,7 +488,7 @@
472 488
       <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
473 489
       <window_info anchor="bottom" id="Terminal" order="9" />
474 490
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
475
-      <window_info anchor="bottom" id="Messages" order="11" visible="true" weight="0.43356642" />
491
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.43216783" />
476 492
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
477 493
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
478 494
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -495,9 +511,6 @@
495 511
       <provider selected="true" editor-type-id="text-editor">
496 512
         <state relative-caret-position="285">
497 513
           <caret line="23" column="32" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="32" />
498
-          <folding>
499
-            <element signature="imports" expanded="true" />
500
-          </folding>
501 514
         </state>
502 515
       </provider>
503 516
     </entry>
@@ -508,16 +521,6 @@
508 521
         </state>
509 522
       </provider>
510 523
     </entry>
511
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
512
-      <provider selected="true" editor-type-id="text-editor">
513
-        <state relative-caret-position="270">
514
-          <caret line="19" column="5" selection-start-line="7" selection-start-column="4" selection-end-line="19" selection-end-column="5" />
515
-          <folding>
516
-            <element signature="imports" expanded="true" />
517
-          </folding>
518
-        </state>
519
-      </provider>
520
-    </entry>
521 524
     <entry file="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/org/junit/runners/BlockJUnit4ClassRunner.class">
522 525
       <provider selected="true" editor-type-id="text-editor">
523 526
         <state relative-caret-position="315">
@@ -554,16 +557,38 @@
554 557
         </state>
555 558
       </provider>
556 559
     </entry>
560
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
561
+      <provider selected="true" editor-type-id="text-editor">
562
+        <state relative-caret-position="105">
563
+          <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
564
+          <folding>
565
+            <element signature="e#135#136#0" expanded="true" />
566
+            <element signature="e#161#162#0" expanded="true" />
567
+          </folding>
568
+        </state>
569
+      </provider>
570
+    </entry>
557 571
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
558 572
       <provider selected="true" editor-type-id="text-editor">
559
-        <state relative-caret-position="150">
560
-          <caret line="14" column="40" selection-start-line="14" selection-start-column="40" selection-end-line="14" selection-end-column="40" />
573
+        <state relative-caret-position="75">
574
+          <caret line="5" column="22" lean-forward="true" selection-start-line="5" selection-start-column="22" selection-end-line="5" selection-end-column="22" />
561 575
           <folding>
576
+            <element signature="e#317#318#0" expanded="true" />
562 577
             <element signature="e#355#356#0" expanded="true" />
563 578
           </folding>
564 579
         </state>
565 580
       </provider>
566 581
     </entry>
582
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
583
+      <provider selected="true" editor-type-id="text-editor">
584
+        <state relative-caret-position="105">
585
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
586
+          <folding>
587
+            <element signature="imports" expanded="true" />
588
+          </folding>
589
+        </state>
590
+      </provider>
591
+    </entry>
567 592
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
568 593
       <provider selected="true" editor-type-id="text-editor">
569 594
         <state relative-caret-position="90">
@@ -571,81 +596,75 @@
571 596
         </state>
572 597
       </provider>
573 598
     </entry>
574
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
599
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
575 600
       <provider selected="true" editor-type-id="text-editor">
576
-        <state relative-caret-position="105">
577
-          <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="9" selection-end-column="5" />
601
+        <state relative-caret-position="334">
602
+          <caret line="27" column="39" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
578 603
           <folding>
579
-            <element signature="e#135#136#0" expanded="true" />
580
-            <element signature="e#161#162#0" expanded="true" />
604
+            <element signature="imports" expanded="true" />
581 605
           </folding>
582 606
         </state>
583 607
       </provider>
584 608
     </entry>
585 609
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
586 610
       <provider selected="true" editor-type-id="text-editor">
587
-        <state relative-caret-position="180">
588
-          <caret line="14" column="55" selection-start-line="14" selection-start-column="55" selection-end-line="14" selection-end-column="55" />
589
-          <folding>
590
-            <element signature="e#125#126#0" expanded="true" />
591
-            <element signature="e#150#151#0" expanded="true" />
592
-          </folding>
611
+        <state relative-caret-position="300">
612
+          <caret line="22" lean-forward="true" selection-start-line="22" selection-end-line="22" />
593 613
         </state>
594 614
       </provider>
595 615
     </entry>
596 616
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
597 617
       <provider selected="true" editor-type-id="text-editor">
598
-        <state relative-caret-position="413">
599
-          <caret line="42" column="23" lean-forward="true" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
618
+        <state relative-caret-position="342">
619
+          <caret line="42" column="23" selection-start-line="42" selection-start-column="23" selection-end-line="42" selection-end-column="23" />
600 620
           <folding>
601 621
             <element signature="imports" expanded="true" />
602
-            <element signature="e#139#147#0" expanded="true" />
603
-            <element signature="e#251#252#0" expanded="true" />
604
-            <element signature="e#291#292#0" expanded="true" />
605
-            <element signature="e#332#333#0" expanded="true" />
606
-            <element signature="e#373#374#0" expanded="true" />
607 622
             <element signature="e#1005#1006#0" expanded="true" />
608
-            <element signature="e#1030#1031#0" expanded="true" />
623
+            <element signature="e#1053#1054#0" expanded="true" />
609 624
           </folding>
610 625
         </state>
611 626
       </provider>
612 627
     </entry>
613 628
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
614 629
       <provider selected="true" editor-type-id="text-editor">
615
-        <state relative-caret-position="438">
616
-          <caret line="41" column="29" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="29" />
630
+        <state relative-caret-position="510">
631
+          <caret line="34" column="50" lean-forward="true" selection-start-line="34" selection-start-column="50" selection-end-line="34" selection-end-column="50" />
617 632
           <folding>
618 633
             <element signature="imports" expanded="true" />
619 634
           </folding>
620 635
         </state>
621 636
       </provider>
622 637
     </entry>
623
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
638
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
624 639
       <provider selected="true" editor-type-id="text-editor">
625
-        <state relative-caret-position="150">
626
-          <caret line="10" column="43" lean-forward="true" selection-start-line="10" selection-start-column="8" selection-end-line="10" selection-end-column="43" />
627
-          <folding>
628
-            <element signature="imports" expanded="true" />
629
-          </folding>
640
+        <state relative-caret-position="15">
641
+          <caret line="1" selection-start-line="1" selection-end-line="1" />
630 642
         </state>
631 643
       </provider>
632 644
     </entry>
633
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
645
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
634 646
       <provider selected="true" editor-type-id="text-editor">
635
-        <state relative-caret-position="-90">
636
-          <caret line="5" selection-start-line="5" selection-end-line="5" />
647
+        <state>
648
+          <caret column="31" selection-start-column="31" selection-end-column="31" />
649
+        </state>
650
+      </provider>
651
+    </entry>
652
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
653
+      <provider selected="true" editor-type-id="text-editor">
654
+        <state>
655
+          <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
637 656
           <folding>
638 657
             <element signature="imports" expanded="true" />
639 658
           </folding>
640 659
         </state>
641 660
       </provider>
642 661
     </entry>
643
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
662
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
644 663
       <provider selected="true" editor-type-id="text-editor">
645
-        <state relative-caret-position="135">
646
-          <caret line="9" column="42" lean-forward="true" selection-start-line="9" selection-start-column="42" selection-end-line="9" selection-end-column="42" />
664
+        <state relative-caret-position="300">
665
+          <caret line="20" column="23" selection-start-line="20" selection-start-column="23" selection-end-line="20" selection-end-column="23" />
647 666
           <folding>
648
-            <element signature="e#230#231#0" expanded="true" />
667
+            <element signature="imports" expanded="true" />
649 668
           </folding>
650 669
         </state>
651 670
       </provider>

+ 4
- 1
src/main/java/io/zipcoder/interfaces/Instructor.java Целия файл

@@ -2,8 +2,11 @@ package io.zipcoder.interfaces;
2 2
 
3 3
 public class Instructor extends Person implements Teacher {
4 4
 
5
-    public Instructor(long id) {
5
+    private String name;
6
+
7
+    public Instructor(long id, String name) {
6 8
         super(id);
9
+        this.name=name;
7 10
     }
8 11
 
9 12
     public void teach(Learner learner, double numHours){

+ 24
- 0
src/main/java/io/zipcoder/interfaces/Instructors.java Целия файл

@@ -0,0 +1,24 @@
1
+package io.zipcoder.interfaces;
2
+
3
+public final class Instructors extends People{
4
+
5
+    private static final Instructors INSTANCE = new Instructors();
6
+    private Instructor[] instructorList = new Instructor[6];
7
+
8
+    private Instructors() {
9
+    }
10
+
11
+    public static Instructors getInstance(){
12
+        return INSTANCE;
13
+    }
14
+
15
+    public Instructor[] getArray() {
16
+        instructorList[0] = new Instructor(1, "Chris");
17
+        instructorList[1] = new Instructor(2, "Nhu");
18
+        instructorList[2] = new Instructor(3, "Wilhem");
19
+        instructorList[3] = new Instructor(4, "Dolio");
20
+        instructorList[4] = new Instructor(5, "Froilan");
21
+        instructorList[5] = new Instructor(6, "Leon");
22
+            return instructorList;
23
+    }
24
+}

+ 4
- 1
src/main/java/io/zipcoder/interfaces/Student.java Целия файл

@@ -3,11 +3,14 @@ package io.zipcoder.interfaces;
3 3
 public class Student extends Person implements Learner{
4 4
 
5 5
    private double totalStudayTime = 0;
6
+   private String name;
6 7
 
7
-    public Student(long id) {
8
+    public Student(long id, String name) {
8 9
         super(id);
10
+        this.name = name;
9 11
     }
10 12
 
13
+
11 14
     public void learn(double numberOfHours){
12 15
         totalStudayTime+=numberOfHours;
13 16
     }

+ 46
- 0
src/main/java/io/zipcoder/interfaces/Students.java Целия файл

@@ -3,6 +3,7 @@ package io.zipcoder.interfaces;
3 3
 public final class Students extends People{
4 4
 
5 5
     private static final Students INSTANCE = new Students();
6
+    private Student[] studentList = new Student[39];
6 7
 
7 8
     private Students() {
8 9
     }
@@ -10,4 +11,49 @@ public final class Students extends People{
10 11
     public static Students getInstance() {
11 12
             return INSTANCE;
12 13
     }
14
+
15
+
16
+    public Student[] getArray() {
17
+        studentList[1] = new Student(1, "Ned Redmond");
18
+        studentList[2] = new Student(2, "Seth Abrams");
19
+        studentList[3] = new Student(3, "Akeem Cherry");
20
+        studentList[4] = new Student(4, "Whitney Martinez");
21
+        studentList[5] = new Student(5, "Nira Parikh");
22
+        studentList[6] = new Student(6, "Connor Dunnigan");
23
+        studentList[7] = new Student(7, "Christian Sheridan");
24
+        studentList[8] = new Student(8, "Curtis Cook");
25
+        studentList[9] = new Student(9, "Nuridalia Hernandez");
26
+        studentList[10] = new Student(10, "Brandon DeFrancis");
27
+        studentList[11] = new Student(11, "De'Jon Johnson");
28
+        studentList[12] = new Student(12, "Demetrius Murray");
29
+        studentList[13] = new Student(13, "Elliott Stansbury");
30
+        studentList[14] = new Student(14, "Nathan Hall");
31
+        studentList[15] = new Student(15, "Jae Joson");
32
+        studentList[16] =new Student(16, "Jacob Anderson");
33
+        studentList[17] =new Student(17, "Jose Bedolla");
34
+        studentList[18] = new Student(18, "Jenn Chao");
35
+        studentList[19] = new Student(19, "Jennifer Tinkler");
36
+        studentList[20] = new Student(20, "Jonathan Hinds");
37
+        studentList[21] = new Student(21, "Jay Samuels");
38
+        studentList[22] = new Student(22, "Jevit Tith");
39
+        studentList[23] = new Student(23, "Lauren Green");
40
+        studentList[24] = new Student(24, "Kate Moore");
41
+        studentList[25] =new Student(25, "Michelle DiMarino");
42
+        studentList[26] =new Student(26, "Maggie Pierse");
43
+        studentList[27] =new Student(27, "Nick Satinover");
44
+        studentList[28] =new Student(28, "Chaitali Patel");
45
+        studentList[29] =new Student(29, "Yesoda Sanka");
46
+        studentList[30] =new Student(30, "Saurav Kamath");
47
+        studentList[31] =new Student(31, "Sam Bhutani");
48
+        studentList[32] =new Student(32, "Soujanya Buragapu");
49
+        studentList[33] =new Student(33, "Steffon Williams");
50
+        studentList[34] =new Student(34, "Zavon Malone");
51
+        studentList[35] =new Student(35, "Thuy Kong");
52
+        studentList[36] =new Student(36, "Thulasi Puppala");
53
+        studentList[37] =new Student(37, "Trinh Tong");
54
+        studentList[38] =new Student(38, "William Brown");
55
+        studentList[0] =new Student(39, "Xzavia Cuello");
56
+
57
+        return studentList;
58
+    }
13 59
 }

+ 3
- 3
src/test/java/io/zipcoder/interfaces/StudentTest.java Целия файл

@@ -7,21 +7,21 @@ public class StudentTest {
7 7
 
8 8
     @Test
9 9
     public void learnerTest(){
10
-        Student student = new Student(2);
10
+        Student student = new Student(2, "foo");
11 11
         boolean actual = student instanceof Learner;
12 12
         Assert.assertTrue(actual);
13 13
     }
14 14
 
15 15
     @Test
16 16
     public void testInheritance(){
17
-        Student student = new Student(3);
17
+        Student student = new Student(3, "bar");
18 18
         boolean actual = student instanceof Person;
19 19
         Assert.assertTrue(actual);
20 20
     }
21 21
 
22 22
     @Test
23 23
     public void testLearn(){
24
-        Student student = new Student(3);
24
+        Student student = new Student(3, "fizz");
25 25
         double hours = student.getTotalStudayTime();
26 26
         student.learn(4.0);
27 27
         double newHours = student.getTotalStudayTime();

+ 8
- 8
src/test/java/io/zipcoder/interfaces/TestInstructor.java Целия файл

@@ -7,22 +7,22 @@ public class TestInstructor {
7 7
 
8 8
     @Test
9 9
     public void testImplementation(){
10
-        Instructor instructor = new Instructor(3);
10
+        Instructor instructor = new Instructor(3,"foo");
11 11
         boolean actual = instructor instanceof Teacher;
12 12
         Assert.assertTrue(actual);
13 13
     }
14 14
 
15 15
     @Test
16 16
     public void testInheritance(){
17
-        Instructor instructor = new Instructor(3);
17
+        Instructor instructor = new Instructor(3,"bar");
18 18
         boolean actual = instructor instanceof Person;
19 19
         Assert.assertTrue(actual);
20 20
     }
21 21
 
22 22
     @Test
23 23
     public void testTeach(){
24
-        Instructor instructor = new Instructor(3);
25
-        Student student = new Student(2);
24
+        Instructor instructor = new Instructor(3, "Fizz");
25
+        Student student = new Student(2,"FooBar");
26 26
         double hours = student.getTotalStudayTime();
27 27
         instructor.teach(student,3.0);
28 28
         double newHours = student.getTotalStudayTime();
@@ -32,10 +32,10 @@ public class TestInstructor {
32 32
 
33 33
     @Test
34 34
     public void testLecture(){
35
-        Instructor instructor = new Instructor(3);
36
-        Student student = new Student(2);
37
-        Student student2 = new Student(3);
38
-        Student student3 = new Student(4);
35
+        Instructor instructor = new Instructor(3, "Buzz");
36
+        Student student = new Student(2, "FizzBuzz");
37
+        Student student2 = new Student(3, "FizzBuzz");
38
+        Student student3 = new Student(4,"BarFoo");
39 39
         Student[] students = new Student[]{student, student2,student3};
40 40
         instructor.lecture(students, 6);
41 41
         double actual = student.getTotalStudayTime();

+ 27
- 0
src/test/java/io/zipcoder/interfaces/TestInstructors.java Целия файл

@@ -0,0 +1,27 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Before;
5
+import org.junit.Test;
6
+
7
+
8
+public class TestInstructors {
9
+
10
+
11
+    @Test
12
+    public void testSingletonInstance(){
13
+        Instructors in = Instructors.getInstance();
14
+        Instructors instance1 = in.getInstance();
15
+        Instructors instance2 = in.getInstance();
16
+        Assert.assertSame(instance1, instance2);
17
+    }
18
+
19
+    @Test
20
+    public void testInitializationSetupInstructors(){
21
+        Instructors in = Instructors.getInstance();
22
+        int actual = in.getArray().length;
23
+        int expected = 6;
24
+        Assert.assertEquals(expected, actual);
25
+    }
26
+
27
+}

+ 10
- 4
src/test/java/io/zipcoder/interfaces/TestStudents.java Целия файл

@@ -4,18 +4,24 @@ import org.junit.Assert;
4 4
 import org.junit.Before;
5 5
 import org.junit.Test;
6 6
 
7
+
7 8
 public class TestStudents {
8 9
 
9
-    @Before
10
-    public class setup(){
11
-        Students students = new Students();
12 10
 
13
-    }
14 11
     @Test
15 12
     public void testSingletonInstance(){
13
+        Students s = Students.getInstance();
16 14
         Students instance1 = Students.getInstance();
17 15
         Students instance2 = Students.getInstance();
18 16
         Assert.assertSame(instance1, instance2);
19 17
     }
20 18
 
19
+    @Test
20
+    public void testInitializationSetupStudents(){
21
+        Students s = Students.getInstance();
22
+        int actual = s.getArray().length;
23
+        int expected = 39;
24
+        Assert.assertEquals(expected, actual);
25
+    }
26
+
21 27
 }