Jennifer Chao 6 år sedan
förälder
incheckning
3c1b19a476

+ 143
- 164
.idea/workspace.xml Visa fil

2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
     <list default="true" id="6d401438-edd6-46bd-8430-575eb6761c9c" name="Default Changelist" comment="">
4
     <list default="true" id="6d401438-edd6-46bd-8430-575eb6761c9c" 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/test/java/io/zipcoder/interfaces/EducatorTest.java" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
9
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
10
-      <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" />
11
-      <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" />
12
-      <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" />
13
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" afterDir="false" />
5
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" afterDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" afterDir="false" />
14
       <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" afterDir="false" />
7
       <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" afterDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" afterDir="false" />
16
       <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" />
8
       <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
     </list>
9
     </list>
18
     <ignored path="$PROJECT_DIR$/target/" />
10
     <ignored path="$PROJECT_DIR$/target/" />
33
           <entry key="project.closed" value="2" />
25
           <entry key="project.closed" value="2" />
34
           <entry key="project.open.time.0" value="1" />
26
           <entry key="project.open.time.0" value="1" />
35
           <entry key="project.open.time.2" value="1" />
27
           <entry key="project.open.time.2" value="1" />
36
-          <entry key="project.opened" value="2" />
28
+          <entry key="project.open.time.4" value="1" />
29
+          <entry key="project.opened" value="3" />
37
         </counts>
30
         </counts>
38
       </usages-collector>
31
       </usages-collector>
39
       <usages-collector id="statistics.file.extensions.open">
32
       <usages-collector id="statistics.file.extensions.open">
40
         <counts>
33
         <counts>
41
           <entry key="class" value="1" />
34
           <entry key="class" value="1" />
42
-          <entry key="java" value="94" />
35
+          <entry key="java" value="103" />
43
           <entry key="md" value="1" />
36
           <entry key="md" value="1" />
44
         </counts>
37
         </counts>
45
       </usages-collector>
38
       </usages-collector>
46
       <usages-collector id="statistics.file.types.open">
39
       <usages-collector id="statistics.file.types.open">
47
         <counts>
40
         <counts>
48
           <entry key="CLASS" value="1" />
41
           <entry key="CLASS" value="1" />
49
-          <entry key="JAVA" value="94" />
42
+          <entry key="JAVA" value="103" />
50
           <entry key="Markdown" value="1" />
43
           <entry key="Markdown" value="1" />
51
         </counts>
44
         </counts>
52
       </usages-collector>
45
       </usages-collector>
53
       <usages-collector id="statistics.file.extensions.edit">
46
       <usages-collector id="statistics.file.extensions.edit">
54
         <counts>
47
         <counts>
55
-          <entry key="java" value="11543" />
48
+          <entry key="java" value="12248" />
56
         </counts>
49
         </counts>
57
       </usages-collector>
50
       </usages-collector>
58
       <usages-collector id="statistics.file.types.edit">
51
       <usages-collector id="statistics.file.types.edit">
59
         <counts>
52
         <counts>
60
-          <entry key="JAVA" value="11543" />
53
+          <entry key="JAVA" value="12248" />
61
         </counts>
54
         </counts>
62
       </usages-collector>
55
       </usages-collector>
63
     </session>
56
     </session>
64
   </component>
57
   </component>
65
   <component name="FileEditorManager">
58
   <component name="FileEditorManager">
66
-    <splitter split-orientation="horizontal" split-proportion="0.4766436">
59
+    <splitter split-orientation="horizontal" split-proportion="0.3755047">
67
       <split-first>
60
       <split-first>
68
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
61
         <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
69
           <file pinned="false" current-in-tab="true">
62
           <file pinned="false" current-in-tab="true">
83
           <file pinned="false" current-in-tab="false">
76
           <file pinned="false" current-in-tab="false">
84
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
77
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
85
               <provider selected="true" editor-type-id="text-editor">
78
               <provider selected="true" editor-type-id="text-editor">
86
-                <state relative-caret-position="244">
87
-                  <caret line="18" column="40" selection-start-line="18" selection-start-column="40" selection-end-line="18" selection-end-column="40" />
79
+                <state relative-caret-position="180">
80
+                  <caret line="12" column="8" lean-forward="true" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="58" />
88
                   <folding>
81
                   <folding>
89
                     <element signature="imports" expanded="true" />
82
                     <element signature="imports" expanded="true" />
90
                   </folding>
83
                   </folding>
92
               </provider>
85
               </provider>
93
             </entry>
86
             </entry>
94
           </file>
87
           </file>
95
-          <file pinned="false" current-in-tab="false">
88
+          <file pinned="false" current-in-tab="true">
96
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
89
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
97
               <provider selected="true" editor-type-id="text-editor">
90
               <provider selected="true" editor-type-id="text-editor">
98
-                <state relative-caret-position="1608">
99
-                  <caret line="111" column="9" lean-forward="true" selection-start-line="111" selection-start-column="9" selection-end-line="111" selection-end-column="9" />
91
+                <state relative-caret-position="1440">
92
+                  <caret line="96" column="5" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
100
                   <folding>
93
                   <folding>
101
                     <element signature="imports" expanded="true" />
94
                     <element signature="imports" expanded="true" />
102
                   </folding>
95
                   </folding>
105
             </entry>
98
             </entry>
106
           </file>
99
           </file>
107
           <file pinned="false" current-in-tab="false">
100
           <file pinned="false" current-in-tab="false">
108
-            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
101
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PersonTest.java">
109
               <provider selected="true" editor-type-id="text-editor">
102
               <provider selected="true" editor-type-id="text-editor">
110
-                <state relative-caret-position="435">
111
-                  <caret line="29" column="24" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
103
+                <state relative-caret-position="285">
104
+                  <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
112
                   <folding>
105
                   <folding>
113
-                    <element signature="e#500#501#0" expanded="true" />
114
-                    <element signature="e#533#534#0" expanded="true" />
115
-                    <element signature="e#585#586#0" expanded="true" />
116
-                    <element signature="e#629#630#0" expanded="true" />
117
-                    <element signature="e#678#679#0" expanded="true" />
118
-                    <element signature="e#709#710#0" expanded="true" />
119
-                    <element signature="e#736#737#0" expanded="true" />
106
+                    <element signature="imports" expanded="true" />
120
                   </folding>
107
                   </folding>
121
                 </state>
108
                 </state>
122
               </provider>
109
               </provider>
123
             </entry>
110
             </entry>
124
           </file>
111
           </file>
125
           <file pinned="false" current-in-tab="false">
112
           <file pinned="false" current-in-tab="false">
126
-            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
113
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
127
               <provider selected="true" editor-type-id="text-editor">
114
               <provider selected="true" editor-type-id="text-editor">
128
-                <state relative-caret-position="795">
129
-                  <caret line="53" column="7" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="53" selection-end-column="7" />
115
+                <state relative-caret-position="225">
116
+                  <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
130
                   <folding>
117
                   <folding>
131
                     <element signature="imports" expanded="true" />
118
                     <element signature="imports" expanded="true" />
119
+                    <element signature="e#269#270#0" expanded="true" />
120
+                    <element signature="e#324#325#0" expanded="true" />
132
                   </folding>
121
                   </folding>
133
                 </state>
122
                 </state>
134
               </provider>
123
               </provider>
135
             </entry>
124
             </entry>
136
           </file>
125
           </file>
137
           <file pinned="false" current-in-tab="false">
126
           <file pinned="false" current-in-tab="false">
138
-            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
127
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
139
               <provider selected="true" editor-type-id="text-editor">
128
               <provider selected="true" editor-type-id="text-editor">
140
-                <state relative-caret-position="120">
141
-                  <caret line="12" column="35" lean-forward="true" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
129
+                <state relative-caret-position="405">
130
+                  <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
131
+                  <folding>
132
+                    <element signature="imports" expanded="true" />
133
+                  </folding>
142
                 </state>
134
                 </state>
143
               </provider>
135
               </provider>
144
             </entry>
136
             </entry>
145
           </file>
137
           </file>
146
           <file pinned="false" current-in-tab="false">
138
           <file pinned="false" current-in-tab="false">
147
-            <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
139
+            <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
148
               <provider selected="true" editor-type-id="text-editor">
140
               <provider selected="true" editor-type-id="text-editor">
149
-                <state relative-caret-position="224">
150
-                  <caret line="15" column="36" lean-forward="true" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
141
+                <state relative-caret-position="567">
142
+                  <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
151
                   <folding>
143
                   <folding>
152
                     <element signature="imports" expanded="true" />
144
                     <element signature="imports" expanded="true" />
153
-                    <element signature="e#896#897#0" expanded="true" />
154
-                    <element signature="e#927#928#0" expanded="true" />
155
                   </folding>
145
                   </folding>
156
                 </state>
146
                 </state>
157
               </provider>
147
               </provider>
169
               </provider>
159
               </provider>
170
             </entry>
160
             </entry>
171
           </file>
161
           </file>
172
-          <file pinned="false" current-in-tab="true">
162
+          <file pinned="false" current-in-tab="false">
173
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
163
             <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
174
               <provider selected="true" editor-type-id="text-editor">
164
               <provider selected="true" editor-type-id="text-editor">
175
-                <state relative-caret-position="431">
176
-                  <caret line="34" column="46" lean-forward="true" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
165
+                <state relative-caret-position="255">
166
+                  <caret line="17" selection-start-line="17" selection-end-line="18" selection-end-column="51" />
177
                   <folding>
167
                   <folding>
178
                     <element signature="imports" expanded="true" />
168
                     <element signature="imports" expanded="true" />
179
                   </folding>
169
                   </folding>
216
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
206
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
217
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
207
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
218
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonInterface.java" />
208
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonInterface.java" />
219
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
220
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
209
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
221
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
222
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
223
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
210
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
224
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" />
225
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
211
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
212
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
213
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
214
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" />
215
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
226
       </list>
216
       </list>
227
     </option>
217
     </option>
228
   </component>
218
   </component>
233
     <sorting>DEFINITION_ORDER</sorting>
223
     <sorting>DEFINITION_ORDER</sorting>
234
   </component>
224
   </component>
235
   <component name="ProjectFrameBounds">
225
   <component name="ProjectFrameBounds">
236
-    <option name="x" value="66" />
237
-    <option name="y" value="23" />
238
-    <option name="width" value="1818" />
239
-    <option name="height" value="992" />
226
+    <option name="x" value="-290" />
227
+    <option name="y" value="-1057" />
228
+    <option name="width" value="1777" />
229
+    <option name="height" value="1019" />
240
   </component>
230
   </component>
241
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
231
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
242
     <ConfirmationsSetting value="2" id="Add" />
232
     <ConfirmationsSetting value="2" id="Add" />
246
       <foldersAlwaysOnTop value="true" />
236
       <foldersAlwaysOnTop value="true" />
247
     </navigator>
237
     </navigator>
248
     <panes>
238
     <panes>
249
-      <pane id="PackagesPane" />
250
-      <pane id="Scope" />
251
       <pane id="ProjectPane">
239
       <pane id="ProjectPane">
252
         <subPane>
240
         <subPane>
253
           <expand>
241
           <expand>
306
           <select />
294
           <select />
307
         </subPane>
295
         </subPane>
308
       </pane>
296
       </pane>
297
+      <pane id="PackagesPane" />
298
+      <pane id="Scope" />
309
     </panes>
299
     </panes>
310
   </component>
300
   </component>
311
   <component name="PropertiesComponent">
301
   <component name="PropertiesComponent">
312
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/jenniferchao/Labs/W3/CR-MacroLabs-OOP-InstructorStudentClassroom/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
302
     <property name="SearchEverywhereHistoryKey" value="&#9;FILE&#9;file:///Users/jenniferchao/Labs/W3/CR-MacroLabs-OOP-InstructorStudentClassroom/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
313
     <property name="WebServerToolWindowFactoryState" value="false" />
303
     <property name="WebServerToolWindowFactoryState" value="false" />
314
     <property name="aspect.path.notification.shown" value="true" />
304
     <property name="aspect.path.notification.shown" value="true" />
315
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541531794276" />
305
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541538568670" />
316
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
306
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
317
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
307
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
318
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
308
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
335
     </option>
325
     </option>
336
   </component>
326
   </component>
337
   <component name="RunManager" selected="JUnit.InstructorTest">
327
   <component name="RunManager" selected="JUnit.InstructorTest">
338
-    <configuration name="EducatorTest.testImplementation" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
328
+    <configuration name="EducatorTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
339
       <module name="interfaces-1" />
329
       <module name="interfaces-1" />
340
       <extension name="coverage">
330
       <extension name="coverage">
341
         <pattern>
331
         <pattern>
345
       </extension>
335
       </extension>
346
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
336
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
347
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.EducatorTest" />
337
       <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.EducatorTest" />
348
-      <option name="METHOD_NAME" value="testImplementation" />
349
-      <option name="TEST_OBJECT" value="method" />
350
       <method v="2">
338
       <method v="2">
351
         <option name="Make" enabled="true" />
339
         <option name="Make" enabled="true" />
352
       </method>
340
       </method>
379
         <option name="Make" enabled="true" />
367
         <option name="Make" enabled="true" />
380
       </method>
368
       </method>
381
     </configuration>
369
     </configuration>
382
-    <configuration name="PeopleTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
370
+    <configuration name="StudentTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
383
       <module name="interfaces-1" />
371
       <module name="interfaces-1" />
384
       <extension name="coverage">
372
       <extension name="coverage">
385
         <pattern>
373
         <pattern>
388
         </pattern>
376
         </pattern>
389
       </extension>
377
       </extension>
390
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
378
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
391
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
379
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentTest" />
392
       <method v="2">
380
       <method v="2">
393
         <option name="Make" enabled="true" />
381
         <option name="Make" enabled="true" />
394
       </method>
382
       </method>
395
     </configuration>
383
     </configuration>
396
-    <configuration name="ZipCodeWilmingtonTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
384
+    <configuration name="StudentsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
397
       <module name="interfaces-1" />
385
       <module name="interfaces-1" />
398
       <extension name="coverage">
386
       <extension name="coverage">
399
         <pattern>
387
         <pattern>
402
         </pattern>
390
         </pattern>
403
       </extension>
391
       </extension>
404
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
392
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
405
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
393
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
406
       <method v="2">
394
       <method v="2">
407
         <option name="Make" enabled="true" />
395
         <option name="Make" enabled="true" />
408
       </method>
396
       </method>
409
     </configuration>
397
     </configuration>
410
     <list>
398
     <list>
411
-      <item itemvalue="JUnit.ZipCodeWilmingtonTest" />
399
+      <item itemvalue="JUnit.StudentTest" />
400
+      <item itemvalue="JUnit.StudentsTest" />
401
+      <item itemvalue="JUnit.EducatorTest" />
412
       <item itemvalue="JUnit.InstructorsTest" />
402
       <item itemvalue="JUnit.InstructorsTest" />
413
-      <item itemvalue="JUnit.PeopleTest" />
414
-      <item itemvalue="JUnit.EducatorTest.testImplementation" />
415
       <item itemvalue="JUnit.InstructorTest" />
403
       <item itemvalue="JUnit.InstructorTest" />
416
     </list>
404
     </list>
417
     <recent_temporary>
405
     <recent_temporary>
418
       <list>
406
       <list>
419
         <item itemvalue="JUnit.InstructorTest" />
407
         <item itemvalue="JUnit.InstructorTest" />
420
-        <item itemvalue="JUnit.EducatorTest.testImplementation" />
421
         <item itemvalue="JUnit.InstructorsTest" />
408
         <item itemvalue="JUnit.InstructorsTest" />
422
-        <item itemvalue="JUnit.PeopleTest" />
423
-        <item itemvalue="JUnit.ZipCodeWilmingtonTest" />
409
+        <item itemvalue="JUnit.EducatorTest" />
410
+        <item itemvalue="JUnit.StudentTest" />
411
+        <item itemvalue="JUnit.StudentsTest" />
424
       </list>
412
       </list>
425
     </recent_temporary>
413
     </recent_temporary>
426
   </component>
414
   </component>
436
       <updated>1541398494769</updated>
424
       <updated>1541398494769</updated>
437
       <workItem from="1541398496278" duration="19454000" />
425
       <workItem from="1541398496278" duration="19454000" />
438
       <workItem from="1541511967581" duration="11210000" />
426
       <workItem from="1541511967581" duration="11210000" />
427
+      <workItem from="1541534437208" duration="2258000" />
439
     </task>
428
     </task>
440
     <servers />
429
     <servers />
441
   </component>
430
   </component>
442
   <component name="TestHistory">
431
   <component name="TestHistory">
443
-    <history-entry file="PeopleTest_testGetArray - 2018.11.06 at 12h 08m 37s.xml">
444
-      <configuration name="PeopleTest.testGetArray" configurationId="JUnit" />
432
+    <history-entry file="EducatorTest - 2018.11.06 at 16h 00m 22s.xml">
433
+      <configuration name="EducatorTest" configurationId="JUnit" />
445
     </history-entry>
434
     </history-entry>
446
-    <history-entry file="PeopleTest_testGetArray - 2018.11.06 at 13h 16m 36s.xml">
447
-      <configuration name="PeopleTest.testGetArray" configurationId="JUnit" />
435
+    <history-entry file="EducatorTest_testLecture_AnotherTime - 2018.11.06 at 16h 02m 03s.xml">
436
+      <configuration name="EducatorTest.testLecture_AnotherTime" configurationId="JUnit" />
448
     </history-entry>
437
     </history-entry>
449
-    <history-entry file="InstructorsTest - 2018.11.06 at 13h 17m 38s.xml">
450
-      <configuration name="InstructorsTest" configurationId="JUnit" />
438
+    <history-entry file="EducatorTest - 2018.11.06 at 16h 02m 06s.xml">
439
+      <configuration name="EducatorTest" configurationId="JUnit" />
451
     </history-entry>
440
     </history-entry>
452
-    <history-entry file="StudentsTest - 2018.11.06 at 13h 17m 41s.xml">
453
-      <configuration name="StudentsTest" configurationId="JUnit" />
441
+    <history-entry file="EducatorTest - 2018.11.06 at 16h 05m 02s.xml">
442
+      <configuration name="EducatorTest" configurationId="JUnit" />
454
     </history-entry>
443
     </history-entry>
455
-    <history-entry file="ZipCodeWilmingtonTest - 2018.11.06 at 13h 17m 46s.xml">
456
-      <configuration name="ZipCodeWilmingtonTest" configurationId="JUnit" />
444
+    <history-entry file="EducatorTest_testLecture_SomeoneElseTime - 2018.11.06 at 16h 06m 53s.xml">
445
+      <configuration name="EducatorTest.testLecture_SomeoneElseTime" configurationId="JUnit" />
457
     </history-entry>
446
     </history-entry>
458
-    <history-entry file="PeopleTest - 2018.11.06 at 13h 18m 01s.xml">
459
-      <configuration name="PeopleTest" configurationId="JUnit" />
447
+    <history-entry file="EducatorTest - 2018.11.06 at 16h 06m 57s.xml">
448
+      <configuration name="EducatorTest" configurationId="JUnit" />
460
     </history-entry>
449
     </history-entry>
461
-    <history-entry file="InstructorsTest - 2018.11.06 at 13h 36m 40s.xml">
462
-      <configuration name="InstructorsTest" configurationId="JUnit" />
450
+    <history-entry file="EducatorTest_testLecture_SomeoneElseTime - 2018.11.06 at 16h 07m 33s.xml">
451
+      <configuration name="EducatorTest.testLecture_SomeoneElseTime" configurationId="JUnit" />
463
     </history-entry>
452
     </history-entry>
464
-    <history-entry file="InstructorsTest - 2018.11.06 at 13h 37m 40s.xml">
465
-      <configuration name="InstructorsTest" configurationId="JUnit" />
453
+    <history-entry file="EducatorTest - 2018.11.06 at 16h 08m 18s.xml">
454
+      <configuration name="EducatorTest" configurationId="JUnit" />
466
     </history-entry>
455
     </history-entry>
467
-    <history-entry file="InstructorsTest - 2018.11.06 at 13h 38m 36s.xml">
468
-      <configuration name="InstructorsTest" configurationId="JUnit" />
456
+    <history-entry file="StudentTest - 2018.11.06 at 16h 08m 44s.xml">
457
+      <configuration name="StudentTest" configurationId="JUnit" />
469
     </history-entry>
458
     </history-entry>
470
-    <history-entry file="EducatorTest_testImplementation - 2018.11.06 at 13h 41m 16s.xml">
471
-      <configuration name="EducatorTest.testImplementation" configurationId="JUnit" />
459
+    <history-entry file="PeopleTest - 2018.11.06 at 16h 08m 49s.xml">
460
+      <configuration name="PeopleTest" configurationId="JUnit" />
472
     </history-entry>
461
     </history-entry>
473
   </component>
462
   </component>
474
   <component name="TimeTrackingManager">
463
   <component name="TimeTrackingManager">
475
-    <option name="totallyTimeSpent" value="30664000" />
464
+    <option name="totallyTimeSpent" value="32922000" />
476
   </component>
465
   </component>
477
   <component name="TodoView">
466
   <component name="TodoView">
478
     <todo-panel id="selected-file">
467
     <todo-panel id="selected-file">
484
     </todo-panel>
473
     </todo-panel>
485
   </component>
474
   </component>
486
   <component name="ToolWindowManager">
475
   <component name="ToolWindowManager">
487
-    <frame x="66" y="23" width="1818" height="992" extended-state="0" />
476
+    <frame x="-290" y="-1057" width="1777" height="1019" extended-state="0" />
477
+    <editor active="true" />
488
     <layout>
478
     <layout>
489
       <window_info id="Designer" order="0" />
479
       <window_info id="Designer" order="0" />
490
       <window_info id="UI Designer" order="1" />
480
       <window_info id="UI Designer" order="1" />
491
       <window_info id="Capture Tool" order="2" />
481
       <window_info id="Capture Tool" order="2" />
492
       <window_info id="Favorites" order="3" side_tool="true" />
482
       <window_info id="Favorites" order="3" side_tool="true" />
493
       <window_info id="Image Layers" order="4" />
483
       <window_info id="Image Layers" order="4" />
494
-      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.04617117" />
484
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.14351586" />
495
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
485
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
496
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
486
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
497
-      <window_info anchor="bottom" id="Terminal" order="1" weight="0.3283582" />
487
+      <window_info anchor="bottom" id="Terminal" order="1" weight="0.32777777" />
498
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
488
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
499
       <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
489
       <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
500
       <window_info anchor="bottom" id="Message" order="4" />
490
       <window_info anchor="bottom" id="Message" order="4" />
501
       <window_info anchor="bottom" id="Find" order="5" />
491
       <window_info anchor="bottom" id="Find" order="5" />
502
-      <window_info anchor="bottom" id="Run" order="6" weight="0.32903227" />
492
+      <window_info active="true" anchor="bottom" id="Run" order="6" visible="true" weight="0.32901832" />
503
       <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
493
       <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
504
-      <window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.22222222" />
494
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.22222222" />
505
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
495
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
506
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
496
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
507
       <window_info anchor="bottom" id="TODO" order="11" weight="0.32903227" />
497
       <window_info anchor="bottom" id="TODO" order="11" weight="0.32903227" />
521
       <window_info id="Capture Tool" order="2" />
511
       <window_info id="Capture Tool" order="2" />
522
       <window_info id="Favorites" order="3" side_tool="true" />
512
       <window_info id="Favorites" order="3" side_tool="true" />
523
       <window_info id="Image Layers" order="4" />
513
       <window_info id="Image Layers" order="4" />
524
-      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.1720517" />
514
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.14351586" />
525
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
515
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
526
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
516
       <window_info anchor="bottom" id="Version Control" order="0" show_stripe_button="false" />
527
-      <window_info anchor="bottom" id="Terminal" order="1" weight="0.32903227" />
517
+      <window_info anchor="bottom" id="Terminal" order="1" weight="0.32777777" />
528
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
518
       <window_info anchor="bottom" id="Event Log" order="2" side_tool="true" />
529
       <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
519
       <window_info anchor="bottom" id="Database Changes" order="3" show_stripe_button="false" />
530
       <window_info anchor="bottom" id="Message" order="4" />
520
       <window_info anchor="bottom" id="Message" order="4" />
531
       <window_info anchor="bottom" id="Find" order="5" />
521
       <window_info anchor="bottom" id="Find" order="5" />
532
-      <window_info anchor="bottom" id="Run" order="6" visible="true" weight="0.32903227" />
522
+      <window_info active="true" anchor="bottom" id="Run" order="6" visible="true" weight="0.32901832" />
533
       <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
523
       <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
534
-      <window_info anchor="bottom" id="Messages" order="8" weight="0.32580644" />
524
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.22222222" />
535
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
525
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
536
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
526
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
537
       <window_info anchor="bottom" id="TODO" order="11" weight="0.32903227" />
527
       <window_info anchor="bottom" id="TODO" order="11" weight="0.32903227" />
560
         </state>
550
         </state>
561
       </provider>
551
       </provider>
562
     </entry>
552
     </entry>
563
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PersonTest.java">
564
-      <provider selected="true" editor-type-id="text-editor">
565
-        <state relative-caret-position="285">
566
-          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
567
-          <folding>
568
-            <element signature="imports" expanded="true" />
569
-          </folding>
570
-        </state>
571
-      </provider>
572
-    </entry>
573
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
553
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
574
       <provider selected="true" editor-type-id="text-editor">
554
       <provider selected="true" editor-type-id="text-editor">
575
         <state relative-caret-position="75">
555
         <state relative-caret-position="75">
618
         </state>
598
         </state>
619
       </provider>
599
       </provider>
620
     </entry>
600
     </entry>
621
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
622
-      <provider selected="true" editor-type-id="text-editor">
623
-        <state relative-caret-position="405">
624
-          <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
625
-          <folding>
626
-            <element signature="imports" expanded="true" />
627
-          </folding>
628
-        </state>
629
-      </provider>
630
-    </entry>
631
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/src.zip!/java/lang/Class.java">
601
     <entry file="jar:///Library/Java/JavaVirtualMachines/jdk1.8.0_181.jdk/Contents/Home/src.zip!/java/lang/Class.java">
632
       <provider selected="true" editor-type-id="text-editor">
602
       <provider selected="true" editor-type-id="text-editor">
633
         <state relative-caret-position="372">
603
         <state relative-caret-position="372">
652
         </state>
622
         </state>
653
       </provider>
623
       </provider>
654
     </entry>
624
     </entry>
655
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonInterface.java">
656
-      <provider selected="true" editor-type-id="text-editor">
657
-        <state relative-caret-position="90">
658
-          <caret line="6" column="9" lean-forward="true" selection-start-line="6" selection-start-column="9" selection-end-line="6" selection-end-column="9" />
659
-        </state>
660
-      </provider>
661
-    </entry>
625
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonInterface.java" />
662
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
626
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
663
       <provider selected="true" editor-type-id="text-editor">
627
       <provider selected="true" editor-type-id="text-editor">
664
         <state relative-caret-position="180">
628
         <state relative-caret-position="180">
669
         </state>
633
         </state>
670
       </provider>
634
       </provider>
671
     </entry>
635
     </entry>
672
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
636
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
673
       <provider selected="true" editor-type-id="text-editor">
637
       <provider selected="true" editor-type-id="text-editor">
674
-        <state relative-caret-position="225">
675
-          <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
676
-          <folding>
677
-            <element signature="imports" expanded="true" />
678
-            <element signature="e#269#270#0" expanded="true" />
679
-            <element signature="e#324#325#0" expanded="true" />
680
-          </folding>
638
+        <state relative-caret-position="120">
639
+          <caret line="12" column="35" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
681
         </state>
640
         </state>
682
       </provider>
641
       </provider>
683
     </entry>
642
     </entry>
684
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
643
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
685
       <provider selected="true" editor-type-id="text-editor">
644
       <provider selected="true" editor-type-id="text-editor">
686
-        <state relative-caret-position="244">
687
-          <caret line="18" column="40" selection-start-line="18" selection-start-column="40" selection-end-line="18" selection-end-column="40" />
645
+        <state relative-caret-position="210">
646
+          <caret line="15" column="36" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
688
           <folding>
647
           <folding>
689
             <element signature="imports" expanded="true" />
648
             <element signature="imports" expanded="true" />
690
           </folding>
649
           </folding>
691
         </state>
650
         </state>
692
       </provider>
651
       </provider>
693
     </entry>
652
     </entry>
694
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
653
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
695
       <provider selected="true" editor-type-id="text-editor">
654
       <provider selected="true" editor-type-id="text-editor">
696
-        <state relative-caret-position="1608">
697
-          <caret line="111" column="9" lean-forward="true" selection-start-line="111" selection-start-column="9" selection-end-line="111" selection-end-column="9" />
655
+        <state relative-caret-position="290">
656
+          <caret line="37" column="40" selection-start-line="37" selection-start-column="40" selection-end-line="37" selection-end-column="40" />
698
           <folding>
657
           <folding>
699
-            <element signature="imports" expanded="true" />
658
+            <element signature="e#653#654#0" expanded="true" />
659
+            <element signature="e#678#679#0" expanded="true" />
660
+            <element signature="e#709#710#0" expanded="true" />
661
+            <element signature="e#736#737#0" expanded="true" />
700
           </folding>
662
           </folding>
701
         </state>
663
         </state>
702
       </provider>
664
       </provider>
709
         </state>
671
         </state>
710
       </provider>
672
       </provider>
711
     </entry>
673
     </entry>
712
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
674
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
713
       <provider selected="true" editor-type-id="text-editor">
675
       <provider selected="true" editor-type-id="text-editor">
714
-        <state relative-caret-position="435">
715
-          <caret line="29" column="24" selection-start-line="29" selection-start-column="24" selection-end-line="29" selection-end-column="24" />
676
+        <state relative-caret-position="180">
677
+          <caret line="12" column="8" lean-forward="true" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="58" />
716
           <folding>
678
           <folding>
717
-            <element signature="e#500#501#0" expanded="true" />
718
-            <element signature="e#533#534#0" expanded="true" />
719
-            <element signature="e#585#586#0" expanded="true" />
720
-            <element signature="e#629#630#0" expanded="true" />
721
-            <element signature="e#678#679#0" expanded="true" />
722
-            <element signature="e#709#710#0" expanded="true" />
723
-            <element signature="e#736#737#0" expanded="true" />
679
+            <element signature="imports" expanded="true" />
724
           </folding>
680
           </folding>
725
         </state>
681
         </state>
726
       </provider>
682
       </provider>
727
     </entry>
683
     </entry>
728
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
684
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
729
       <provider selected="true" editor-type-id="text-editor">
685
       <provider selected="true" editor-type-id="text-editor">
730
-        <state relative-caret-position="795">
731
-          <caret line="53" column="7" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="53" selection-end-column="7" />
686
+        <state relative-caret-position="567">
687
+          <caret line="66" lean-forward="true" selection-start-line="66" selection-end-line="66" />
732
           <folding>
688
           <folding>
733
             <element signature="imports" expanded="true" />
689
             <element signature="imports" expanded="true" />
734
           </folding>
690
           </folding>
745
         </state>
701
         </state>
746
       </provider>
702
       </provider>
747
     </entry>
703
     </entry>
748
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
704
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
749
       <provider selected="true" editor-type-id="text-editor">
705
       <provider selected="true" editor-type-id="text-editor">
750
-        <state relative-caret-position="224">
751
-          <caret line="15" column="36" lean-forward="true" selection-start-line="15" selection-start-column="36" selection-end-line="15" selection-end-column="36" />
706
+        <state relative-caret-position="255">
707
+          <caret line="17" selection-start-line="17" selection-end-line="18" selection-end-column="51" />
752
           <folding>
708
           <folding>
753
             <element signature="imports" expanded="true" />
709
             <element signature="imports" expanded="true" />
754
-            <element signature="e#896#897#0" expanded="true" />
755
-            <element signature="e#927#928#0" expanded="true" />
756
           </folding>
710
           </folding>
757
         </state>
711
         </state>
758
       </provider>
712
       </provider>
759
     </entry>
713
     </entry>
760
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
714
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PersonTest.java">
761
       <provider selected="true" editor-type-id="text-editor">
715
       <provider selected="true" editor-type-id="text-editor">
762
-        <state relative-caret-position="120">
763
-          <caret line="12" column="35" lean-forward="true" selection-start-line="12" selection-start-column="35" selection-end-line="12" selection-end-column="35" />
716
+        <state relative-caret-position="285">
717
+          <caret line="19" column="40" selection-start-line="19" selection-start-column="40" selection-end-line="19" selection-end-column="40" />
718
+          <folding>
719
+            <element signature="imports" expanded="true" />
720
+          </folding>
764
         </state>
721
         </state>
765
       </provider>
722
       </provider>
766
     </entry>
723
     </entry>
767
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
724
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
725
+      <provider selected="true" editor-type-id="text-editor">
726
+        <state relative-caret-position="225">
727
+          <caret line="15" column="9" lean-forward="true" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
728
+          <folding>
729
+            <element signature="imports" expanded="true" />
730
+            <element signature="e#269#270#0" expanded="true" />
731
+            <element signature="e#324#325#0" expanded="true" />
732
+          </folding>
733
+        </state>
734
+      </provider>
735
+    </entry>
736
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
737
+      <provider selected="true" editor-type-id="text-editor">
738
+        <state relative-caret-position="405">
739
+          <caret line="27" column="22" lean-forward="true" selection-start-line="27" selection-start-column="22" selection-end-line="27" selection-end-column="22" />
740
+          <folding>
741
+            <element signature="imports" expanded="true" />
742
+          </folding>
743
+        </state>
744
+      </provider>
745
+    </entry>
746
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
768
       <provider selected="true" editor-type-id="text-editor">
747
       <provider selected="true" editor-type-id="text-editor">
769
-        <state relative-caret-position="431">
770
-          <caret line="34" column="46" lean-forward="true" selection-start-line="34" selection-start-column="46" selection-end-line="34" selection-end-column="46" />
748
+        <state relative-caret-position="1440">
749
+          <caret line="96" column="5" selection-start-line="96" selection-start-column="5" selection-end-line="96" selection-end-column="5" />
771
           <folding>
750
           <folding>
772
             <element signature="imports" expanded="true" />
751
             <element signature="imports" expanded="true" />
773
           </folding>
752
           </folding>

+ 2
- 3
src/main/java/io/zipcoder/interfaces/Educator.java Visa fil

37
 
37
 
38
     public void teach(Learner learner, double numberOfHours) {
38
     public void teach(Learner learner, double numberOfHours) {
39
         learner.learn(numberOfHours);
39
         learner.learn(numberOfHours);
40
-        // educator.setTimeWorked(getTimeWorked() + numberOfHours);
40
+        setTimeWorked(getTimeWorked() + numberOfHours);
41
     }
41
     }
42
 
42
 
43
     public void lecture(Learner[] learners, double numberOfHours) {
43
     public void lecture(Learner[] learners, double numberOfHours) {
45
             double numberOfHoursPerLearner = (numberOfHours / learners.length);
45
             double numberOfHoursPerLearner = (numberOfHours / learners.length);
46
             learner.learn(numberOfHoursPerLearner);
46
             learner.learn(numberOfHoursPerLearner);
47
         }
47
         }
48
+        setTimeWorked(getTimeWorked() + numberOfHours);
48
     }
49
     }
49
-
50
-
51
 }
50
 }

+ 44
- 30
src/test/java/io/zipcoder/interfaces/EducatorTest.java Visa fil

7
 public class EducatorTest {
7
 public class EducatorTest {
8
 
8
 
9
     Student student = new Student(1, "Baby Code");
9
     Student student = new Student(1, "Baby Code");
10
-    Student[] students = new Student[5];
10
+    Student[] students = new Student[3];
11
 
11
 
12
+    @Before
12
     public void populateStudents() {
13
     public void populateStudents() {
13
         students[0] = new Student(1, "Baby Code");
14
         students[0] = new Student(1, "Baby Code");
14
         students[1] = new Student(2, "Babier Code");
15
         students[1] = new Student(2, "Babier Code");
15
         students[2] = new Student(3, "Babiest Code");
16
         students[2] = new Student(3, "Babiest Code");
16
-        students[3] = new Student(4, "Infant Code");
17
-        students[4] = new Student(5, "Fetus Code");
18
     }
17
     }
19
 
18
 
20
     @Test
19
     @Test
25
         Assert.assertEquals(expected, actual);
24
         Assert.assertEquals(expected, actual);
26
     }
25
     }
27
 
26
 
28
-//    @Test
29
-//    public void testInheritance(){
30
-//        boolean expected = true;
31
-//        boolean actual = instructor instanceof Person;
32
-//
33
-//        Assert.assertEquals(expected, actual);
34
-//    }
35
-//
36
-//    @Test
37
-//    public void testTeach() {
38
-//        instructor.teach(student, 10);
39
-//
40
-//        double expected = 10;
41
-//        double actual = student.getTotalStudyTime();
42
-//
43
-//        Assert.assertEquals(expected, actual, 0.1);
44
-//    }
45
-//
46
-//    @Test
47
-//    public void testLecture() {
48
-//        instructor.lecture(students, 50);
49
-//
50
-//        double expected = 10;
51
-//        double actual = students[0].getTotalStudyTime();
52
-//
53
-//        Assert.assertEquals(expected, actual, 0.1);
54
-//    }
27
+    @Test
28
+    public void testTeach() {
29
+        Educator.KRIS.setTimeWorked(0);
30
+        Educator.KRIS.teach(student, 3);
31
+
32
+        double expected = 3;
33
+        double actual = student.getTotalStudyTime();
34
+
35
+        Assert.assertEquals(expected, actual, 0.1);
36
+    }
37
+
38
+    @Test
39
+    public void testLecture() {
40
+        Educator.KRIS.setTimeWorked(0);
41
+        Educator.KRIS.lecture(students, 9);
42
+
43
+        double expected = 3;
44
+        double actual = students[0].getTotalStudyTime();
45
+
46
+        Assert.assertEquals(expected, actual, 0.1);
47
+    }
55
 
48
 
49
+    @Test
50
+    public void testLecture_Time() {
51
+        Educator.KRIS.setTimeWorked(0);
52
+        Educator.KRIS.lecture(students, 9);
53
+
54
+        double expected = 9;
55
+        double actual = Educator.KRIS.getTimeWorked();
56
+
57
+        Assert.assertEquals(expected, actual, 0.1);
58
+    }
59
+
60
+    @Test
61
+    public void testLecture_SoloTime() {
62
+        Educator.KRIS.setTimeWorked(0);
63
+        Educator.NHU.lecture(students, 9);
64
+
65
+        double nhuActual = Educator.NHU.getTimeWorked();
66
+        double krisActual = Educator.KRIS.getTimeWorked();
67
+
68
+        Assert.assertNotEquals(nhuActual, krisActual, 0.1);
69
+    }
56
 }
70
 }

+ 0
- 19
src/test/java/io/zipcoder/interfaces/PeopleTest.java Visa fil

96
         Assert.assertEquals(expected, actual);
96
         Assert.assertEquals(expected, actual);
97
     }
97
     }
98
 
98
 
99
-//    @Test
100
-//    public void testGetArray() {
101
-//        ArrayList<Person> expected = new ArrayList<Person>();
102
-//        expected.add(instructor);
103
-//        expected.add(student1);
104
-//        expected.add(student2);
105
-//
106
-//        Person[] actual = (Person[]) people.getArray();
107
-//        Person[] expected1 = (Person[]) expected.toArray();
108
-//
109
-//        Assert.assertEquals(expected1, actual);
110
-//    }
111
-
112
-    @Test
113
-    public void testGetArray_only() {
114
-        people.getArray();
115
-    }
116
-
117
-
118
     @Test
99
     @Test
119
     public void testRemoveAll() {
100
     public void testRemoveAll() {
120
         people.removeAll();
101
         people.removeAll();

+ 14
- 3
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java Visa fil

1
 package io.zipcoder.interfaces;
1
 package io.zipcoder.interfaces;
2
 
2
 
3
 import org.junit.Assert;
3
 import org.junit.Assert;
4
-import org.junit.Before;
5
 import org.junit.Test;
4
 import org.junit.Test;
6
 
5
 
7
-import java.lang.reflect.Field;
8
-
9
 public class ZipCodeWilmingtonTest {
6
 public class ZipCodeWilmingtonTest {
10
 
7
 
11
     ZipCodeWilmington zipCode = ZipCodeWilmington.getInstance();
8
     ZipCodeWilmington zipCode = ZipCodeWilmington.getInstance();
36
 
33
 
37
         Assert.assertEquals(expected, actual,  1e-8);
34
         Assert.assertEquals(expected, actual,  1e-8);
38
     }
35
     }
36
+
37
+    @Test
38
+    public void testHostLecture_Educator(){
39
+        Student ned = zipCode.students.studentList.get(0);
40
+        double originalStudyTime = ned.getTotalStudyTime();
41
+
42
+        zipCode.hostLecture(Educator.KRIS, 78);
43
+
44
+        double expected = 2;
45
+        double actual = ned.getTotalStudyTime() - originalStudyTime;
46
+
47
+        Assert.assertEquals(expected, actual,  1e-8);
48
+    }
49
+
39
 }
50
 }