瀏覽代碼

finished lab and tests

Connor Dunnigan 6 年之前
父節點
當前提交
016216ee81

+ 285
- 254
.idea/workspace.xml 查看文件

@@ -2,28 +2,18 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="76996a56-6b4e-4266-927f-fbee7cd1c571" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/.idea/encodings.xml" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__junit_junit_4_12.xml" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml" afterDir="false" />
9
-      <change afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
10
-      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
11
-      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
12
-      <change afterPath="$PROJECT_DIR$/interfaces-1.iml" afterDir="false" />
13
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
14
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
15
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" afterDir="false" />
16
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
17
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" afterDir="false" />
18
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
19
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
20
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" afterDir="false" />
21
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" afterDir="false" />
22
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" afterDir="false" />
23
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" afterDir="false" />
24
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" afterDir="false" />
25
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" afterDir="false" />
26
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java" afterDir="false" />
8
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10
+      <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" />
11
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
13
+      <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" />
14
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" afterDir="false" />
15
+      <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" />
16
+      <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" />
27 17
     </list>
28 18
     <ignored path="$PROJECT_DIR$/target/" />
29 19
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -32,85 +22,69 @@
32 22
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
33 23
     <option name="LAST_RESOLUTION" value="IGNORE" />
34 24
   </component>
25
+  <component name="CoverageDataManager">
26
+    <SUITE FILE_PATH="coverage/interfaces_1$io_zipcoder_interfaces_in_interfaces_1.ic" NAME="io.zipcoder.interfaces in interfaces-1 Coverage Results" MODIFIED="1541875791368" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="idea" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false">
27
+      <FILTER>io.zipcoder.interfaces.*</FILTER>
28
+    </SUITE>
29
+  </component>
30
+  <component name="CoverageViewManager">
31
+    <option name="myElementSize" value="239" />
32
+  </component>
35 33
   <component name="FUSProjectUsageTrigger">
36 34
     <session id="-521849941">
37 35
       <usages-collector id="statistics.lifecycle.project">
38 36
         <counts>
39
-          <entry key="project.closed" value="1" />
37
+          <entry key="project.closed" value="4" />
40 38
           <entry key="project.open.time.1" value="1" />
41
-          <entry key="project.opened" value="1" />
39
+          <entry key="project.open.time.19" value="1" />
40
+          <entry key="project.open.time.3" value="2" />
41
+          <entry key="project.open.time.30" value="1" />
42
+          <entry key="project.opened" value="5" />
42 43
         </counts>
43 44
       </usages-collector>
44 45
       <usages-collector id="statistics.file.extensions.open">
45 46
         <counts>
46
-          <entry key="java" value="24" />
47
+          <entry key="java" value="32" />
47 48
         </counts>
48 49
       </usages-collector>
49 50
       <usages-collector id="statistics.file.types.open">
50 51
         <counts>
51
-          <entry key="JAVA" value="24" />
52
+          <entry key="JAVA" value="32" />
52 53
         </counts>
53 54
       </usages-collector>
54 55
       <usages-collector id="statistics.file.extensions.edit">
55 56
         <counts>
56
-          <entry key="java" value="5511" />
57
+          <entry key="java" value="9043" />
57 58
         </counts>
58 59
       </usages-collector>
59 60
       <usages-collector id="statistics.file.types.edit">
60 61
         <counts>
61
-          <entry key="JAVA" value="5511" />
62
+          <entry key="JAVA" value="9043" />
62 63
         </counts>
63 64
       </usages-collector>
64 65
     </session>
65 66
   </component>
66 67
   <component name="FileEditorManager">
67
-    <splitter split-orientation="horizontal" split-proportion="0.5">
68
+    <splitter split-orientation="horizontal" split-proportion="0.4861779">
68 69
       <split-first>
69
-        <leaf>
70
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
70 71
           <file pinned="false" current-in-tab="false">
71
-            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
72
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
72 73
               <provider selected="true" editor-type-id="text-editor">
73 74
                 <state relative-caret-position="60">
74 75
                   <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
75
-                  <folding>
76
-                    <element signature="e#121#122#0" expanded="true" />
77
-                    <element signature="e#143#144#0" expanded="true" />
78
-                    <element signature="e#191#192#0" expanded="true" />
79
-                    <element signature="e#219#220#0" expanded="true" />
80
-                    <element signature="e#203#204#0" expanded="true" />
81
-                    <element signature="e#228#229#0" expanded="true" />
82
-                    <element signature="e#259#260#0" expanded="true" />
83
-                    <element signature="e#286#287#0" expanded="true" />
84
-                    <element signature="e#326#327#0" expanded="true" />
85
-                    <element signature="e#358#359#0" expanded="true" />
86
-                  </folding>
87 76
                 </state>
88 77
               </provider>
89 78
             </entry>
90 79
           </file>
91 80
           <file pinned="false" current-in-tab="false">
92
-            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
93
-              <provider selected="true" editor-type-id="text-editor">
94
-                <state relative-caret-position="60">
95
-                  <caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
96
-                </state>
97
-              </provider>
98
-            </entry>
99
-          </file>
100
-          <file pinned="false" current-in-tab="true">
101 81
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
102 82
               <provider selected="true" editor-type-id="text-editor">
103 83
                 <state relative-caret-position="105">
104 84
                   <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
105 85
                   <folding>
106 86
                     <element signature="e#146#147#0" expanded="true" />
107
-                    <element signature="e#166#167#0" expanded="true" />
108
-                    <element signature="e#172#173#0" expanded="true" />
109
-                    <element signature="e#202#203#0" expanded="true" />
110
-                    <element signature="e#161#162#0" expanded="true" />
111
-                    <element signature="e#207#208#0" expanded="true" />
112
-                    <element signature="e#257#258#0" expanded="true" />
113
-                    <element signature="e#294#295#0" expanded="true" />
87
+                    <element signature="e#169#170#0" expanded="true" />
114 88
                   </folding>
115 89
                 </state>
116 90
               </provider>
@@ -128,16 +102,8 @@
128 102
           <file pinned="false" current-in-tab="false">
129 103
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
130 104
               <provider selected="true" editor-type-id="text-editor">
131
-                <state relative-caret-position="120">
105
+                <state relative-caret-position="75">
132 106
                   <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
133
-                  <folding>
134
-                    <element signature="e#118#119#0" expanded="true" />
135
-                    <element signature="e#141#142#0" expanded="true" />
136
-                    <element signature="e#183#184#0" expanded="true" />
137
-                    <element signature="e#213#214#0" expanded="true" />
138
-                    <element signature="e#155#156#0" expanded="true" />
139
-                    <element signature="e#177#178#0" expanded="true" />
140
-                  </folding>
141 107
                 </state>
142 108
               </provider>
143 109
             </entry>
@@ -145,17 +111,17 @@
145 111
           <file pinned="false" current-in-tab="false">
146 112
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
147 113
               <provider selected="true" editor-type-id="text-editor">
148
-                <state relative-caret-position="540">
149
-                  <caret line="36" column="27" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
114
+                <state relative-caret-position="525">
115
+                  <caret line="35" column="22" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="22" />
150 116
                   <folding>
151
-                    <element signature="e#174#175#0" expanded="true" />
152
-                    <element signature="e#196#197#0" expanded="true" />
153
-                    <element signature="e#234#235#0" expanded="true" />
154
-                    <element signature="e#266#267#0" expanded="true" />
155
-                    <element signature="e#326#327#0" expanded="true" />
156
-                    <element signature="e#345#346#0" expanded="true" />
157
-                    <element signature="e#1004#1005#0" expanded="true" />
158
-                    <element signature="e#1029#1030#0" expanded="true" />
117
+                    <element signature="e#170#171#0" expanded="true" />
118
+                    <element signature="e#208#209#0" expanded="true" />
119
+                    <element signature="e#235#236#0" expanded="true" />
120
+                    <element signature="e#280#281#0" expanded="true" />
121
+                    <element signature="e#322#323#0" expanded="true" />
122
+                    <element signature="e#363#364#0" expanded="true" />
123
+                    <element signature="e#1006#1007#0" expanded="true" />
124
+                    <element signature="e#1040#1041#0" expanded="true" />
159 125
                   </folding>
160 126
                 </state>
161 127
               </provider>
@@ -164,12 +130,17 @@
164 130
           <file pinned="false" current-in-tab="false">
165 131
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
166 132
               <provider selected="true" editor-type-id="text-editor">
167
-                <state relative-caret-position="90">
168
-                  <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="50" selection-end-column="5" />
169
-                  <folding>
170
-                    <element signature="e#175#176#0" expanded="true" />
171
-                    <element signature="e#196#197#0" expanded="true" />
172
-                  </folding>
133
+                <state relative-caret-position="150">
134
+                  <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
135
+                </state>
136
+              </provider>
137
+            </entry>
138
+          </file>
139
+          <file pinned="false" current-in-tab="true">
140
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
141
+              <provider selected="true" editor-type-id="text-editor">
142
+                <state relative-caret-position="150">
143
+                  <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
173 144
                 </state>
174 145
               </provider>
175 146
             </entry>
@@ -177,11 +148,20 @@
177 148
           <file pinned="false" current-in-tab="false">
178 149
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
179 150
               <provider selected="true" editor-type-id="text-editor">
180
-                <state relative-caret-position="180">
181
-                  <caret line="12" column="57" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
151
+                <state relative-caret-position="150">
152
+                  <caret line="10" column="88" lean-forward="true" selection-start-line="10" selection-start-column="88" selection-end-line="10" selection-end-column="88" />
153
+                </state>
154
+              </provider>
155
+            </entry>
156
+          </file>
157
+          <file pinned="false" current-in-tab="false">
158
+            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
159
+              <provider selected="true" editor-type-id="text-editor">
160
+                <state relative-caret-position="435">
161
+                  <caret line="29" column="48" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" />
182 162
                   <folding>
183
-                    <element signature="e#2474#2475#0" expanded="true" />
184
-                    <element signature="e#2505#2506#0" expanded="true" />
163
+                    <element signature="e#342#343#0" expanded="true" />
164
+                    <element signature="e#360#361#0" expanded="true" />
185 165
                   </folding>
186 166
                 </state>
187 167
               </provider>
@@ -190,12 +170,12 @@
190 170
         </leaf>
191 171
       </split-first>
192 172
       <split-second>
193
-        <leaf>
173
+        <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
194 174
           <file pinned="false" current-in-tab="false">
195 175
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
196 176
               <provider selected="true" editor-type-id="text-editor">
197
-                <state relative-caret-position="465">
198
-                  <caret line="31" column="5" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
177
+                <state relative-caret-position="105">
178
+                  <caret line="7" column="34" lean-forward="true" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
199 179
                   <folding>
200 180
                     <element signature="imports" expanded="true" />
201 181
                   </folding>
@@ -218,7 +198,7 @@
218 198
           <file pinned="false" current-in-tab="false">
219 199
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
220 200
               <provider selected="true" editor-type-id="text-editor">
221
-                <state relative-caret-position="240">
201
+                <state relative-caret-position="226">
222 202
                   <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
223 203
                   <folding>
224 204
                     <element signature="imports" expanded="true" />
@@ -230,8 +210,20 @@
230 210
           <file pinned="false" current-in-tab="false">
231 211
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
232 212
               <provider selected="true" editor-type-id="text-editor">
233
-                <state relative-caret-position="737">
234
-                  <caret line="103" column="38" selection-start-line="103" selection-start-column="38" selection-end-line="103" selection-end-column="38" />
213
+                <state relative-caret-position="221">
214
+                  <caret line="82" column="33" selection-start-line="82" selection-start-column="33" selection-end-line="82" selection-end-column="33" />
215
+                  <folding>
216
+                    <element signature="imports" expanded="true" />
217
+                  </folding>
218
+                </state>
219
+              </provider>
220
+            </entry>
221
+          </file>
222
+          <file pinned="false" current-in-tab="false">
223
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java">
224
+              <provider selected="true" editor-type-id="text-editor">
225
+                <state relative-caret-position="107">
226
+                  <caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
235 227
                   <folding>
236 228
                     <element signature="imports" expanded="true" />
237 229
                   </folding>
@@ -242,8 +234,8 @@
242 234
           <file pinned="false" current-in-tab="false">
243 235
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
244 236
               <provider selected="true" editor-type-id="text-editor">
245
-                <state relative-caret-position="225">
246
-                  <caret line="15" column="9" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
237
+                <state relative-caret-position="330">
238
+                  <caret line="22" column="14" lean-forward="true" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
247 239
                   <folding>
248 240
                     <element signature="imports" expanded="true" />
249 241
                   </folding>
@@ -251,11 +243,23 @@
251 243
               </provider>
252 244
             </entry>
253 245
           </file>
254
-          <file pinned="false" current-in-tab="true">
246
+          <file pinned="false" current-in-tab="false">
255 247
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
256 248
               <provider selected="true" editor-type-id="text-editor">
257
-                <state relative-caret-position="345">
258
-                  <caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
249
+                <state relative-caret-position="285">
250
+                  <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
251
+                  <folding>
252
+                    <element signature="imports" expanded="true" />
253
+                  </folding>
254
+                </state>
255
+              </provider>
256
+            </entry>
257
+          </file>
258
+          <file pinned="false" current-in-tab="true">
259
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
260
+              <provider selected="true" editor-type-id="text-editor">
261
+                <state relative-caret-position="405">
262
+                  <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
259 263
                   <folding>
260 264
                     <element signature="imports" expanded="true" />
261 265
                   </folding>
@@ -274,26 +278,38 @@
274 278
       </list>
275 279
     </option>
276 280
   </component>
281
+  <component name="FindInProjectRecents">
282
+    <findStrings>
283
+      <find>personList</find>
284
+    </findStrings>
285
+    <replaceStrings>
286
+      <replace>studList</replace>
287
+    </replaceStrings>
288
+  </component>
277 289
   <component name="Git.Settings">
278 290
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
279 291
   </component>
280 292
   <component name="IdeDocumentHistory">
281 293
     <option name="CHANGED_PATHS">
282 294
       <list>
283
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
284 295
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
285 296
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
286 297
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" />
287 298
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
288 299
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
289
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
290
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
291
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
292
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
293 300
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
294 301
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
302
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
303
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
304
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
305
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
306
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
307
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java" />
295 308
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
296 309
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" />
310
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java" />
311
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
312
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
297 313
       </list>
298 314
     </option>
299 315
   </component>
@@ -304,10 +320,10 @@
304 320
     <sorting>DEFINITION_ORDER</sorting>
305 321
   </component>
306 322
   <component name="ProjectFrameBounds">
307
-    <option name="x" value="-344" />
308
-    <option name="y" value="-1056" />
309
-    <option name="width" value="1899" />
310
-    <option name="height" value="1056" />
323
+    <option name="x" value="-336" />
324
+    <option name="y" value="-1057" />
325
+    <option name="width" value="1896" />
326
+    <option name="height" value="1042" />
311 327
   </component>
312 328
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
313 329
   <component name="ProjectView">
@@ -315,6 +331,7 @@
315 331
       <foldersAlwaysOnTop value="true" />
316 332
     </navigator>
317 333
     <panes>
334
+      <pane id="PackagesPane" />
318 335
       <pane id="ProjectPane">
319 336
         <subPane>
320 337
           <expand>
@@ -373,14 +390,13 @@
373 390
           <select />
374 391
         </subPane>
375 392
       </pane>
376
-      <pane id="PackagesPane" />
377 393
       <pane id="Scope" />
378 394
     </panes>
379 395
   </component>
380 396
   <component name="PropertiesComponent">
381 397
     <property name="WebServerToolWindowFactoryState" value="false" />
382 398
     <property name="aspect.path.notification.shown" value="true" />
383
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541307197880" />
399
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541875808839" />
384 400
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
385 401
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
386 402
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -401,8 +417,8 @@
401 417
       </list>
402 418
     </option>
403 419
   </component>
404
-  <component name="RunManager" selected="JUnit.TestInstructors">
405
-    <configuration name="TestInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
420
+  <component name="RunManager" selected="JUnit.io.zipcoder.interfaces in interfaces-1">
421
+    <configuration name="TestEducator.testTeach" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
406 422
       <module name="interfaces-1" />
407 423
       <extension name="coverage">
408 424
         <pattern>
@@ -411,12 +427,14 @@
411 427
         </pattern>
412 428
       </extension>
413 429
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
414
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestInstructors" />
430
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestEducator" />
431
+      <option name="METHOD_NAME" value="testTeach" />
432
+      <option name="TEST_OBJECT" value="method" />
415 433
       <method v="2">
416 434
         <option name="Make" enabled="true" />
417 435
       </method>
418 436
     </configuration>
419
-    <configuration name="TestInstructors.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
437
+    <configuration name="TestPeople.testGetArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
420 438
       <module name="interfaces-1" />
421 439
       <extension name="coverage">
422 440
         <pattern>
@@ -425,14 +443,14 @@
425 443
         </pattern>
426 444
       </extension>
427 445
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
428
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestInstructors" />
429
-      <option name="METHOD_NAME" value="testSingletonInstance" />
446
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
447
+      <option name="METHOD_NAME" value="testGetArray" />
430 448
       <option name="TEST_OBJECT" value="method" />
431 449
       <method v="2">
432 450
         <option name="Make" enabled="true" />
433 451
       </method>
434 452
     </configuration>
435
-    <configuration name="TestPeople.testRemoveAll" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
453
+    <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
436 454
       <module name="interfaces-1" />
437 455
       <extension name="coverage">
438 456
         <pattern>
@@ -441,14 +459,14 @@
441 459
         </pattern>
442 460
       </extension>
443 461
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
444
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
445
-      <option name="METHOD_NAME" value="testRemoveAll" />
462
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
463
+      <option name="METHOD_NAME" value="testHostLectureEducator" />
446 464
       <option name="TEST_OBJECT" value="method" />
447 465
       <method v="2">
448 466
         <option name="Make" enabled="true" />
449 467
       </method>
450 468
     </configuration>
451
-    <configuration name="TestStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
469
+    <configuration name="ZipCodeWilmingtonTest.testHostLectureId" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
452 470
       <module name="interfaces-1" />
453 471
       <extension name="coverage">
454 472
         <pattern>
@@ -457,12 +475,14 @@
457 475
         </pattern>
458 476
       </extension>
459 477
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
460
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestStudents" />
478
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
479
+      <option name="METHOD_NAME" value="testHostLectureId" />
480
+      <option name="TEST_OBJECT" value="method" />
461 481
       <method v="2">
462 482
         <option name="Make" enabled="true" />
463 483
       </method>
464 484
     </configuration>
465
-    <configuration name="TestStudents.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
485
+    <configuration name="io.zipcoder.interfaces in interfaces-1" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
466 486
       <module name="interfaces-1" />
467 487
       <extension name="coverage">
468 488
         <pattern>
@@ -471,27 +491,25 @@
471 491
         </pattern>
472 492
       </extension>
473 493
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
474
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestStudents" />
475
-      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
476
-      <option name="TEST_OBJECT" value="method" />
494
+      <option name="TEST_OBJECT" value="package" />
477 495
       <method v="2">
478 496
         <option name="Make" enabled="true" />
479 497
       </method>
480 498
     </configuration>
481 499
     <list>
482
-      <item itemvalue="JUnit.TestPeople.testRemoveAll" />
483
-      <item itemvalue="JUnit.TestStudents" />
484
-      <item itemvalue="JUnit.TestStudents.testInitializationSetupStudents" />
485
-      <item itemvalue="JUnit.TestInstructors.testSingletonInstance" />
486
-      <item itemvalue="JUnit.TestInstructors" />
500
+      <item itemvalue="JUnit.TestEducator.testTeach" />
501
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLectureEducator" />
502
+      <item itemvalue="JUnit.io.zipcoder.interfaces in interfaces-1" />
503
+      <item itemvalue="JUnit.TestPeople.testGetArray" />
504
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLectureId" />
487 505
     </list>
488 506
     <recent_temporary>
489 507
       <list>
490
-        <item itemvalue="JUnit.TestInstructors" />
491
-        <item itemvalue="JUnit.TestInstructors.testSingletonInstance" />
492
-        <item itemvalue="JUnit.TestStudents.testInitializationSetupStudents" />
493
-        <item itemvalue="JUnit.TestStudents" />
494
-        <item itemvalue="JUnit.TestPeople.testRemoveAll" />
508
+        <item itemvalue="JUnit.io.zipcoder.interfaces in interfaces-1" />
509
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLectureId" />
510
+        <item itemvalue="JUnit.TestPeople.testGetArray" />
511
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLectureEducator" />
512
+        <item itemvalue="JUnit.TestEducator.testTeach" />
495 513
       </list>
496 514
     </recent_temporary>
497 515
   </component>
@@ -506,76 +524,81 @@
506 524
       <option name="presentableId" value="Default" />
507 525
       <updated>1541259533085</updated>
508 526
       <workItem from="1541259534958" duration="31992000" />
527
+      <workItem from="1541351125257" duration="267000" />
528
+      <workItem from="1541354691063" duration="1817000" />
529
+      <workItem from="1541528487426" duration="493000" />
530
+      <workItem from="1541599988486" duration="20301000" />
509 531
     </task>
510 532
     <servers />
511 533
   </component>
512 534
   <component name="TestHistory">
513
-    <history-entry file="TestPeople_testGetArray - 2018.11.03 at 17h 54m 34s.xml">
514
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
535
+    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 14s.xml">
536
+      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
515 537
     </history-entry>
516
-    <history-entry file="TestPeople_testGetArray - 2018.11.03 at 17h 59m 58s.xml">
517
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
538
+    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 25s.xml">
539
+      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
518 540
     </history-entry>
519
-    <history-entry file="TestPeople_testGetArray - 2018.11.03 at 18h 00m 16s.xml">
520
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
541
+    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 39s.xml">
542
+      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
521 543
     </history-entry>
522
-    <history-entry file="TestPeople_testGetArray - 2018.11.03 at 18h 01m 20s.xml">
523
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
544
+    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 57s.xml">
545
+      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
524 546
     </history-entry>
525
-    <history-entry file="TestPeople_testRemoveAll - 2018.11.03 at 18h 07m 15s.xml">
526
-      <configuration name="TestPeople.testRemoveAll" configurationId="JUnit" />
547
+    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.10 at 13h 10m 36s.xml">
548
+      <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
527 549
     </history-entry>
528
-    <history-entry file="TestStudents - 2018.11.03 at 19h 51m 55s.xml">
529
-      <configuration name="TestStudents" configurationId="JUnit" />
550
+    <history-entry file="TestPeople_testGetArray - 2018.11.10 at 13h 15m 30s.xml">
551
+      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
530 552
     </history-entry>
531
-    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.03 at 21h 10m 06s.xml">
532
-      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
553
+    <history-entry file="TestPeople_testGetArray - 2018.11.10 at 13h 44m 53s.xml">
554
+      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
533 555
     </history-entry>
534
-    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.03 at 21h 11m 30s.xml">
535
-      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
556
+    <history-entry file="TestPeople_testGetArray - 2018.11.10 at 13h 45m 14s.xml">
557
+      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
536 558
     </history-entry>
537
-    <history-entry file="TestStudents_testInitializationSetupStudents - 2018.11.03 at 21h 27m 52s.xml">
538
-      <configuration name="TestStudents.testInitializationSetupStudents" configurationId="JUnit" />
559
+    <history-entry file="ZipCodeWilmingtonTest_testHostLectureId - 2018.11.10 at 13h 49m 44s.xml">
560
+      <configuration name="ZipCodeWilmingtonTest.testHostLectureId" configurationId="JUnit" />
539 561
     </history-entry>
540
-    <history-entry file="TestInstructors - 2018.11.04 at 00h 31m 18s.xml">
541
-      <configuration name="TestInstructors" configurationId="JUnit" />
562
+    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.10 at 13h 49m 56s.xml">
563
+      <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
542 564
     </history-entry>
543 565
   </component>
544 566
   <component name="TimeTrackingManager">
545
-    <option name="totallyTimeSpent" value="31992000" />
567
+    <option name="totallyTimeSpent" value="54870000" />
546 568
   </component>
547 569
   <component name="ToolWindowManager">
548
-    <frame x="-344" y="-1056" width="1899" height="1056" extended-state="0" />
570
+    <frame x="-336" y="-1057" width="1896" height="1042" extended-state="0" />
549 571
     <editor active="true" />
550 572
     <layout>
551
-      <window_info id="Image Layers" />
552
-      <window_info id="Designer" />
553
-      <window_info id="UI Designer" />
554
-      <window_info id="Capture Tool" />
555
-      <window_info id="Favorites" side_tool="true" />
556
-      <window_info content_ui="combo" id="Project" order="0" weight="0.22563274" />
573
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.10248112" />
557 574
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
558
-      <window_info anchor="bottom" id="Messages" weight="0.32987553" />
559
-      <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
560
-      <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
561
-      <window_info anchor="bottom" id="Terminal" />
562
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
575
+      <window_info id="Image Layers" order="2" />
576
+      <window_info id="Designer" order="3" />
577
+      <window_info id="UI Designer" order="4" />
578
+      <window_info id="Capture Tool" order="5" />
579
+      <window_info id="Favorites" order="6" side_tool="true" />
563 580
       <window_info anchor="bottom" id="Message" order="0" />
564 581
       <window_info anchor="bottom" id="Find" order="1" />
565
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32987553" />
582
+      <window_info anchor="bottom" id="Run" order="2" weight="0.32947367" />
566 583
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
567 584
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
568 585
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
569 586
       <window_info anchor="bottom" id="TODO" order="6" />
570
-      <window_info anchor="right" id="Palette" />
571
-      <window_info anchor="right" id="Theme Preview" />
572
-      <window_info anchor="right" id="Capture Analysis" />
573
-      <window_info anchor="right" id="Palette&#9;" />
574
-      <window_info anchor="right" id="Database" />
575
-      <window_info anchor="right" id="Maven Projects" />
587
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
588
+      <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
589
+      <window_info anchor="bottom" id="Terminal" order="9" />
590
+      <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
591
+      <window_info anchor="bottom" id="Messages" order="11" weight="0.32947367" />
592
+      <window_info anchor="right" id="Coverage" side_tool="true" weight="0.32955772" />
576 593
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
577 594
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
578 595
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
596
+      <window_info anchor="right" id="Palette" order="3" />
597
+      <window_info anchor="right" id="Capture Analysis" order="4" />
598
+      <window_info anchor="right" id="Database" order="5" />
599
+      <window_info anchor="right" id="Theme Preview" order="6" />
600
+      <window_info anchor="right" id="Palette&#9;" order="7" />
601
+      <window_info anchor="right" id="Maven Projects" order="8" />
579 602
     </layout>
580 603
   </component>
581 604
   <component name="TypeScriptGeneratedFilesManager">
@@ -585,71 +608,68 @@
585 608
     <option name="myLimit" value="2678400000" />
586 609
   </component>
587 610
   <component name="editorHistoryManager">
588
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
611
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
589 612
       <provider selected="true" editor-type-id="text-editor">
590
-        <state relative-caret-position="737">
591
-          <caret line="103" column="38" selection-start-line="103" selection-start-column="38" selection-end-line="103" selection-end-column="38" />
613
+        <state relative-caret-position="60">
614
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
592 615
           <folding>
593
-            <element signature="imports" expanded="true" />
616
+            <element signature="e#121#122#0" expanded="true" />
617
+            <element signature="e#143#144#0" expanded="true" />
594 618
           </folding>
595 619
         </state>
596 620
       </provider>
597 621
     </entry>
598
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
622
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
599 623
       <provider selected="true" editor-type-id="text-editor">
600
-        <state relative-caret-position="540">
601
-          <caret line="36" column="27" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
624
+        <state relative-caret-position="105">
625
+          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
602 626
           <folding>
603
-            <element signature="e#174#175#0" expanded="true" />
604
-            <element signature="e#196#197#0" expanded="true" />
605
-            <element signature="e#234#235#0" expanded="true" />
606
-            <element signature="e#266#267#0" expanded="true" />
607
-            <element signature="e#326#327#0" expanded="true" />
608
-            <element signature="e#345#346#0" expanded="true" />
609
-            <element signature="e#1004#1005#0" expanded="true" />
610
-            <element signature="e#1029#1030#0" expanded="true" />
627
+            <element signature="e#146#147#0" expanded="true" />
628
+            <element signature="e#169#170#0" expanded="true" />
611 629
           </folding>
612 630
         </state>
613 631
       </provider>
614 632
     </entry>
615
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
633
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
634
+      <provider selected="true" editor-type-id="text-editor">
635
+        <state relative-caret-position="390">
636
+          <caret line="26" column="49" selection-start-line="26" selection-start-column="49" selection-end-line="26" selection-end-column="49" />
637
+          <folding>
638
+            <element signature="imports" expanded="true" />
639
+          </folding>
640
+        </state>
641
+      </provider>
642
+    </entry>
643
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
616 644
       <provider selected="true" editor-type-id="text-editor">
617 645
         <state relative-caret-position="60">
618
-          <caret line="4" column="44" selection-start-line="4" selection-start-column="44" selection-end-line="4" selection-end-column="44" />
646
+          <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
619 647
         </state>
620 648
       </provider>
621 649
     </entry>
622 650
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
623 651
       <provider selected="true" editor-type-id="text-editor">
624
-        <state relative-caret-position="465">
625
-          <caret line="31" column="5" selection-start-line="31" selection-start-column="5" selection-end-line="31" selection-end-column="5" />
652
+        <state relative-caret-position="105">
653
+          <caret line="7" column="34" lean-forward="true" selection-start-line="7" selection-start-column="34" selection-end-line="7" selection-end-column="34" />
626 654
           <folding>
627 655
             <element signature="imports" expanded="true" />
628 656
           </folding>
629 657
         </state>
630 658
       </provider>
631 659
     </entry>
632
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
660
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
633 661
       <provider selected="true" editor-type-id="text-editor">
634
-        <state relative-caret-position="90">
635
-          <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="50" selection-end-column="5" />
662
+        <state relative-caret-position="330">
663
+          <caret line="22" column="14" lean-forward="true" selection-start-line="22" selection-start-column="14" selection-end-line="22" selection-end-column="14" />
636 664
           <folding>
637
-            <element signature="e#175#176#0" expanded="true" />
638
-            <element signature="e#196#197#0" expanded="true" />
665
+            <element signature="imports" expanded="true" />
639 666
           </folding>
640 667
         </state>
641 668
       </provider>
642 669
     </entry>
643
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
644
-      <provider selected="true" editor-type-id="text-editor">
645
-        <state relative-caret-position="60">
646
-          <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
647
-        </state>
648
-      </provider>
649
-    </entry>
650 670
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
651 671
       <provider selected="true" editor-type-id="text-editor">
652
-        <state relative-caret-position="240">
672
+        <state relative-caret-position="226">
653 673
           <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
654 674
           <folding>
655 675
             <element signature="imports" expanded="true" />
@@ -657,94 +677,105 @@
657 677
         </state>
658 678
       </provider>
659 679
     </entry>
660
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
680
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
681
+      <provider selected="true" editor-type-id="text-editor">
682
+        <state relative-caret-position="150">
683
+          <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
684
+        </state>
685
+      </provider>
686
+    </entry>
687
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
661 688
       <provider selected="true" editor-type-id="text-editor">
662 689
         <state relative-caret-position="60">
663 690
           <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
691
+        </state>
692
+      </provider>
693
+    </entry>
694
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java">
695
+      <provider selected="true" editor-type-id="text-editor">
696
+        <state relative-caret-position="107">
697
+          <caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
664 698
           <folding>
665
-            <element signature="e#121#122#0" expanded="true" />
666
-            <element signature="e#143#144#0" expanded="true" />
667
-            <element signature="e#191#192#0" expanded="true" />
668
-            <element signature="e#219#220#0" expanded="true" />
669
-            <element signature="e#203#204#0" expanded="true" />
670
-            <element signature="e#228#229#0" expanded="true" />
671
-            <element signature="e#259#260#0" expanded="true" />
672
-            <element signature="e#286#287#0" expanded="true" />
673
-            <element signature="e#326#327#0" expanded="true" />
674
-            <element signature="e#358#359#0" expanded="true" />
699
+            <element signature="imports" expanded="true" />
675 700
           </folding>
676 701
         </state>
677 702
       </provider>
678 703
     </entry>
679 704
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
680 705
       <provider selected="true" editor-type-id="text-editor">
681
-        <state relative-caret-position="120">
706
+        <state relative-caret-position="75">
682 707
           <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
683
-          <folding>
684
-            <element signature="e#118#119#0" expanded="true" />
685
-            <element signature="e#141#142#0" expanded="true" />
686
-            <element signature="e#183#184#0" expanded="true" />
687
-            <element signature="e#213#214#0" expanded="true" />
688
-            <element signature="e#155#156#0" expanded="true" />
689
-            <element signature="e#177#178#0" expanded="true" />
690
-          </folding>
691 708
         </state>
692 709
       </provider>
693 710
     </entry>
694
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
711
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
695 712
       <provider selected="true" editor-type-id="text-editor">
696
-        <state relative-caret-position="390">
697
-          <caret line="26" column="49" selection-start-line="26" selection-start-column="49" selection-end-line="26" selection-end-column="49" />
713
+        <state relative-caret-position="525">
714
+          <caret line="35" column="22" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="22" />
698 715
           <folding>
699
-            <element signature="imports" expanded="true" />
716
+            <element signature="e#170#171#0" expanded="true" />
717
+            <element signature="e#208#209#0" expanded="true" />
718
+            <element signature="e#235#236#0" expanded="true" />
719
+            <element signature="e#280#281#0" expanded="true" />
720
+            <element signature="e#322#323#0" expanded="true" />
721
+            <element signature="e#363#364#0" expanded="true" />
722
+            <element signature="e#1006#1007#0" expanded="true" />
723
+            <element signature="e#1040#1041#0" expanded="true" />
700 724
           </folding>
701 725
         </state>
702 726
       </provider>
703 727
     </entry>
704
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
728
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
705 729
       <provider selected="true" editor-type-id="text-editor">
706
-        <state relative-caret-position="180">
707
-          <caret line="12" column="57" selection-start-line="12" selection-start-column="57" selection-end-line="12" selection-end-column="57" />
730
+        <state relative-caret-position="285">
731
+          <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
708 732
           <folding>
709
-            <element signature="e#2474#2475#0" expanded="true" />
710
-            <element signature="e#2505#2506#0" expanded="true" />
733
+            <element signature="imports" expanded="true" />
711 734
           </folding>
712 735
         </state>
713 736
       </provider>
714 737
     </entry>
715
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
738
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
716 739
       <provider selected="true" editor-type-id="text-editor">
717
-        <state relative-caret-position="225">
718
-          <caret line="15" column="9" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
740
+        <state relative-caret-position="221">
741
+          <caret line="82" column="33" selection-start-line="82" selection-start-column="33" selection-end-line="82" selection-end-column="33" />
719 742
           <folding>
720 743
             <element signature="imports" expanded="true" />
721 744
           </folding>
722 745
         </state>
723 746
       </provider>
724 747
     </entry>
725
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
748
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
726 749
       <provider selected="true" editor-type-id="text-editor">
727
-        <state relative-caret-position="345">
728
-          <caret line="23" column="19" selection-start-line="23" selection-start-column="19" selection-end-line="23" selection-end-column="19" />
750
+        <state relative-caret-position="435">
751
+          <caret line="29" column="48" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" />
729 752
           <folding>
730
-            <element signature="imports" expanded="true" />
753
+            <element signature="e#342#343#0" expanded="true" />
754
+            <element signature="e#360#361#0" expanded="true" />
731 755
           </folding>
732 756
         </state>
733 757
       </provider>
734 758
     </entry>
735
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
759
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
736 760
       <provider selected="true" editor-type-id="text-editor">
737
-        <state relative-caret-position="105">
738
-          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
761
+        <state relative-caret-position="150">
762
+          <caret line="10" column="88" lean-forward="true" selection-start-line="10" selection-start-column="88" selection-end-line="10" selection-end-column="88" />
763
+        </state>
764
+      </provider>
765
+    </entry>
766
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
767
+      <provider selected="true" editor-type-id="text-editor">
768
+        <state relative-caret-position="150">
769
+          <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" />
770
+        </state>
771
+      </provider>
772
+    </entry>
773
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
774
+      <provider selected="true" editor-type-id="text-editor">
775
+        <state relative-caret-position="405">
776
+          <caret line="27" column="9" selection-start-line="27" selection-start-column="9" selection-end-line="27" selection-end-column="9" />
739 777
           <folding>
740
-            <element signature="e#146#147#0" expanded="true" />
741
-            <element signature="e#166#167#0" expanded="true" />
742
-            <element signature="e#172#173#0" expanded="true" />
743
-            <element signature="e#202#203#0" expanded="true" />
744
-            <element signature="e#161#162#0" expanded="true" />
745
-            <element signature="e#207#208#0" expanded="true" />
746
-            <element signature="e#257#258#0" expanded="true" />
747
-            <element signature="e#294#295#0" expanded="true" />
778
+            <element signature="imports" expanded="true" />
748 779
           </folding>
749 780
         </state>
750 781
       </provider>

+ 43
- 0
src/main/java/io/zipcoder/interfaces/Educator.java 查看文件

@@ -0,0 +1,43 @@
1
+package io.zipcoder.interfaces;
2
+
3
+public enum Educator implements Teacher {
4
+
5
+    KRIS(100, "Kris Younger"),
6
+    DOLIO(101, "Dolio Durant"),
7
+    FROILAN(102, "Froilan Miranda"),
8
+    LEON(103, "Leon Hunter"),
9
+    NHU(104, "Nhu Nguyen"),
10
+    WIL(105, "Wilhem Alcivar"),
11
+    DOM(106, "Dominique Clarke");
12
+
13
+    private int idNum;
14
+    private String name;
15
+    private double timeWorked;
16
+
17
+    Educator(int idNum, String name) {
18
+        this.idNum = idNum;
19
+        this.name = name;
20
+        this.timeWorked = 0;
21
+    }
22
+
23
+    public int getIdNum() { return idNum; }
24
+
25
+    public String getName() { return name; }
26
+
27
+    public double getTimeWorked() { return timeWorked; }
28
+
29
+    public void setTimeWorked(double timeWorked) { this.timeWorked = timeWorked; }
30
+
31
+    public void lecture(Learner[] learners, double numOfHours) {
32
+        for (Learner learner : learners) {
33
+            double hours = (numOfHours / learners.length);
34
+            learner.learn(hours);
35
+        }
36
+        setTimeWorked(getTimeWorked() + numOfHours);
37
+    }
38
+
39
+    public void teach(Learner learner, double numOfHours) {
40
+        learner.learn(numOfHours);
41
+        setTimeWorked(getTimeWorked() + numOfHours);
42
+    }
43
+}

+ 10
- 12
src/main/java/io/zipcoder/interfaces/Instructors.java 查看文件

@@ -1,20 +1,18 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
-public class Instructors extends People {
3
+import java.util.ArrayList;
4
+
5
+public class Instructors extends People<Instructor> {
4 6
     private static final Instructors INSTANCE = new Instructors();
7
+    public ArrayList<Instructor> instructorList;
5 8
     private Instructors(){
6
-        personList.add(new Instructor( "Kris Younger",1));
7
-        personList.add(new Instructor( "Dolio Durant",2));
8
-        personList.add(new Instructor( "Froilan Miranda",3));
9
-        personList.add(new Instructor( "Leon Hunter",4));
10
-        personList.add(new Instructor( "Nhu Nguyen",5));
11
-        personList.add(new Instructor( "Wilhem Alcivar",6));
12
-        personList.add(new Instructor( "Dominique Clarke",7));
13
-        personList.add(new Instructor( "Curtis Cook",8));
9
+        instructorList = new ArrayList<>();
10
+        for(Educator eds : Educator.values()){
11
+            final Instructor instructor = new Instructor(eds.getName(), eds.getIdNum());
12
+            instructorList.add(instructor);
13
+        }
14 14
     }
15 15
 
16
-    public static Instructors getInstance(){
17
-        return INSTANCE;
18
-    }
16
+    public static Instructors getInstance(){ return INSTANCE; }
19 17
 
20 18
 }

+ 1
- 1
src/main/java/io/zipcoder/interfaces/Learner.java 查看文件

@@ -2,5 +2,5 @@ package io.zipcoder.interfaces;
2 2
 
3 3
 public interface Learner {
4 4
 
5
-    public void learn(double numberOfHours);
5
+    void learn(double numberOfHours);
6 6
 }

+ 10
- 8
src/main/java/io/zipcoder/interfaces/People.java 查看文件

@@ -2,16 +2,16 @@ package io.zipcoder.interfaces;
2 2
 
3 3
 import java.util.ArrayList;
4 4
 
5
-public class People {
6
-    ArrayList<Person> personList = new ArrayList<>();
5
+public abstract class People <E extends Person>{
6
+    ArrayList<E> personList = new ArrayList<>();
7 7
 
8
-    public void add(Person p){
8
+    public void add(E p){
9 9
         this.personList.add(p);
10 10
     }
11 11
     public int getCount(){
12 12
         return this.personList.size();
13 13
     }
14
-    public void removeByPerson(Person p){
14
+    public void removeByPerson(E p){
15 15
         this.personList.remove(p);
16 16
     }
17 17
     public void removeById(long idNum){
@@ -21,7 +21,7 @@ public class People {
21 21
             }
22 22
         }
23 23
     }
24
-    public Person findById(long idNum){
24
+    public E findById(long idNum){
25 25
         for (int i = 0; i < personList.size(); i++) {
26 26
             if(idNum == this.personList.get(i).getId()){
27 27
                 return this.personList.get(i);
@@ -29,9 +29,11 @@ public class People {
29 29
         }
30 30
         return null;
31 31
     }
32
-    public Person[] getArray(){
33
-        Person[] arr = personList.toArray(new Person[getCount()]);
34
-        return arr;
32
+    public ArrayList<E> getArray(){
33
+       ArrayList<E> arrList = new ArrayList<>();
34
+       for(E elmt : personList)
35
+           arrList.add(elmt);
36
+       return arrList;
35 37
     }
36 38
     public void removeAll(){
37 39
         personList.clear();

+ 44
- 41
src/main/java/io/zipcoder/interfaces/Students.java 查看文件

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

+ 32
- 0
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java 查看文件

@@ -0,0 +1,32 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import java.util.ArrayList;
4
+
5
+public class ZipCodeWilmington {
6
+
7
+    Students students = Students.getInstance();
8
+    Instructors instructors = Instructors.getInstance();
9
+    private static final ZipCodeWilmington INSTANCE = new ZipCodeWilmington();
10
+
11
+    ArrayList<Student> list = students.studList;
12
+
13
+    private ZipCodeWilmington(){}
14
+
15
+    public static ZipCodeWilmington getInstance(){
16
+        return INSTANCE;
17
+    }
18
+    public void hostLecture(Teacher teacher, double numberOfHours){
19
+        Learner[] studs = list.toArray(new Learner[list.size()]);
20
+        teacher.lecture(studs, numberOfHours);
21
+    }
22
+    public void hostLecture(long id, double numberOfHours){
23
+        Instructor instructor = null;
24
+        for(Instructor elmt : instructors.instructorList) {
25
+            if (elmt.getId() == id)
26
+                instructor = elmt;
27
+        }
28
+
29
+        Learner[] studs = list.toArray(new Learner[list.size()]);
30
+        instructor.lecture(studs, numberOfHours);
31
+    }
32
+}

+ 65
- 0
src/test/java/io/zipcoder/interfaces/TestEducator.java 查看文件

@@ -0,0 +1,65 @@
1
+package io.zipcoder.interfaces;
2
+import org.junit.Test;
3
+import org.junit.Assert;
4
+
5
+public class TestEducator {
6
+
7
+    @Test
8
+    public void testImplementation(){
9
+        //Given
10
+        boolean exp = true;
11
+        boolean act = Educator.NHU instanceof Teacher;
12
+        //Then
13
+        Assert.assertEquals(exp,act);
14
+    }
15
+
16
+    @Test
17
+    public void testTeach(){
18
+        //Given
19
+        Student stud1 = new Student("newStud1",1);
20
+        Student stud2 = new Student("newStud1",2);
21
+
22
+        //When
23
+        Educator.NHU.setTimeWorked(0);
24
+        Educator.NHU.teach(stud1, 2);
25
+        double exp = 2;
26
+        double act = stud1.getTotalStudyTime();
27
+
28
+        //Then
29
+        Assert.assertEquals(exp,act,.1);
30
+    }
31
+
32
+    @Test
33
+    public void testLecture(){
34
+        //Given
35
+        Student stud1 = new Student("newStud1",1);
36
+        Student stud2 = new Student("newStud1",2);
37
+        Student[] studs = {stud1, stud2};
38
+
39
+        //When
40
+        Educator.NHU.setTimeWorked(0);
41
+        Educator.NHU.lecture(studs,12);
42
+        double exp = 6;
43
+        double act = studs[0].getTotalStudyTime();
44
+
45
+        //Then
46
+        Assert.assertEquals(exp,act,.1);
47
+    }
48
+
49
+    @Test
50
+    public void testLectureTime(){
51
+        //Given
52
+        Student stud1 = new Student("newStud1",1);
53
+        Student stud2 = new Student("newStud1",2);
54
+        Student[] studs = {stud1, stud2};
55
+
56
+        //When
57
+        Educator.NHU.setTimeWorked(0);
58
+        Educator.NHU.lecture(studs,12);
59
+        double exp = 12;
60
+        double act = Educator.NHU.getTimeWorked();
61
+
62
+        //Then
63
+        Assert.assertEquals(exp,act,.1);
64
+    }
65
+}

+ 2
- 6
src/test/java/io/zipcoder/interfaces/TestInstructors.java 查看文件

@@ -17,12 +17,8 @@ public class TestInstructors {
17 17
         //Given
18 18
         Instructors instructor1 = Instructors.getInstance();
19 19
         //When
20
-        Person[] arr = instructor1.getArray();
21
-        for (int i = 0; i < instructor1.getArray().length; i++) {
22
-            System.out.println(arr[i].getName());
23
-        }
24
-        int exp = 8;
25
-        int act = arr.length;
20
+        int exp = 7;
21
+        int act = instructor1.instructorList.size();
26 22
         //Then
27 23
         Assert.assertEquals(exp,act);
28 24
     }

+ 21
- 17
src/test/java/io/zipcoder/interfaces/TestPeople.java 查看文件

@@ -2,12 +2,14 @@ package io.zipcoder.interfaces;
2 2
 import org.junit.Assert;
3 3
 import org.junit.Test;
4 4
 
5
+import java.util.ArrayList;
6
+
5 7
 public class TestPeople {
6 8
 
7 9
     @Test
8 10
     public void testAdd(){
9 11
         //Given
10
-        People peepList = new People();
12
+        People peepList = new People(){};
11 13
         Person person1 = new Person();
12 14
         Person person2 = new Person();
13 15
         //When
@@ -22,7 +24,7 @@ public class TestPeople {
22 24
     @Test
23 25
     public void testRemoveByPerson(){
24 26
         //Given
25
-        People peepList = new People();
27
+        People peepList = new People(){};
26 28
         Person person1 = new Person();
27 29
         Person person2 = new Person();
28 30
         Person person3 = new Person();
@@ -39,7 +41,7 @@ public class TestPeople {
39 41
 
40 42
     @Test
41 43
     public void testRemoveById(){
42
-        People peepList = new People();
44
+        People peepList = new People(){};
43 45
         Person person1 = new Person(1,"name1");
44 46
         Person person2 = new Person(2,"name2");
45 47
         Person person3 = new Person(3,"name3");
@@ -56,7 +58,7 @@ public class TestPeople {
56 58
 
57 59
     @Test
58 60
     public void testFindById(){
59
-        People peepList = new People();
61
+        People peepList = new People(){};
60 62
         Person person1 = new Person(1,"name1");
61 63
         Person person2 = new Person(2,"name2");
62 64
         Person person3 = new Person(3,"name3");
@@ -73,25 +75,27 @@ public class TestPeople {
73 75
 
74 76
     @Test
75 77
     public void testGetArray(){
76
-        People peepList = new People();
77
-        Person person1 = new Person(1,"name1");
78
-        Person person2 = new Person(2,"name2");
79
-        Person person3 = new Person(3,"name3");
80
-        //When
81
-        peepList.add(person1);
82
-        peepList.add(person2);
83
-        peepList.add(person3);
84
-        Person[] arr = {person1,person2,person3};
85
-        Person[] newArr = peepList.getArray();
78
+        //Given
79
+        People peepList = new People(){};
80
+        Instructor instructor = new Instructor( "Kris",1);
81
+        Student stud1 = new Student( "Stud1",1);
82
+        Student stud2 = new Student("Stud2",2);
83
+        peepList.add(instructor);
84
+        peepList.add(stud1);
85
+        peepList.add(stud2);
86
+        //Then
87
+        ArrayList<Person> exp = new ArrayList<>();
88
+        exp.add(instructor);
89
+        exp.add(stud1);
90
+        exp.add(stud2);
91
+        ArrayList<Person> act = peepList.getArray();
86 92
         //Then
87
-        String exp = peepList.toString(arr);
88
-        String act = peepList.toString(newArr);
89 93
         Assert.assertEquals(exp,act);
90 94
     }
91 95
 
92 96
     @Test
93 97
     public void testRemoveAll(){
94
-        People peepList = new People();
98
+        People peepList = new People(){};
95 99
         Person person1 = new Person(1,"name1");
96 100
         Person person2 = new Person(2,"name2");
97 101
         Person person3 = new Person(3,"name3");

+ 1
- 5
src/test/java/io/zipcoder/interfaces/TestStudents.java 查看文件

@@ -18,12 +18,8 @@ public class TestStudents {
18 18
         //Given
19 19
         Students instance1 = Students.getInstance();
20 20
         //When
21
-        Person[] arr = instance1.getArray();
22
-        for (int i = 0; i < instance1.getArray().length; i++) {
23
-            System.out.println(arr[i].getName());
24
-        }
25 21
         int exp = 39;
26
-        int act = arr.length;
22
+        int act = instance1.studList.size();
27 23
         //Then
28 24
         Assert.assertEquals(exp,act);
29 25
     }

+ 54
- 0
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java 查看文件

@@ -0,0 +1,54 @@
1
+package io.zipcoder.interfaces;
2
+import org.junit.Assert;
3
+import org.junit.Test;
4
+
5
+public class ZipCodeWilmingtonTest {
6
+
7
+    @Test
8
+    public void testHostLecture(){
9
+        //Given
10
+        ZipCodeWilmington zip = ZipCodeWilmington.getInstance();
11
+        Instructor instructor = new Instructor("Kris", 1);
12
+        Student connor = zip.students.studList.get(5);
13
+
14
+        //When
15
+        double hours = connor.getTotalStudyTime();
16
+        zip.hostLecture(instructor,40);
17
+        double exp = 1;
18
+        double act = connor.getTotalStudyTime() - hours;
19
+
20
+        //Then
21
+        Assert.assertEquals(exp,act,.1);
22
+    }
23
+
24
+    @Test
25
+    public void testHostLectureId(){
26
+        //Given
27
+        ZipCodeWilmington zip = ZipCodeWilmington.getInstance();
28
+       // Instructor instructor = new Instructor(Educator.KRIS.getName(),Educator.KRIS.getIdNum());
29
+        Student connor = zip.students.studList.get(5);
30
+
31
+        //When
32
+        double hours = connor.getTotalStudyTime();
33
+        zip.hostLecture(100,40);
34
+        double exp = 1;
35
+        double act = connor.getTotalStudyTime() - hours;
36
+
37
+        //Then
38
+        Assert.assertEquals(exp,act,.1);
39
+    }
40
+
41
+    @Test
42
+    public void testHostLectureEducator() {
43
+        //Given
44
+        ZipCodeWilmington zip = ZipCodeWilmington.getInstance();
45
+        Student connor = zip.students.studList.get(5);
46
+        double ogHours = connor.getTotalStudyTime();
47
+        //When
48
+        zip.hostLecture(Educator.NHU,40);
49
+        double exp = 1;
50
+        double act = connor.getTotalStudyTime() - ogHours;
51
+        //Then
52
+        Assert.assertEquals(exp,act,.05);
53
+    }
54
+}