Cohort4.2
/
CR-MacroLabs-OOP-InstructorStudentClassroom
複製自 ZipCodeWilmington/CR-MacroLabs-OOP-InstructorStudentClassroom
關注 7
收藏 0
複製 39
程式碼 問題 0 合併請求 38 版本發佈 0 Wiki 活動
瀏覽代碼

fixed abstract method for getArray

Connor Dunnigan 6 年之前
父節點
016216ee81
當前提交
418d963212
共有 13 個檔案被更改，包括 298 行新增 和 453 行删除
分割檢視 顯示文件統計
  1. 164
    244
      .idea/workspace.xml
  2. 9
    3
      src/main/java/io/zipcoder/interfaces/Instructors.java
  3. 2
    6
      src/main/java/io/zipcoder/interfaces/People.java
  4. 46
    41
      src/main/java/io/zipcoder/interfaces/Students.java
  5. 14
    11
      src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java
  6. 0
    3
      src/test/java/io/zipcoder/interfaces/TestEducator.java
  7. 15
    17
      src/test/java/io/zipcoder/interfaces/TestInstructor.java
  8. 1
    1
      src/test/java/io/zipcoder/interfaces/TestInstructors.java
  9. 27
    80
      src/test/java/io/zipcoder/interfaces/TestPeople.java
  10. 0
    4
      src/test/java/io/zipcoder/interfaces/TestPerson.java
  11. 8
    8
      src/test/java/io/zipcoder/interfaces/TestStudent.java
  12. 2
    2
      src/test/java/io/zipcoder/interfaces/TestStudents.java
  13. 10
    33
      src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java

+ 164
- 244
.idea/workspace.xml 查看文件 

@@ -2,18 +2,19 @@
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$/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 5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10 6 
       <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 7 
       <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 8 
       <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" />
9 
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
10 
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java" afterDir="false" />
11 
+      <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" />
14 12 
       <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 13 
       <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" />
14 
+      <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" />
15 
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" afterDir="false" />
16 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" />
17 
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" afterDir="false" />
17 18 
     </list>
18 19 
     <ignored path="$PROJECT_DIR$/target/" />
19 20 
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
 
@@ -34,38 +35,39 @@
34 35 
     <session id="-521849941">
35 36 
       <usages-collector id="statistics.lifecycle.project">
36 37 
         <counts>
37 
-          <entry key="project.closed" value="4" />
38 
+          <entry key="project.closed" value="5" />
38 39 
           <entry key="project.open.time.1" value="1" />
39 40 
           <entry key="project.open.time.19" value="1" />
40 41 
           <entry key="project.open.time.3" value="2" />
41 42 
           <entry key="project.open.time.30" value="1" />
42 
-          <entry key="project.opened" value="5" />
43 
+          <entry key="project.open.time.4" value="1" />
44 
+          <entry key="project.opened" value="6" />
43 45 
         </counts>
44 46 
       </usages-collector>
45 47 
       <usages-collector id="statistics.file.extensions.open">
46 48 
         <counts>
47 
-          <entry key="java" value="32" />
49 
+          <entry key="java" value="36" />
48 50 
         </counts>
49 51 
       </usages-collector>
50 52 
       <usages-collector id="statistics.file.types.open">
51 53 
         <counts>
52 
-          <entry key="JAVA" value="32" />
54 
+          <entry key="JAVA" value="36" />
53 55 
         </counts>
54 56 
       </usages-collector>
55 57 
       <usages-collector id="statistics.file.extensions.edit">
56 58 
         <counts>
57 
-          <entry key="java" value="9043" />
59 
+          <entry key="java" value="11243" />
58 60 
         </counts>
59 61 
       </usages-collector>
60 62 
       <usages-collector id="statistics.file.types.edit">
61 63 
         <counts>
62 
-          <entry key="JAVA" value="9043" />
64 
+          <entry key="JAVA" value="11243" />
63 65 
         </counts>
64 66 
       </usages-collector>
65 67 
     </session>
66 68 
   </component>
67 69 
   <component name="FileEditorManager">
68 
-    <splitter split-orientation="horizontal" split-proportion="0.4861779">
70 
+    <splitter split-orientation="horizontal" split-proportion="0.34356198">
69 71 
       <split-first>
70 72 
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
71 73 
           <file pinned="false" current-in-tab="false">
 
@@ -102,27 +104,17 @@
102 104 
           <file pinned="false" current-in-tab="false">
103 105 
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
104 106 
               <provider selected="true" editor-type-id="text-editor">
105 
-                <state relative-caret-position="75">
106 
-                  <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
107 
+                <state relative-caret-position="180">
108 
+                  <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
107 109 
                 </state>
108 110 
               </provider>
109 111 
             </entry>
110 112 
           </file>
111 
-          <file pinned="false" current-in-tab="false">
113 
+          <file pinned="false" current-in-tab="true">
112 114 
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
113 115 
               <provider selected="true" editor-type-id="text-editor">
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" />
116 
-                  <folding>
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" />
125 
-                  </folding>
116 
+                <state relative-caret-position="390">
117 
+                  <caret line="32" selection-start-line="32" selection-end-line="32" />
126 118 
                 </state>
127 119 
               </provider>
128 120 
             </entry>
 
@@ -130,17 +122,21 @@
130 122 
           <file pinned="false" current-in-tab="false">
131 123 
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
132 124 
               <provider selected="true" editor-type-id="text-editor">
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" />
125 
+                <state relative-caret-position="753">
126 
+                  <caret line="57" column="33" selection-start-line="57" selection-start-column="33" selection-end-line="57" selection-end-column="33" />
127 
+                  <folding>
128 
+                    <element signature="e#2497#2498#0" expanded="true" />
129 
+                    <element signature="e#2528#2529#0" expanded="true" />
130 
+                  </folding>
135 131 
                 </state>
136 132 
               </provider>
137 133 
             </entry>
138 134 
           </file>
139 
-          <file pinned="false" current-in-tab="true">
135 
+          <file pinned="false" current-in-tab="false">
140 136 
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
141 137 
               <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" />
138 
+                <state relative-caret-position="240">
139 
+                  <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
144 140 
                 </state>
145 141 
               </provider>
146 142 
             </entry>
 
@@ -148,8 +144,8 @@
148 144 
           <file pinned="false" current-in-tab="false">
149 145 
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
150 146 
               <provider selected="true" editor-type-id="text-editor">
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" />
147 
+                <state relative-caret-position="285">
148 
+                  <caret line="19" column="47" lean-forward="true" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
153 149 
                 </state>
154 150 
               </provider>
155 151 
             </entry>
 
@@ -157,11 +153,13 @@
157 153 
           <file pinned="false" current-in-tab="false">
158 154 
             <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
159 155 
               <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" />
156 
+                <state relative-caret-position="285">
157 
+                  <caret line="21" column="37" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
162 158 
                   <folding>
163 
-                    <element signature="e#342#343#0" expanded="true" />
164 
-                    <element signature="e#360#361#0" expanded="true" />
159 
+                    <element signature="e#960#961#0" expanded="true" />
160 
+                    <element signature="e#991#992#0" expanded="true" />
161 
+                    <element signature="e#1041#1042#0" expanded="true" />
162 
+                    <element signature="e#1075#1076#0" expanded="true" />
165 163 
                   </folding>
166 164 
                 </state>
167 165 
               </provider>
 
@@ -171,59 +169,11 @@
171 169 
       </split-first>
172 170 
       <split-second>
173 171 
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
174 
-          <file pinned="false" current-in-tab="false">
175 
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
176 
-              <provider selected="true" editor-type-id="text-editor">
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" />
179 
-                  <folding>
180 
-                    <element signature="imports" expanded="true" />
181 
-                  </folding>
182 
-                </state>
183 
-              </provider>
184 
-            </entry>
185 
-          </file>
186 
-          <file pinned="false" current-in-tab="false">
187 
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
188 
-              <provider selected="true" editor-type-id="text-editor">
189 
-                <state relative-caret-position="390">
190 
-                  <caret line="26" column="49" selection-start-line="26" selection-start-column="49" selection-end-line="26" selection-end-column="49" />
191 
-                  <folding>
192 
-                    <element signature="imports" expanded="true" />
193 
-                  </folding>
194 
-                </state>
195 
-              </provider>
196 
-            </entry>
197 
-          </file>
198 
-          <file pinned="false" current-in-tab="false">
199 
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
200 
-              <provider selected="true" editor-type-id="text-editor">
201 
-                <state relative-caret-position="226">
202 
-                  <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
203 
-                  <folding>
204 
-                    <element signature="imports" expanded="true" />
205 
-                  </folding>
206 
-                </state>
207 
-              </provider>
208 
-            </entry>
209 
-          </file>
210 
-          <file pinned="false" current-in-tab="false">
211 
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
212 
-              <provider selected="true" editor-type-id="text-editor">
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">
172 
+          <file pinned="false" current-in-tab="true">
173 
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
224 174 
               <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" />
175 
+                <state relative-caret-position="420">
176 
+                  <caret line="28" column="38" selection-start-line="28" selection-start-column="38" selection-end-line="28" selection-end-column="38" />
227 177 
                   <folding>
228 178 
                     <element signature="imports" expanded="true" />
229 179 
                   </folding>
 
@@ -234,32 +184,8 @@
234 184 
           <file pinned="false" current-in-tab="false">
235 185 
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
236 186 
               <provider selected="true" editor-type-id="text-editor">
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" />
239 
-                  <folding>
240 
-                    <element signature="imports" expanded="true" />
241 
-                  </folding>
242 
-                </state>
243 
-              </provider>
244 
-            </entry>
245 
-          </file>
246 
-          <file pinned="false" current-in-tab="false">
247 
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
248 
-              <provider selected="true" editor-type-id="text-editor">
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" />
187 
+                <state relative-caret-position="300">
188 
+                  <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
263 189 
                   <folding>
264 190 
                     <element signature="imports" expanded="true" />
265 191 
                   </folding>
 
@@ -281,9 +207,11 @@
281 207 
   <component name="FindInProjectRecents">
282 208 
     <findStrings>
283 209 
       <find>personList</find>
210 
+      <find>studList</find>
284 211 
     </findStrings>
285 212 
     <replaceStrings>
286 213 
       <replace>studList</replace>
214 
+      <replace>personList</replace>
287 215 
     </replaceStrings>
288 216 
   </component>
289 217 
   <component name="Git.Settings">
 
@@ -292,23 +220,23 @@
292 220 
   <component name="IdeDocumentHistory">
293 221 
     <option name="CHANGED_PATHS">
294 222 
       <list>
295 
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
296 223 
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
297 
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" />
298 
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
299 224 
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
300 
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
301 225 
         <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 226 
         <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" />
227 
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
228 
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
229 
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
308 230 
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
231 
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
309 232 
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java" />
233 
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java" />
234 
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
235 
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java" />
236 
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
237 
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" />
310 238 
         <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" />
239 
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java" />
312 240 
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
313 241 
       </list>
314 242 
     </option>
 
@@ -331,7 +259,6 @@
331 259 
       <foldersAlwaysOnTop value="true" />
332 260 
     </navigator>
333 261 
     <panes>
334 
-      <pane id="PackagesPane" />
335 262 
       <pane id="ProjectPane">
336 263 
         <subPane>
337 264 
           <expand>
 
@@ -390,13 +317,14 @@
390 317 
           <select />
391 318 
         </subPane>
392 319 
       </pane>
320 
+      <pane id="PackagesPane" />
393 321 
       <pane id="Scope" />
394 322 
     </panes>
395 323 
   </component>
396 324 
   <component name="PropertiesComponent">
397 325 
     <property name="WebServerToolWindowFactoryState" value="false" />
398 326 
     <property name="aspect.path.notification.shown" value="true" />
399 
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541875808839" />
327 
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541902403652" />
400 328 
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
401 329 
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
402 330 
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
 
@@ -418,7 +346,7 @@
418 346 
     </option>
419 347 
   </component>
420 348 
   <component name="RunManager" selected="JUnit.io.zipcoder.interfaces in interfaces-1">
421 
-    <configuration name="TestEducator.testTeach" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
349 
+    <configuration name="TestPeople" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
422 350 
       <module name="interfaces-1" />
423 351 
       <extension name="coverage">
424 352 
         <pattern>
 
@@ -427,14 +355,12 @@
427 355 
         </pattern>
428 356 
       </extension>
429 357 
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
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" />
358 
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
433 359 
       <method v="2">
434 360 
         <option name="Make" enabled="true" />
435 361 
       </method>
436 362 
     </configuration>
437 
-    <configuration name="TestPeople.testGetArray" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
363 
+    <configuration name="TestPeople.testRemoveById" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
438 364 
       <module name="interfaces-1" />
439 365 
       <extension name="coverage">
440 366 
         <pattern>
 
@@ -444,13 +370,13 @@
444 370 
       </extension>
445 371 
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
446 372 
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPeople" />
447 
-      <option name="METHOD_NAME" value="testGetArray" />
373 
+      <option name="METHOD_NAME" value="testRemoveById" />
448 374 
       <option name="TEST_OBJECT" value="method" />
449 375 
       <method v="2">
450 376 
         <option name="Make" enabled="true" />
451 377 
       </method>
452 378 
     </configuration>
453 
-    <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
379 
+    <configuration name="TestStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
454 380 
       <module name="interfaces-1" />
455 381 
       <extension name="coverage">
456 382 
         <pattern>
 
@@ -459,14 +385,12 @@
459 385 
         </pattern>
460 386 
       </extension>
461 387 
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
462 
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
463 
-      <option name="METHOD_NAME" value="testHostLectureEducator" />
464 
-      <option name="TEST_OBJECT" value="method" />
388 
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestStudents" />
465 389 
       <method v="2">
466 390 
         <option name="Make" enabled="true" />
467 391 
       </method>
468 392 
     </configuration>
469 
-    <configuration name="ZipCodeWilmingtonTest.testHostLectureId" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
393 
+    <configuration name="ZipCodeWilmingtonTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
470 394 
       <module name="interfaces-1" />
471 395 
       <extension name="coverage">
472 396 
         <pattern>
 
@@ -476,8 +400,6 @@
476 400 
       </extension>
477 401 
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
478 402 
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
479 
-      <option name="METHOD_NAME" value="testHostLectureId" />
480 
-      <option name="TEST_OBJECT" value="method" />
481 403 
       <method v="2">
482 404 
         <option name="Make" enabled="true" />
483 405 
       </method>
 
@@ -497,19 +419,19 @@
497 419 
       </method>
498 420 
     </configuration>
499 421 
     <list>
500 
-      <item itemvalue="JUnit.TestEducator.testTeach" />
501 
-      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLectureEducator" />
422 
+      <item itemvalue="JUnit.TestStudents" />
423 
+      <item itemvalue="JUnit.ZipCodeWilmingtonTest" />
502 424 
       <item itemvalue="JUnit.io.zipcoder.interfaces in interfaces-1" />
503 
-      <item itemvalue="JUnit.TestPeople.testGetArray" />
504 
-      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLectureId" />
425 
+      <item itemvalue="JUnit.TestPeople.testRemoveById" />
426 
+      <item itemvalue="JUnit.TestPeople" />
505 427 
     </list>
506 428 
     <recent_temporary>
507 429 
       <list>
508 430 
         <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" />
431 
+        <item itemvalue="JUnit.TestPeople" />
432 
+        <item itemvalue="JUnit.TestPeople.testRemoveById" />
433 
+        <item itemvalue="JUnit.ZipCodeWilmingtonTest" />
434 
+        <item itemvalue="JUnit.TestStudents" />
513 435 
       </list>
514 436 
     </recent_temporary>
515 437 
   </component>
 
@@ -527,50 +449,51 @@
527 449 
       <workItem from="1541351125257" duration="267000" />
528 450 
       <workItem from="1541354691063" duration="1817000" />
529 451 
       <workItem from="1541528487426" duration="493000" />
530 
-      <workItem from="1541599988486" duration="20301000" />
452 
+      <workItem from="1541599988486" duration="20586000" />
453 
+      <workItem from="1541890187320" duration="11930000" />
531 454 
     </task>
532 455 
     <servers />
533 456 
   </component>
534 457 
   <component name="TestHistory">
535 
-    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 14s.xml">
536 
-      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
458 
+    <history-entry file="TestPeople_testFindById - 2018.11.10 at 20h 55m 55s.xml">
459 
+      <configuration name="TestPeople.testFindById" configurationId="JUnit" />
537 460 
     </history-entry>
538 
-    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 25s.xml">
539 
-      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
461 
+    <history-entry file="TestStudent - 2018.11.10 at 20h 57m 40s.xml">
462 
+      <configuration name="TestStudent" configurationId="JUnit" />
540 463 
     </history-entry>
541 
-    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 39s.xml">
542 
-      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
464 
+    <history-entry file="TestStudents - 2018.11.10 at 20h 58m 26s.xml">
465 
+      <configuration name="TestStudents" configurationId="JUnit" />
543 466 
     </history-entry>
544 
-    <history-entry file="ZipCodeWilmingtonTest_testHostLectureEducator - 2018.11.10 at 13h 09m 57s.xml">
545 
-      <configuration name="ZipCodeWilmingtonTest.testHostLectureEducator" configurationId="JUnit" />
467 
+    <history-entry file="ZipCodeWilmingtonTest - 2018.11.10 at 20h 58m 42s.xml">
468 
+      <configuration name="ZipCodeWilmingtonTest" configurationId="JUnit" />
546 469 
     </history-entry>
547 
-    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.10 at 13h 10m 36s.xml">
470 
+    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.10 at 20h 58m 50s.xml">
548 471 
       <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
549 472 
     </history-entry>
550 
-    <history-entry file="TestPeople_testGetArray - 2018.11.10 at 13h 15m 30s.xml">
551 
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
473 
+    <history-entry file="TestPeople_testRemoveById - 2018.11.10 at 21h 01m 43s.xml">
474 
+      <configuration name="TestPeople.testRemoveById" configurationId="JUnit" />
552 475 
     </history-entry>
553 
-    <history-entry file="TestPeople_testGetArray - 2018.11.10 at 13h 44m 53s.xml">
554 
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
476 
+    <history-entry file="TestPeople_testRemoveById - 2018.11.10 at 21h 02m 13s.xml">
477 
+      <configuration name="TestPeople.testRemoveById" configurationId="JUnit" />
555 478 
     </history-entry>
556 
-    <history-entry file="TestPeople_testGetArray - 2018.11.10 at 13h 45m 14s.xml">
557 
-      <configuration name="TestPeople.testGetArray" configurationId="JUnit" />
479 
+    <history-entry file="TestPeople_testRemoveById - 2018.11.10 at 21h 02m 40s.xml">
480 
+      <configuration name="TestPeople.testRemoveById" configurationId="JUnit" />
558 481 
     </history-entry>
559 
-    <history-entry file="ZipCodeWilmingtonTest_testHostLectureId - 2018.11.10 at 13h 49m 44s.xml">
560 
-      <configuration name="ZipCodeWilmingtonTest.testHostLectureId" configurationId="JUnit" />
482 
+    <history-entry file="TestPeople - 2018.11.10 at 21h 09m 06s.xml">
483 
+      <configuration name="TestPeople" configurationId="JUnit" />
561 484 
     </history-entry>
562 
-    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.10 at 13h 49m 56s.xml">
485 
+    <history-entry file="io_zipcoder_interfaces_in_interfaces-1 - 2018.11.10 at 21h 09m 14s.xml">
563 486 
       <configuration name="io.zipcoder.interfaces in interfaces-1" configurationId="JUnit" />
564 487 
     </history-entry>
565 488 
   </component>
566 489 
   <component name="TimeTrackingManager">
567 
-    <option name="totallyTimeSpent" value="54870000" />
490 
+    <option name="totallyTimeSpent" value="67085000" />
568 491 
   </component>
569 492 
   <component name="ToolWindowManager">
570 493 
     <frame x="-336" y="-1057" width="1896" height="1042" extended-state="0" />
571 494 
     <editor active="true" />
572 495 
     <layout>
573 
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.10248112" />
496 
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.103559874" />
574 497 
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
575 498 
       <window_info id="Image Layers" order="2" />
576 499 
       <window_info id="Designer" order="3" />
 
@@ -579,7 +502,7 @@
579 502 
       <window_info id="Favorites" order="6" side_tool="true" />
580 503 
       <window_info anchor="bottom" id="Message" order="0" />
581 504 
       <window_info anchor="bottom" id="Find" order="1" />
582 
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32947367" />
505 
+      <window_info anchor="bottom" id="Run" order="2" visible="true" weight="0.26842105" />
583 506 
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
584 507 
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
585 508 
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
 
@@ -589,7 +512,6 @@
589 512 
       <window_info anchor="bottom" id="Terminal" order="9" />
590 513 
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
591 514 
       <window_info anchor="bottom" id="Messages" order="11" weight="0.32947367" />
592 
-      <window_info anchor="right" id="Coverage" side_tool="true" weight="0.32955772" />
593 515 
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
594 516 
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
595 517 
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
 
@@ -599,6 +521,7 @@
599 521 
       <window_info anchor="right" id="Theme Preview" order="6" />
600 522 
       <window_info anchor="right" id="Palette&#9;" order="7" />
601 523 
       <window_info anchor="right" id="Maven Projects" order="8" />
524 
+      <window_info anchor="right" id="Coverage" order="9" side_tool="true" weight="0.32955772" />
602 525 
     </layout>
603 526 
   </component>
604 527 
   <component name="TypeScriptGeneratedFilesManager">
 
@@ -619,161 +542,158 @@
619 542 
         </state>
620 543 
       </provider>
621 544 
     </entry>
622 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
545 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
623 546 
       <provider selected="true" editor-type-id="text-editor">
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" />
626 
-          <folding>
627 
-            <element signature="e#146#147#0" expanded="true" />
628 
-            <element signature="e#169#170#0" expanded="true" />
629 
-          </folding>
547 
+        <state relative-caret-position="60">
548 
+          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
630 549 
         </state>
631 550 
       </provider>
632 551 
     </entry>
633 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
552 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
634 553 
       <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>
554 
+        <state relative-caret-position="60">
555 
+          <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
640 556 
         </state>
641 557 
       </provider>
642 558 
     </entry>
643 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
559 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
644 560 
       <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" />
561 
+        <state relative-caret-position="240">
562 
+          <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" />
647 563 
         </state>
648 564 
       </provider>
649 565 
     </entry>
650 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
566 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
651 567 
       <provider selected="true" editor-type-id="text-editor">
652 568 
         <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" />
569 
+          <caret line="7" column="16" selection-start-line="7" selection-start-column="16" selection-end-line="7" selection-end-column="16" />
654 570 
           <folding>
655 
-            <element signature="imports" expanded="true" />
571 
+            <element signature="e#146#147#0" expanded="true" />
572 
+            <element signature="e#169#170#0" expanded="true" />
656 573 
           </folding>
657 574 
         </state>
658 575 
       </provider>
659 576 
     </entry>
660 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
577 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
661 578 
       <provider selected="true" editor-type-id="text-editor">
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" />
664 
-          <folding>
665 
-            <element signature="imports" expanded="true" />
666 
-          </folding>
579 
+        <state relative-caret-position="180">
580 
+          <caret line="18" column="5" lean-forward="true" selection-start-line="18" selection-start-column="5" selection-end-line="18" selection-end-column="5" />
667 581 
         </state>
668 582 
       </provider>
669 583 
     </entry>
670 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
584 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
671 585 
       <provider selected="true" editor-type-id="text-editor">
672 
-        <state relative-caret-position="226">
673 
-          <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
586 
+        <state relative-caret-position="285">
587 
+          <caret line="21" column="37" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
674 588 
           <folding>
675 
-            <element signature="imports" expanded="true" />
589 
+            <element signature="e#960#961#0" expanded="true" />
590 
+            <element signature="e#991#992#0" expanded="true" />
591 
+            <element signature="e#1041#1042#0" expanded="true" />
592 
+            <element signature="e#1075#1076#0" expanded="true" />
676 593 
           </folding>
677 594 
         </state>
678 595 
       </provider>
679 596 
     </entry>
680 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
597 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
681 598 
       <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" />
599 
+        <state relative-caret-position="285">
600 
+          <caret line="19" column="47" lean-forward="true" selection-start-line="19" selection-start-column="47" selection-end-line="19" selection-end-column="47" />
684 601 
         </state>
685 602 
       </provider>
686 603 
     </entry>
687 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
604 
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
688 605 
       <provider selected="true" editor-type-id="text-editor">
689 
-        <state relative-caret-position="60">
690 
-          <caret line="4" column="4" selection-start-line="4" selection-start-column="4" selection-end-line="4" selection-end-column="4" />
606 
+        <state relative-caret-position="753">
607 
+          <caret line="57" column="33" selection-start-line="57" selection-start-column="33" selection-end-line="57" selection-end-column="33" />
608 
+          <folding>
609 
+            <element signature="e#2497#2498#0" expanded="true" />
610 
+            <element signature="e#2528#2529#0" expanded="true" />
611 
+          </folding>
691 612 
         </state>
692 613 
       </provider>
693 614 
     </entry>
694 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java">
615 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructor.java">
695 616 
       <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" />
617 
+        <state relative-caret-position="690">
618 
+          <caret line="46" column="59" selection-start-line="46" selection-start-column="59" selection-end-line="46" selection-end-column="59" />
698 619 
           <folding>
699 620 
             <element signature="imports" expanded="true" />
700 621 
           </folding>
701 622 
         </state>
702 623 
       </provider>
703 624 
     </entry>
704 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
625 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
705 626 
       <provider selected="true" editor-type-id="text-editor">
706 
-        <state relative-caret-position="75">
707 
-          <caret line="8" column="23" selection-start-line="8" selection-start-column="23" selection-end-line="8" selection-end-column="23" />
627 
+        <state relative-caret-position="285">
628 
+          <caret line="19" column="20" lean-forward="true" selection-start-line="19" selection-start-column="20" selection-end-line="19" selection-end-column="20" />
629 
+          <folding>
630 
+            <element signature="imports" expanded="true" />
631 
+          </folding>
708 632 
         </state>
709 633 
       </provider>
710 634 
     </entry>
711 635 
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
712 636 
       <provider selected="true" editor-type-id="text-editor">
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" />
715 
-          <folding>
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" />
724 
-          </folding>
637 
+        <state relative-caret-position="390">
638 
+          <caret line="32" selection-start-line="32" selection-end-line="32" />
725 639 
         </state>
726 640 
       </provider>
727 641 
     </entry>
728 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestInstructors.java">
642 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
729 643 
       <provider selected="true" editor-type-id="text-editor">
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" />
644 
+        <state relative-caret-position="360">
645 
+          <caret line="24" column="42" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
732 646 
           <folding>
733 647 
             <element signature="imports" expanded="true" />
734 648 
           </folding>
735 649 
         </state>
736 650 
       </provider>
737 651 
     </entry>
738 
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
652 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestEducator.java">
739 653 
       <provider selected="true" editor-type-id="text-editor">
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" />
654 
+        <state relative-caret-position="256">
655 
+          <caret line="23" column="47" selection-start-line="23" selection-start-column="47" selection-end-line="23" selection-end-column="47" />
742 656 
           <folding>
743 657 
             <element signature="imports" expanded="true" />
744 658 
           </folding>
745 659 
         </state>
746 660 
       </provider>
747 661 
     </entry>
748 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
662 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPeople.java">
749 663 
       <provider selected="true" editor-type-id="text-editor">
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" />
664 
+        <state relative-caret-position="540">
665 
+          <caret line="38" column="30" selection-start-line="38" selection-start-column="30" selection-end-line="38" selection-end-column="30" />
752 666 
           <folding>
753 
-            <element signature="e#342#343#0" expanded="true" />
754 
-            <element signature="e#360#361#0" expanded="true" />
667 
+            <element signature="imports" expanded="true" />
668 
+            <marker date="1541902142065" expanded="true" signature="0:1413" ph="..." />
755 669 
           </folding>
756 670 
         </state>
757 671 
       </provider>
758 672 
     </entry>
759 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
673 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
760 674 
       <provider selected="true" editor-type-id="text-editor">
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" />
675 
+        <state relative-caret-position="480">
676 
+          <caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
677 
+          <folding>
678 
+            <element signature="imports" expanded="true" />
679 
+          </folding>
763 680 
         </state>
764 681 
       </provider>
765 682 
     </entry>
766 
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
683 
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudents.java">
767 684 
       <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" />
685 
+        <state relative-caret-position="300">
686 
+          <caret line="20" column="20" selection-start-line="20" selection-start-column="20" selection-end-line="20" selection-end-column="20" />
687 
+          <folding>
688 
+            <element signature="imports" expanded="true" />
689 
+          </folding>
770 690 
         </state>
771 691 
       </provider>
772 692 
     </entry>
773 693 
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
774 694 
       <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" />
695 
+        <state relative-caret-position="420">
696 
+          <caret line="28" column="38" selection-start-line="28" selection-start-column="38" selection-end-line="28" selection-end-column="38" />
777 697 
           <folding>
778 698 
             <element signature="imports" expanded="true" />
779 699 
           </folding>

+ 9
- 3
src/main/java/io/zipcoder/interfaces/Instructors.java 查看文件 

@@ -4,15 +4,21 @@ import java.util.ArrayList;
4 4
5 5 
 public class Instructors extends People<Instructor> {
6 6 
     private static final Instructors INSTANCE = new Instructors();
7 
-    public ArrayList<Instructor> instructorList;
8 7 
     private Instructors(){
9 
-        instructorList = new ArrayList<>();
10 8 
         for(Educator eds : Educator.values()){
11 9 
             final Instructor instructor = new Instructor(eds.getName(), eds.getIdNum());
12 
-            instructorList.add(instructor);
10 
+            personList.add(instructor);
13 11 
         }
14 12 
     }
15 13
16 14 
     public static Instructors getInstance(){ return INSTANCE; }
17 15
16 
+    @Override
17 
+    public Instructor[] getArray(){
18 
+        Instructor[] instructors = new Instructor[personList.size()];
19 
+        for(int i = 0; i < personList.size(); i++)
20 
+            instructors[i] = personList.get(i);
21 
+        return instructors;
22 
+    }
23 
+
18 24 
 }

+ 2
- 6
src/main/java/io/zipcoder/interfaces/People.java 查看文件 

@@ -29,12 +29,8 @@ public abstract class People <E extends Person>{
29 29 
         }
30 30 
         return null;
31 31 
     }
32 
-    public ArrayList<E> getArray(){
33 
-       ArrayList<E> arrList = new ArrayList<>();
34 
-       for(E elmt : personList)
35 
-           arrList.add(elmt);
36 
-       return arrList;
37 
-    }
32 
+    public abstract E[] getArray();
33 
+
38 34 
     public void removeAll(){
39 35 
         personList.clear();
40 36 
     }

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

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

+ 14
- 11
src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java 查看文件 

@@ -4,29 +4,32 @@ import java.util.ArrayList;
4 4
5 5 
 public class ZipCodeWilmington {
6 6
7 
-    Students students = Students.getInstance();
8 
-    Instructors instructors = Instructors.getInstance();
7 
+    private static final Students students = Students.getInstance();
8 
+    private static final Instructors instructors = Instructors.getInstance();
9 9 
     private static final ZipCodeWilmington INSTANCE = new ZipCodeWilmington();
10 10
11 
-    ArrayList<Student> list = students.studList;
12 
-
13 11 
     private ZipCodeWilmington(){}
14 12
15 13 
     public static ZipCodeWilmington getInstance(){
16 14 
         return INSTANCE;
17 15 
     }
18 16 
     public void hostLecture(Teacher teacher, double numberOfHours){
19 
-        Learner[] studs = list.toArray(new Learner[list.size()]);
17 
+        Student[] studs = students.getArray();
20 18 
         teacher.lecture(studs, numberOfHours);
21 19 
     }
22 20 
     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;
21 
+        for (int i = 0; i < instructors.getCount(); i++) {
22 
+            if(instructors.personList.get(i).getId() == id) {
23 
+                instructors.personList.get(i).lecture(students.getArray(), numberOfHours);
24 
+            }
27 25 
         }
26 
+    }
27 
+
28 
+    public static Students getStudents() {
29 
+        return students;
30 
+    }
28 31
29 
-        Learner[] studs = list.toArray(new Learner[list.size()]);
30 
-        instructor.lecture(studs, numberOfHours);
32 
+    public static Instructors getInstructors() {
33 
+        return instructors;
31 34 
     }
32 35 
 }

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

@@ -17,14 +17,11 @@ public class TestEducator {
17 17 
     public void testTeach(){
18 18 
         //Given
19 19 
         Student stud1 = new Student("newStud1",1);
20 
-        Student stud2 = new Student("newStud1",2);
21 
-
22 20 
         //When
23 21 
         Educator.NHU.setTimeWorked(0);
24 22 
         Educator.NHU.teach(stud1, 2);
25 23 
         double exp = 2;
26 24 
         double act = stud1.getTotalStudyTime();
27 
-
28 25 
         //Then
29 26 
         Assert.assertEquals(exp,act,.1);
30 27 
     }

+ 15
- 17
src/test/java/io/zipcoder/interfaces/TestInstructor.java 查看文件 

@@ -4,6 +4,17 @@ import org.junit.Test;
4 4
5 5 
 public class TestInstructor {
6 6
7 
+    Instructor instructor;
8 
+    Student stud1, stud2;
9 
+    Student[] studs;
10 
+
11 
+    public TestInstructor(){
12 
+        instructor = new Instructor("Kris",1);
13 
+        stud1 = new Student("Connor",5);
14 
+        stud2 = new Student("Christian",6);
15 
+        studs = new Student[]{stud1,stud2};
16 
+    }
17 
+
7 18 
     @Test
8 19 
     public void testImplementation(){
9 20 
         //Given
 
@@ -22,30 +33,17 @@ public class TestInstructor {
22 33
23 34 
     @Test
24 35 
     public void testTeach(){
25 
-        //Given
26 
-        Instructor instructor = new Instructor();
27 
-        Student student = new Student("student",1);
28 36 
         //When
29 
-        instructor.teach(student, 12);
30 
-        double expNumHours = 12;
31 
-        double actNumHours = student.getTotalStudyTime();
37 
+        instructor.teach(stud1,20);
32 38 
         //Then
33 
-        Assert.assertEquals(expNumHours,actNumHours,.001);
39 
+        Assert.assertEquals(20,stud1.getTotalStudyTime(),.1);
34 40 
     }
35 41
36 42 
     @Test
37 43 
     public void testLecture(){
38 
-        //Given
39 
-        Instructor instructor = new Instructor();
40 
-        Student student = new Student("student",1);
41 
-        Student student2 = new Student("student",1);
42 
-        Student student3 = new Student("student",1);
43 44 
         //When
44 
-        Student[] arr = {student, student2,student3};
45 
-        instructor.lecture(arr, 12);
46 
-        double expNumHours = 4;
47 
-        double actNumHours = student.getTotalStudyTime();
45 
+        instructor.lecture(studs,20);
48 46 
         //Then
49 
-        Assert.assertEquals(expNumHours,actNumHours,.001);
47 
+        Assert.assertEquals(10,stud1.getTotalStudyTime(),.1);
50 48 
     }
51 49 
 }

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

@@ -18,7 +18,7 @@ public class TestInstructors {
18 18 
         Instructors instructor1 = Instructors.getInstance();
19 19 
         //When
20 20 
         int exp = 7;
21 
-        int act = instructor1.instructorList.size();
21 
+        int act = instructor1.getArray().length;
22 22 
         //Then
23 23 
         Assert.assertEquals(exp,act);
24 24 
     }

+ 27
- 80
src/test/java/io/zipcoder/interfaces/TestPeople.java 查看文件 

@@ -2,112 +2,59 @@ package io.zipcoder.interfaces;
2 2 
 import org.junit.Assert;
3 3 
 import org.junit.Test;
4 4
5 
-import java.util.ArrayList;
6 
-
7 5 
 public class TestPeople {
8 6
7 
+    Person person1, person2;
8 
+    Student stud1;
9 
+    Instructor instructor;
10 
+    Instructors instructors;
11 
+    Students students;
12 
+
13 
+    public TestPeople(){
14 
+        students = Students.getInstance();
15 
+        instructors = Instructors.getInstance();
16 
+        person1 = new Person(333,"person1");
17 
+        person2 = new Person(444,"person2");
18 
+        stud1 = new Student("stud1",555);
19 
+        instructor = new Instructor("Melanie",999);
20 
+        students.add(stud1);
21 
+    }
22 
+
9 23 
     @Test
10 24 
     public void testAdd(){
11 
-        //Given
12 
-        People peepList = new People(){};
13 
-        Person person1 = new Person();
14 
-        Person person2 = new Person();
15 
-        //When
16 
-        peepList.add(person1);
17 
-        peepList.add(person2);
18 
-        int expSize = 2;
19 
-        int actSize = peepList.getCount();
20 
-        //Then
21 
-        Assert.assertEquals(expSize,actSize);
25 
+        Assert.assertEquals(40,students.getCount());
22 26 
     }
23 27
24 28 
     @Test
25 29 
     public void testRemoveByPerson(){
26 
-        //Given
27 
-        People peepList = new People(){};
28 
-        Person person1 = new Person();
29 
-        Person person2 = new Person();
30 
-        Person person3 = new Person();
31 
-        //When
32 
-        peepList.add(person1);
33 
-        peepList.add(person2);
34 
-        peepList.add(person3);
35 
-        peepList.removeByPerson(person2);
36 
-        int expSize = 2;
37 
-        int actSize = peepList.getCount();
38 
-        //Then
39 
-        Assert.assertEquals(expSize,actSize);
30 
+        students.removeByPerson(stud1);
31 
+        Assert.assertEquals(39,students.getCount());
40 32 
     }
41 33
42 34 
     @Test
43 35 
     public void testRemoveById(){
44 
-        People peepList = new People(){};
45 
-        Person person1 = new Person(1,"name1");
46 
-        Person person2 = new Person(2,"name2");
47 
-        Person person3 = new Person(3,"name3");
48 36 
         //When
49 
-        peepList.add(person1);
50 
-        peepList.add(person2);
51 
-        peepList.add(person3);
52 
-        peepList.removeById(2);
53 
-        int expSize = 2;
54 
-        int actSize = peepList.getCount();
37 
+        students.removeById(555);
55 38 
         //Then
56 
-        Assert.assertEquals(expSize,actSize);
39 
+        Assert.assertEquals(40,students.getCount());
57 40 
     }
58 41
59 42 
     @Test
60 43 
     public void testFindById(){
61 
-        People peepList = new People(){};
62 
-        Person person1 = new Person(1,"name1");
63 
-        Person person2 = new Person(2,"name2");
64 
-        Person person3 = new Person(3,"name3");
65 44 
         //When
66 
-        peepList.add(person1);
67 
-        peepList.add(person2);
68 
-        peepList.add(person3);
69 
-        String expName = "name2";
70 
-        String actName = peepList.findById(2).getName();
45 
+        Student exp = students.findById(555);
71 46 
         //Then
72 
-        Assert.assertEquals(expName,actName);
47 
+        Assert.assertEquals(exp.getId(),stud1.getId());
73 48
74 49 
     }
75 50
76 51 
     @Test
77 
-    public void testGetArray(){
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();
92 
-        //Then
93 
-        Assert.assertEquals(exp,act);
94 
-    }
95 
-
96 
-    @Test
97 52 
     public void testRemoveAll(){
98 
-        People peepList = new People(){};
99 
-        Person person1 = new Person(1,"name1");
100 
-        Person person2 = new Person(2,"name2");
101 
-        Person person3 = new Person(3,"name3");
53 
+        //Given
54 
+        Instructors instructors = Instructors.getInstance();
102 55 
         //When
103 
-        peepList.add(person1);
104 
-        peepList.add(person2);
105 
-        peepList.add(person3);
106 
-        peepList.removeAll();
107 
-        int exp = 0;
108 
-        int act = peepList.getCount();
56 
+        instructors.removeAll();
109 57 
         //Then
110 
-
111 
-        Assert.assertEquals(exp,act);
58 
+        Assert.assertEquals(0,instructors.getCount());
112 59 
     }
113 60 
 }

+ 0
- 4
src/test/java/io/zipcoder/interfaces/TestPerson.java 查看文件 

@@ -8,11 +8,9 @@ public class TestPerson {
8 8 
     public void testConstructor(){
9 9 
         //Given
10 10 
         Person person = new Person(1234);
11 
-
12 11 
         //When
13 12 
         long expID = 1234;
14 13 
         long actID = person.getId();
15 
-
16 14 
         //Then
17 15 
         Assert.assertEquals(expID,actID);
18 16 
     }
 
@@ -21,12 +19,10 @@ public class TestPerson {
21 19 
     public void testSetAndGetName(){
22 20 
         //Given
23 21 
         Person person = new Person(1234);
24 
-
25 22 
         //When
26 23 
         String name = "Joe";
27 24 
         person.setName(name);
28 25 
         String actName = person.getName();
29 
-
30 26 
         //Then
31 27 
         Assert.assertEquals("Joe",actName);
32 28 
     }

+ 8
- 8
src/test/java/io/zipcoder/interfaces/TestStudent.java 查看文件 

@@ -4,32 +4,32 @@ import org.junit.Test;
4 4 
 import org.junit.Assert;
5 5
6 6 
 public class TestStudent {
7 
+    Student stud;
7 8
8 9 
     @Test
9 10 
     public void testImplementation(){
10 11 
         //Given
11 
-        Student student = new Student("student",1);
12 
+        stud = new Student("student",1);
12 13 
         //Then
13 
-        Assert.assertTrue(student instanceof Learner);
14 
+        Assert.assertTrue(stud instanceof Learner);
14 15 
     }
15 16
16 17 
     @Test
17 18 
     public void testInheritance(){
18 19 
         //Given
19 
-        Student student = new Student("student",1);
20 
+        stud = new Student("student",1);
20 21 
         //Then
21 
-        Assert.assertTrue(student instanceof Person);
22 
+        Assert.assertTrue(stud instanceof Person);
22 23 
     }
23 24
24 25 
     @Test
25 26 
     public void testLearn(){
26 27 
         //Given
27 
-        Student student = new Student("student",1);
28 
+        stud = new Student("student",1);
28 29 
         //When
29 
-        student.learn(5);
30 
-
30 
+        stud.learn(5);
31 31 
         double expStudyTime = 5;
32 
-        double actStudyTime = student.getTotalStudyTime();
32 
+        double actStudyTime = stud.getTotalStudyTime();
33 33 
         //Then
34 34 
         Assert.assertEquals(expStudyTime, actStudyTime,.001);
35 35 
     }

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

@@ -18,8 +18,8 @@ public class TestStudents {
18 18 
         //Given
19 19 
         Students instance1 = Students.getInstance();
20 20 
         //When
21 
-        int exp = 39;
22 
-        int act = instance1.studList.size();
21 
+        int exp = 41;
22 
+        int act = instance1.getArray().length;
23 23 
         //Then
24 24 
         Assert.assertEquals(exp,act);
25 25 
     }

+ 10
- 33
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java 查看文件 

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