瀏覽代碼

Instructor Student Classroom

NedRedmond 6 年之前
父節點
當前提交
25ed13bdb0

+ 124
- 0
.idea/uiDesigner.xml 查看文件

@@ -0,0 +1,124 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="Palette2">
4
+    <group name="Swing">
5
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
6
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
7
+      </item>
8
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
9
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
10
+      </item>
11
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
12
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
13
+      </item>
14
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
15
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
16
+      </item>
17
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
18
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
19
+        <initial-values>
20
+          <property name="text" value="Button" />
21
+        </initial-values>
22
+      </item>
23
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
24
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
25
+        <initial-values>
26
+          <property name="text" value="RadioButton" />
27
+        </initial-values>
28
+      </item>
29
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
30
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
31
+        <initial-values>
32
+          <property name="text" value="CheckBox" />
33
+        </initial-values>
34
+      </item>
35
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
36
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
37
+        <initial-values>
38
+          <property name="text" value="Label" />
39
+        </initial-values>
40
+      </item>
41
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
42
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
43
+          <preferred-size width="150" height="-1" />
44
+        </default-constraints>
45
+      </item>
46
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
47
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
48
+          <preferred-size width="150" height="-1" />
49
+        </default-constraints>
50
+      </item>
51
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
52
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
53
+          <preferred-size width="150" height="-1" />
54
+        </default-constraints>
55
+      </item>
56
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
57
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
58
+          <preferred-size width="150" height="50" />
59
+        </default-constraints>
60
+      </item>
61
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
62
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
63
+          <preferred-size width="150" height="50" />
64
+        </default-constraints>
65
+      </item>
66
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
67
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
68
+          <preferred-size width="150" height="50" />
69
+        </default-constraints>
70
+      </item>
71
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
72
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
73
+      </item>
74
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
75
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
76
+          <preferred-size width="150" height="50" />
77
+        </default-constraints>
78
+      </item>
79
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
80
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
81
+          <preferred-size width="150" height="50" />
82
+        </default-constraints>
83
+      </item>
84
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
85
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
86
+          <preferred-size width="150" height="50" />
87
+        </default-constraints>
88
+      </item>
89
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
90
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
91
+          <preferred-size width="200" height="200" />
92
+        </default-constraints>
93
+      </item>
94
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
95
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
96
+          <preferred-size width="200" height="200" />
97
+        </default-constraints>
98
+      </item>
99
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
100
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
101
+      </item>
102
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
103
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
104
+      </item>
105
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
106
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
107
+      </item>
108
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
109
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
110
+      </item>
111
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
112
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
113
+          <preferred-size width="-1" height="20" />
114
+        </default-constraints>
115
+      </item>
116
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
117
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
118
+      </item>
119
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
120
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
121
+      </item>
122
+    </group>
123
+  </component>
124
+</project>

+ 225
- 169
.idea/workspace.xml 查看文件

@@ -2,7 +2,17 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="8e76a78c-7b87-4795-997f-dbd651047f5b" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" afterDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
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" />
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" />
6 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" />
7 17
     </list>
8 18
     <ignored path="$PROJECT_DIR$/target/" />
@@ -16,32 +26,39 @@
16 26
     <session id="738691220">
17 27
       <usages-collector id="statistics.lifecycle.project">
18 28
         <counts>
19
-          <entry key="project.open.time.1" value="1" />
20
-          <entry key="project.opened" value="1" />
29
+          <entry key="project.closed" value="4" />
30
+          <entry key="project.open.time.1" value="2" />
31
+          <entry key="project.open.time.12" value="1" />
32
+          <entry key="project.open.time.13" value="2" />
33
+          <entry key="project.opened" value="5" />
21 34
         </counts>
22 35
       </usages-collector>
23 36
       <usages-collector id="statistics.file.extensions.open">
24 37
         <counts>
25 38
           <entry key="iml" value="1" />
26
-          <entry key="java" value="20" />
39
+          <entry key="java" value="33" />
40
+          <entry key="md" value="1" />
27 41
           <entry key="xml" value="1" />
28 42
         </counts>
29 43
       </usages-collector>
30 44
       <usages-collector id="statistics.file.types.open">
31 45
         <counts>
32 46
           <entry key="IDEA_MODULE" value="1" />
33
-          <entry key="JAVA" value="20" />
47
+          <entry key="JAVA" value="33" />
48
+          <entry key="Markdown" value="1" />
34 49
           <entry key="XML" value="1" />
35 50
         </counts>
36 51
       </usages-collector>
37 52
       <usages-collector id="statistics.file.extensions.edit">
38 53
         <counts>
39
-          <entry key="java" value="6162" />
54
+          <entry key="dummy" value="3" />
55
+          <entry key="java" value="7800" />
40 56
         </counts>
41 57
       </usages-collector>
42 58
       <usages-collector id="statistics.file.types.edit">
43 59
         <counts>
44
-          <entry key="JAVA" value="6162" />
60
+          <entry key="JAVA" value="7800" />
61
+          <entry key="PLAIN_TEXT" value="3" />
45 62
         </counts>
46 63
       </usages-collector>
47 64
     </session>
@@ -49,37 +66,44 @@
49 66
   <component name="FileEditorManager">
50 67
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
51 68
       <file pinned="false" current-in-tab="false">
52
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
69
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
53 70
           <provider selected="true" editor-type-id="text-editor">
54
-            <state relative-caret-position="90">
55
-              <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
71
+            <state relative-caret-position="240">
72
+              <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
73
+              <folding>
74
+                <element signature="e#725#726#0" expanded="true" />
75
+                <element signature="e#756#757#0" expanded="true" />
76
+              </folding>
56 77
             </state>
57 78
           </provider>
58 79
         </entry>
59 80
       </file>
60 81
       <file pinned="false" current-in-tab="false">
61
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
82
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
62 83
           <provider selected="true" editor-type-id="text-editor">
63
-            <state relative-caret-position="30">
64
-              <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
84
+            <state relative-caret-position="135">
85
+              <caret line="9" column="41" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
86
+              <folding>
87
+                <element signature="imports" expanded="true" />
88
+              </folding>
65 89
             </state>
66 90
           </provider>
67 91
         </entry>
68 92
       </file>
69 93
       <file pinned="false" current-in-tab="false">
70
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
94
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
71 95
           <provider selected="true" editor-type-id="text-editor">
72
-            <state relative-caret-position="135">
73
-              <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
96
+            <state relative-caret-position="150">
97
+              <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
74 98
             </state>
75 99
           </provider>
76 100
         </entry>
77 101
       </file>
78 102
       <file pinned="false" current-in-tab="false">
79
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
103
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
80 104
           <provider selected="true" editor-type-id="text-editor">
81
-            <state relative-caret-position="90">
82
-              <caret line="7" column="57" selection-start-line="7" selection-start-column="57" selection-end-line="7" selection-end-column="57" />
105
+            <state relative-caret-position="300">
106
+              <caret line="20" column="5" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
83 107
               <folding>
84 108
                 <element signature="imports" expanded="true" />
85 109
               </folding>
@@ -87,20 +111,11 @@
87 111
           </provider>
88 112
         </entry>
89 113
       </file>
90
-      <file pinned="false" current-in-tab="false">
91
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
92
-          <provider selected="true" editor-type-id="text-editor">
93
-            <state relative-caret-position="240">
94
-              <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
95
-            </state>
96
-          </provider>
97
-        </entry>
98
-      </file>
99
-      <file pinned="false" current-in-tab="false">
100
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
114
+      <file pinned="false" current-in-tab="true">
115
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
101 116
           <provider selected="true" editor-type-id="text-editor">
102
-            <state relative-caret-position="150">
103
-              <caret line="10" selection-start-line="10" selection-end-line="10" />
117
+            <state relative-caret-position="315">
118
+              <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
104 119
               <folding>
105 120
                 <element signature="imports" expanded="true" />
106 121
               </folding>
@@ -109,31 +124,37 @@
109 124
         </entry>
110 125
       </file>
111 126
       <file pinned="false" current-in-tab="false">
112
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
127
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
113 128
           <provider selected="true" editor-type-id="text-editor">
114
-            <state relative-caret-position="45">
115
-              <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
129
+            <state relative-caret-position="367">
130
+              <caret line="33" column="5" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="33" selection-end-column="5" />
116 131
             </state>
117 132
           </provider>
118 133
         </entry>
119 134
       </file>
120 135
       <file pinned="false" current-in-tab="false">
121
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
136
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
122 137
           <provider selected="true" editor-type-id="text-editor">
123
-            <state relative-caret-position="30">
124
-              <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
138
+            <state relative-caret-position="210">
139
+              <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
140
+              <folding>
141
+                <element signature="imports" expanded="true" />
142
+              </folding>
125 143
             </state>
126 144
           </provider>
127 145
         </entry>
128 146
       </file>
129
-      <file pinned="false" current-in-tab="true">
130
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
147
+      <file pinned="false" current-in-tab="false">
148
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
131 149
           <provider selected="true" editor-type-id="text-editor">
132
-            <state relative-caret-position="195">
133
-              <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
150
+            <state relative-caret-position="270">
151
+              <caret line="18" column="35" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
134 152
               <folding>
135
-                <element signature="e#225#226#0" expanded="true" />
136
-                <element signature="e#253#254#0" expanded="true" />
153
+                <element signature="e#483#484#0" expanded="true" />
154
+                <element signature="e#510#511#0" expanded="true" />
155
+                <element signature="e#535#536#0" expanded="true" />
156
+                <element signature="e#566#567#0" expanded="true" />
157
+                <element signature="e#593#594#0" expanded="true" />
137 158
               </folding>
138 159
             </state>
139 160
           </provider>
@@ -142,8 +163,11 @@
142 163
       <file pinned="false" current-in-tab="false">
143 164
         <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
144 165
           <provider selected="true" editor-type-id="text-editor">
145
-            <state relative-caret-position="420">
146
-              <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
166
+            <state relative-caret-position="465">
167
+              <caret line="42" selection-start-line="42" selection-end-line="42" />
168
+              <folding>
169
+                <element signature="imports" expanded="true" />
170
+              </folding>
147 171
             </state>
148 172
           </provider>
149 173
         </entry>
@@ -154,12 +178,14 @@
154 178
     <option name="RECENT_TEMPLATES">
155 179
       <list>
156 180
         <option value="Interface" />
181
+        <option value="Enum" />
157 182
         <option value="Class" />
158 183
       </list>
159 184
     </option>
160 185
   </component>
161 186
   <component name="FindInProjectRecents">
162 187
     <findStrings>
188
+      <find>Person</find>
163 189
       <find>Student</find>
164 190
     </findStrings>
165 191
   </component>
@@ -177,16 +203,19 @@
177 203
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
178 204
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
179 205
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java" />
180
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
181
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
182 206
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
183
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
184 207
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
185
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
186
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
208
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
187 209
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
188 210
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java" />
211
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
212
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
213
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
189 214
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java" />
215
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/educatorTest.java" />
216
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java" />
217
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
218
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java" />
190 219
       </list>
191 220
     </option>
192 221
   </component>
@@ -203,8 +232,8 @@
203 232
       </MavenImportingSettings>
204 233
     </option>
205 234
   </component>
206
-  <component name="ProjectFrameBounds" extendedState="6" fullScreen="true">
207
-    <option name="width" value="718" />
235
+  <component name="ProjectFrameBounds" fullScreen="true">
236
+    <option name="width" value="1440" />
208 237
     <option name="height" value="900" />
209 238
   </component>
210 239
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
@@ -213,6 +242,7 @@
213 242
       <foldersAlwaysOnTop value="true" />
214 243
     </navigator>
215 244
     <panes>
245
+      <pane id="PackagesPane" />
216 246
       <pane id="Scope" />
217 247
       <pane id="ProjectPane">
218 248
         <subPane>
@@ -272,13 +302,12 @@
272 302
           <select />
273 303
         </subPane>
274 304
       </pane>
275
-      <pane id="PackagesPane" />
276 305
     </panes>
277 306
   </component>
278 307
   <component name="PropertiesComponent">
279 308
     <property name="WebServerToolWindowFactoryState" value="false" />
280 309
     <property name="aspect.path.notification.shown" value="true" />
281
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541426832861" />
310
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541511561709" />
282 311
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
283 312
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
284 313
     <property name="project.structure.last.edited" value="Modules" />
@@ -303,8 +332,8 @@
303 332
       </list>
304 333
     </option>
305 334
   </component>
306
-  <component name="RunManager" selected="JUnit.ZipCodeWilmingtonTest.testHostLecture">
307
-    <configuration name="InstructorsTest.testInitializationSetupInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
335
+  <component name="RunManager" selected="JUnit.EducatorTest.testTeach">
336
+    <configuration name="EducatorTest.testImplementation" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
308 337
       <module name="interfaces-1" />
309 338
       <extension name="coverage">
310 339
         <pattern>
@@ -313,14 +342,14 @@
313 342
         </pattern>
314 343
       </extension>
315 344
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
316
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
317
-      <option name="METHOD_NAME" value="testInitializationSetupInstructors" />
345
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.EducatorTest" />
346
+      <option name="METHOD_NAME" value="testImplementation" />
318 347
       <option name="TEST_OBJECT" value="method" />
319 348
       <method v="2">
320 349
         <option name="Make" enabled="true" />
321 350
       </method>
322 351
     </configuration>
323
-    <configuration name="InstructorsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
352
+    <configuration name="EducatorTest.testInheritance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
324 353
       <module name="interfaces-1" />
325 354
       <extension name="coverage">
326 355
         <pattern>
@@ -329,14 +358,14 @@
329 358
         </pattern>
330 359
       </extension>
331 360
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
332
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
333
-      <option name="METHOD_NAME" value="testSingletonInstance" />
361
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.EducatorTest" />
362
+      <option name="METHOD_NAME" value="testInheritance" />
334 363
       <option name="TEST_OBJECT" value="method" />
335 364
       <method v="2">
336 365
         <option name="Make" enabled="true" />
337 366
       </method>
338 367
     </configuration>
339
-    <configuration name="StudentsTest.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
368
+    <configuration name="EducatorTest.testTeach" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
340 369
       <module name="interfaces-1" />
341 370
       <extension name="coverage">
342 371
         <pattern>
@@ -345,14 +374,14 @@
345 374
         </pattern>
346 375
       </extension>
347 376
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
348
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
349
-      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
377
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.EducatorTest" />
378
+      <option name="METHOD_NAME" value="testTeach" />
350 379
       <option name="TEST_OBJECT" value="method" />
351 380
       <method v="2">
352 381
         <option name="Make" enabled="true" />
353 382
       </method>
354 383
     </configuration>
355
-    <configuration name="StudentsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
384
+    <configuration name="InstructorsTest.testInitializationSetupInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
356 385
       <module name="interfaces-1" />
357 386
       <extension name="coverage">
358 387
         <pattern>
@@ -361,14 +390,14 @@
361 390
         </pattern>
362 391
       </extension>
363 392
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
364
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
365
-      <option name="METHOD_NAME" value="testSingletonInstance" />
393
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
394
+      <option name="METHOD_NAME" value="testInitializationSetupInstructors" />
366 395
       <option name="TEST_OBJECT" value="method" />
367 396
       <method v="2">
368 397
         <option name="Make" enabled="true" />
369 398
       </method>
370 399
     </configuration>
371
-    <configuration name="ZipCodeWilmingtonTest.testHostLecture" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
400
+    <configuration name="InstructorsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
372 401
       <module name="interfaces-1" />
373 402
       <extension name="coverage">
374 403
         <pattern>
@@ -377,27 +406,27 @@
377 406
         </pattern>
378 407
       </extension>
379 408
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
380
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.ZipCodeWilmingtonTest" />
381
-      <option name="METHOD_NAME" value="testHostLecture" />
409
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
410
+      <option name="METHOD_NAME" value="testSingletonInstance" />
382 411
       <option name="TEST_OBJECT" value="method" />
383 412
       <method v="2">
384 413
         <option name="Make" enabled="true" />
385 414
       </method>
386 415
     </configuration>
387 416
     <list>
388
-      <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
389
-      <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
390
-      <item itemvalue="JUnit.InstructorsTest.testSingletonInstance" />
391 417
       <item itemvalue="JUnit.InstructorsTest.testInitializationSetupInstructors" />
392
-      <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture" />
418
+      <item itemvalue="JUnit.InstructorsTest.testSingletonInstance" />
419
+      <item itemvalue="JUnit.EducatorTest.testImplementation" />
420
+      <item itemvalue="JUnit.EducatorTest.testInheritance" />
421
+      <item itemvalue="JUnit.EducatorTest.testTeach" />
393 422
     </list>
394 423
     <recent_temporary>
395 424
       <list>
396
-        <item itemvalue="JUnit.ZipCodeWilmingtonTest.testHostLecture" />
425
+        <item itemvalue="JUnit.EducatorTest.testTeach" />
426
+        <item itemvalue="JUnit.EducatorTest.testImplementation" />
427
+        <item itemvalue="JUnit.EducatorTest.testInheritance" />
397 428
         <item itemvalue="JUnit.InstructorsTest.testSingletonInstance" />
398 429
         <item itemvalue="JUnit.InstructorsTest.testInitializationSetupInstructors" />
399
-        <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
400
-        <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
401 430
       </list>
402 431
     </recent_temporary>
403 432
   </component>
@@ -412,43 +441,47 @@
412 441
       <option name="presentableId" value="Default" />
413 442
       <updated>1541259749319</updated>
414 443
       <workItem from="1541259750795" duration="14351000" />
444
+      <workItem from="1541442092999" duration="2188000" />
445
+      <workItem from="1541455763169" duration="27000" />
446
+      <workItem from="1541461102095" duration="4756000" />
447
+      <workItem from="1541508845728" duration="2139000" />
415 448
     </task>
416 449
     <servers />
417 450
   </component>
418 451
   <component name="TestHistory">
419
-    <history-entry file="PeopleTest_testGetArray - 2018.11.03 at 14h 53m 54s.xml">
420
-      <configuration name="PeopleTest.testGetArray" configurationId="JUnit" />
452
+    <history-entry file="StudentsTest - 2018.11.05 at 19h 41m 28s.xml">
453
+      <configuration name="StudentsTest" configurationId="JUnit" />
421 454
     </history-entry>
422
-    <history-entry file="PeopleTest_testGetArray - 2018.11.03 at 14h 54m 35s.xml">
423
-      <configuration name="PeopleTest.testGetArray" configurationId="JUnit" />
455
+    <history-entry file="ZipCodeWilmingtonTest - 2018.11.05 at 19h 41m 37s.xml">
456
+      <configuration name="ZipCodeWilmingtonTest" configurationId="JUnit" />
424 457
     </history-entry>
425
-    <history-entry file="PeopleTest_testGetArray - 2018.11.03 at 14h 55m 53s.xml">
426
-      <configuration name="PeopleTest.testGetArray" configurationId="JUnit" />
458
+    <history-entry file="PeopleTest - 2018.11.05 at 19h 54m 16s.xml">
459
+      <configuration name="PeopleTest" configurationId="JUnit" />
427 460
     </history-entry>
428
-    <history-entry file="PeopleTest_testRemoveAll - 2018.11.03 at 14h 59m 43s.xml">
429
-      <configuration name="PeopleTest.testRemoveAll" configurationId="JUnit" />
461
+    <history-entry file="educatorTest_educatorTest - 2018.11.06 at 08h 17m 14s.xml">
462
+      <configuration name="educatorTest.educatorTest" configurationId="JUnit" />
430 463
     </history-entry>
431
-    <history-entry file="PeopleTest_testRemoveAll - 2018.11.03 at 15h 01m 01s.xml">
432
-      <configuration name="PeopleTest.testRemoveAll" configurationId="JUnit" />
464
+    <history-entry file="educatorTest_educatorTest - 2018.11.06 at 08h 17m 25s.xml">
465
+      <configuration name="educatorTest.educatorTest" configurationId="JUnit" />
433 466
     </history-entry>
434
-    <history-entry file="StudentsTest_testSingletonInstance - 2018.11.03 at 15h 27m 27s.xml">
435
-      <configuration name="StudentsTest.testSingletonInstance" configurationId="JUnit" />
467
+    <history-entry file="InstructorsTest_testInitializationSetupInstructors - 2018.11.06 at 08h 28m 32s.xml">
468
+      <configuration name="InstructorsTest.testInitializationSetupInstructors" configurationId="JUnit" />
436 469
     </history-entry>
437
-    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.03 at 16h 19m 21s.xml">
438
-      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
470
+    <history-entry file="InstructorsTest_testSingletonInstance - 2018.11.06 at 08h 28m 35s.xml">
471
+      <configuration name="InstructorsTest.testSingletonInstance" configurationId="JUnit" />
439 472
     </history-entry>
440
-    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.03 at 16h 20m 23s.xml">
441
-      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
473
+    <history-entry file="EducatorTest_testImplementation - 2018.11.06 at 08h 34m 42s.xml">
474
+      <configuration name="EducatorTest.testImplementation" configurationId="JUnit" />
442 475
     </history-entry>
443
-    <history-entry file="InstructorsTest_testInitializationSetupInstructors - 2018.11.03 at 16h 30m 42s.xml">
444
-      <configuration name="InstructorsTest.testInitializationSetupInstructors" configurationId="JUnit" />
476
+    <history-entry file="EducatorTest_testInheritance - 2018.11.06 at 08h 35m 30s.xml">
477
+      <configuration name="EducatorTest.testInheritance" configurationId="JUnit" />
445 478
     </history-entry>
446
-    <history-entry file="InstructorsTest_testSingletonInstance - 2018.11.03 at 16h 30m 44s.xml">
447
-      <configuration name="InstructorsTest.testSingletonInstance" configurationId="JUnit" />
479
+    <history-entry file="EducatorTest_testTeach - 2018.11.06 at 08h 35m 49s.xml">
480
+      <configuration name="EducatorTest.testTeach" configurationId="JUnit" />
448 481
     </history-entry>
449 482
   </component>
450 483
   <component name="TimeTrackingManager">
451
-    <option name="totallyTimeSpent" value="15183000" />
484
+    <option name="totallyTimeSpent" value="25286000" />
452 485
   </component>
453 486
   <component name="ToolWindowManager">
454 487
     <frame x="0" y="0" width="1440" height="900" extended-state="0" />
@@ -459,7 +492,7 @@
459 492
       <window_info id="UI Designer" order="2" />
460 493
       <window_info id="Learn" order="3" />
461 494
       <window_info id="Capture Tool" order="4" />
462
-      <window_info active="true" content_ui="combo" id="Project" order="5" visible="true" weight="0.2532189" />
495
+      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.1988555" />
463 496
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
464 497
       <window_info id="Favorites" order="7" side_tool="true" />
465 498
       <window_info anchor="bottom" id="Terminal" order="0" />
@@ -468,9 +501,9 @@
468 501
       <window_info anchor="bottom" id="Version Control" order="3" show_stripe_button="false" />
469 502
       <window_info anchor="bottom" id="Message" order="4" />
470 503
       <window_info anchor="bottom" id="Find" order="5" />
471
-      <window_info anchor="bottom" id="Run" order="6" visible="true" weight="0.32891566" />
504
+      <window_info anchor="bottom" id="Run" order="6" weight="0.32891566" />
472 505
       <window_info anchor="bottom" id="Debug" order="7" weight="0.4" />
473
-      <window_info anchor="bottom" id="Messages" order="8" weight="0.32891566" />
506
+      <window_info active="true" anchor="bottom" id="Messages" order="8" visible="true" weight="0.32891566" />
474 507
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
475 508
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
476 509
       <window_info anchor="bottom" id="TODO" order="11" />
@@ -490,7 +523,7 @@
490 523
       <window_info id="UI Designer" order="2" />
491 524
       <window_info id="Learn" order="3" />
492 525
       <window_info id="Capture Tool" order="4" />
493
-      <window_info content_ui="combo" id="Project" order="5" visible="true" weight="0.24964234" />
526
+      <window_info content_ui="combo" id="Project" order="5" weight="0.19599427" />
494 527
       <window_info id="Structure" order="6" side_tool="true" weight="0.25" />
495 528
       <window_info id="Favorites" order="7" side_tool="true" />
496 529
       <window_info anchor="bottom" id="Terminal" order="0" />
@@ -499,9 +532,9 @@
499 532
       <window_info anchor="bottom" id="Version Control" order="3" show_stripe_button="false" />
500 533
       <window_info anchor="bottom" id="Message" order="4" />
501 534
       <window_info anchor="bottom" id="Find" order="5" />
502
-      <window_info anchor="bottom" id="Run" order="6" weight="0.32891566" />
535
+      <window_info active="true" anchor="bottom" id="Run" order="6" visible="true" weight="0.32891566" />
503 536
       <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.32891566" />
537
+      <window_info anchor="bottom" id="Messages" order="8" weight="0.32891566" />
505 538
       <window_info anchor="bottom" id="Cvs" order="9" weight="0.25" />
506 539
       <window_info anchor="bottom" id="Inspection" order="10" weight="0.4" />
507 540
       <window_info anchor="bottom" id="TODO" order="11" />
@@ -541,136 +574,159 @@
541 574
       </provider>
542 575
     </entry>
543 576
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/Teacher.java" />
544
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
577
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
545 578
       <provider selected="true" editor-type-id="text-editor">
546
-        <state relative-caret-position="255">
547
-          <caret line="27" column="39" selection-start-line="27" selection-start-column="39" selection-end-line="27" selection-end-column="39" />
548
-          <folding>
549
-            <element signature="imports" expanded="true" />
550
-            <element signature="e#201#202#0" expanded="true" />
551
-            <element signature="e#246#247#0" expanded="true" />
552
-            <element signature="e#273#274#0" expanded="true" />
553
-            <element signature="e#308#309#0" expanded="true" />
554
-            <element signature="e#386#387#0" expanded="true" />
555
-            <element signature="e#450#451#0" expanded="true" />
556
-          </folding>
579
+        <state relative-caret-position="315">
580
+          <caret line="25" column="15" selection-start-line="25" selection-end-line="26" />
557 581
         </state>
558 582
       </provider>
559 583
     </entry>
560
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
584
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
561 585
       <provider selected="true" editor-type-id="text-editor">
562
-        <state relative-caret-position="195">
563
-          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
586
+        <state relative-caret-position="180">
587
+          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
564 588
           <folding>
565
-            <element signature="imports" expanded="true" />
566
-            <element signature="e#190#191#0" expanded="true" />
567 589
             <element signature="e#225#226#0" expanded="true" />
568
-            <element signature="e#249#250#0" expanded="true" />
569
-            <element signature="e#301#302#0" expanded="true" />
590
+            <element signature="e#253#254#0" expanded="true" />
570 591
           </folding>
571 592
         </state>
572 593
       </provider>
573 594
     </entry>
574
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
595
+    <entry file="file://$PROJECT_DIR$/README.md">
596
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
597
+        <state split_layout="SPLIT">
598
+          <first_editor relative-caret-position="-131" />
599
+          <second_editor />
600
+        </state>
601
+      </provider>
602
+    </entry>
603
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
575 604
       <provider selected="true" editor-type-id="text-editor">
576
-        <state relative-caret-position="165">
577
-          <caret line="13" selection-start-line="13" selection-end-line="13" />
578
-          <folding>
579
-            <element signature="imports" expanded="true" />
580
-          </folding>
605
+        <state relative-caret-position="30">
606
+          <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
581 607
         </state>
582 608
       </provider>
583 609
     </entry>
584
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
610
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
585 611
       <provider selected="true" editor-type-id="text-editor">
586
-        <state relative-caret-position="90">
587
-          <caret line="7" column="57" selection-start-line="7" selection-start-column="57" selection-end-line="7" selection-end-column="57" />
588
-          <folding>
589
-            <element signature="imports" expanded="true" />
590
-          </folding>
612
+        <state relative-caret-position="780">
613
+          <caret line="54" column="4" lean-forward="true" selection-start-line="54" selection-start-column="4" selection-end-line="63" selection-end-column="5" />
591 614
         </state>
592 615
       </provider>
593 616
     </entry>
594
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
617
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
595 618
       <provider selected="true" editor-type-id="text-editor">
596
-        <state relative-caret-position="240">
597
-          <caret line="17" column="11" selection-start-line="17" selection-start-column="11" selection-end-line="17" selection-end-column="11" />
619
+        <state relative-caret-position="255">
620
+          <caret line="17" column="5" lean-forward="true" selection-start-line="17" selection-start-column="5" selection-end-line="17" selection-end-column="5" />
598 621
         </state>
599 622
       </provider>
600 623
     </entry>
601
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
624
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
602 625
       <provider selected="true" editor-type-id="text-editor">
603 626
         <state relative-caret-position="165">
604
-          <caret line="12" column="24" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" />
627
+          <caret line="15" column="9" selection-start-line="13" selection-start-column="8" selection-end-line="15" selection-end-column="9" />
605 628
         </state>
606 629
       </provider>
607 630
     </entry>
608
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
631
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
609 632
       <provider selected="true" editor-type-id="text-editor">
610
-        <state relative-caret-position="135">
611
-          <caret line="9" column="9" selection-start-line="9" selection-start-column="9" selection-end-line="9" selection-end-column="9" />
633
+        <state relative-caret-position="30">
634
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
612 635
         </state>
613 636
       </provider>
614 637
     </entry>
615
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
638
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
616 639
       <provider selected="true" editor-type-id="text-editor">
617
-        <state relative-caret-position="420">
618
-          <caret line="35" column="5" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
640
+        <state relative-caret-position="150">
641
+          <caret line="13" column="29" selection-start-line="13" selection-start-column="29" selection-end-line="13" selection-end-column="29" />
619 642
         </state>
620 643
       </provider>
621 644
     </entry>
622
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestStudent.java">
645
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
623 646
       <provider selected="true" editor-type-id="text-editor">
624
-        <state relative-caret-position="315">
625
-          <caret line="25" column="15" selection-start-line="25" selection-end-line="26" />
647
+        <state relative-caret-position="210">
648
+          <caret line="18" column="29" selection-start-line="18" selection-start-column="29" selection-end-line="18" selection-end-column="29" />
649
+          <folding>
650
+            <element signature="imports" expanded="true" />
651
+          </folding>
626 652
         </state>
627 653
       </provider>
628 654
     </entry>
629
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
655
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
630 656
       <provider selected="true" editor-type-id="text-editor">
631
-        <state relative-caret-position="30">
632
-          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
657
+        <state relative-caret-position="465">
658
+          <caret line="42" selection-start-line="42" selection-end-line="42" />
659
+          <folding>
660
+            <element signature="imports" expanded="true" />
661
+          </folding>
633 662
         </state>
634 663
       </provider>
635 664
     </entry>
636
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
665
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
637 666
       <provider selected="true" editor-type-id="text-editor">
638
-        <state relative-caret-position="30">
639
-          <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" />
667
+        <state relative-caret-position="135">
668
+          <caret line="9" column="41" selection-start-line="9" selection-start-column="41" selection-end-line="9" selection-end-column="41" />
669
+          <folding>
670
+            <element signature="imports" expanded="true" />
671
+          </folding>
640 672
         </state>
641 673
       </provider>
642 674
     </entry>
643
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
675
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
644 676
       <provider selected="true" editor-type-id="text-editor">
645
-        <state relative-caret-position="90">
646
-          <caret line="9" column="8" selection-start-line="9" selection-start-column="8" selection-end-line="9" selection-end-column="8" />
677
+        <state relative-caret-position="367">
678
+          <caret line="33" column="5" lean-forward="true" selection-start-line="15" selection-start-column="4" selection-end-line="33" selection-end-column="5" />
647 679
         </state>
648 680
       </provider>
649 681
     </entry>
650
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/ZipCodeWilmington.java">
682
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
683
+      <provider selected="true" editor-type-id="text-editor">
684
+        <state relative-caret-position="240">
685
+          <caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
686
+          <folding>
687
+            <element signature="e#725#726#0" expanded="true" />
688
+            <element signature="e#756#757#0" expanded="true" />
689
+          </folding>
690
+        </state>
691
+      </provider>
692
+    </entry>
693
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
651 694
       <provider selected="true" editor-type-id="text-editor">
652
-        <state relative-caret-position="45">
653
-          <caret line="3" column="13" selection-start-line="3" selection-start-column="13" selection-end-line="3" selection-end-column="13" />
695
+        <state relative-caret-position="105">
696
+          <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="9" selection-end-column="59" />
654 697
         </state>
655 698
       </provider>
656 699
     </entry>
657 700
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java">
658 701
       <provider selected="true" editor-type-id="text-editor">
659
-        <state relative-caret-position="150">
660
-          <caret line="10" selection-start-line="10" selection-end-line="10" />
702
+        <state relative-caret-position="300">
703
+          <caret line="20" column="5" selection-start-line="20" selection-start-column="5" selection-end-line="20" selection-end-column="5" />
661 704
           <folding>
662 705
             <element signature="imports" expanded="true" />
663 706
           </folding>
664 707
         </state>
665 708
       </provider>
666 709
     </entry>
667
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
710
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Educator.java">
668 711
       <provider selected="true" editor-type-id="text-editor">
669
-        <state relative-caret-position="195">
670
-          <caret line="13" column="20" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
712
+        <state relative-caret-position="270">
713
+          <caret line="18" column="35" selection-start-line="18" selection-start-column="35" selection-end-line="18" selection-end-column="35" />
671 714
           <folding>
672
-            <element signature="e#225#226#0" expanded="true" />
673
-            <element signature="e#253#254#0" expanded="true" />
715
+            <element signature="e#483#484#0" expanded="true" />
716
+            <element signature="e#510#511#0" expanded="true" />
717
+            <element signature="e#535#536#0" expanded="true" />
718
+            <element signature="e#566#567#0" expanded="true" />
719
+            <element signature="e#593#594#0" expanded="true" />
720
+          </folding>
721
+        </state>
722
+      </provider>
723
+    </entry>
724
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/EducatorTest.java">
725
+      <provider selected="true" editor-type-id="text-editor">
726
+        <state relative-caret-position="315">
727
+          <caret line="21" column="16" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
728
+          <folding>
729
+            <element signature="imports" expanded="true" />
674 730
           </folding>
675 731
         </state>
676 732
       </provider>

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

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

+ 20
- 8
src/main/java/io/zipcoder/interfaces/Instructors.java 查看文件

@@ -1,21 +1,33 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
-public final class Instructors {
3
+public final class Instructors extends People<Instructor> {
4 4
 
5 5
     private final static Instructors INSTANCE = new Instructors();
6
-    People instructorList;
6
+    Educator[] educatorValues = Educator.values();
7 7
 
8 8
     private Instructors() {
9
-        instructorList = new People();
10
-        instructorList.add(new Instructor(100, "Kris Younger"));
11
-        instructorList.add(new Instructor(101, "Nhu Nguyen"));
12
-        instructorList.add(new Instructor(102, "Froilan Miranda"));
13
-        instructorList.add(new Instructor(103, "L. Dolio Durant"));
14
-        instructorList.add(new Instructor(104, "Wilhem Alcivar"));
9
+        for (Educator e : educatorValues) {
10
+            personList.add(new Instructor(e.getId(), e.getName()));
11
+        }
12
+//        personList.add(new Instructor(100, "Kris Younger"));
13
+//        personList.add(new Instructor(101, "Nhu Nguyen"));
14
+//        personList.add(new Instructor(102, "Froilan Miranda"));
15
+//        personList.add(new Instructor(103, "L. Dolio Durant"));
16
+//        personList.add(new Instructor(104, "Wilhem Alcivar"));
15 17
     }
16 18
 
17 19
     public static Instructors getInstance() {
18 20
         return INSTANCE;
19 21
     }
20 22
 
23
+    @Override
24
+    public Instructor[] getArray() {
25
+        Instructor[] instructors = new Instructor[personList.size()];
26
+        int count = 0;
27
+        for (Instructor instructor : personList) {
28
+            instructors[count] = instructor;
29
+            count++;
30
+        }
31
+        return instructors;
32
+    }
21 33
 }

+ 15
- 13
src/main/java/io/zipcoder/interfaces/People.java 查看文件

@@ -1,11 +1,12 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
+import java.lang.reflect.Array;
3 4
 import java.util.ArrayList;
4 5
 
5
-public class People {
6
-    ArrayList<Person> personList = new ArrayList<Person>();
6
+public abstract class People<E extends Person> {
7
+    ArrayList<E> personList = new ArrayList<E>();
7 8
 
8
-    public void add(Person person) {
9
+    public void add(E person) {
9 10
         personList.add(person);
10 11
     }
11 12
 
@@ -13,17 +14,17 @@ public class People {
13 14
         return personList.size();
14 15
     }
15 16
 
16
-    public void remove(Person person) {
17
-        personList.removeIf(Person -> Person.equals(person));
17
+    public void remove(E person) {
18
+        personList.removeIf(E -> E.equals(person));
18 19
     }
19 20
 
20 21
     public void remove(long i) {
21
-        personList.removeIf(Person -> Person.getID() == i);
22
+        personList.removeIf(E -> E.getID() == i);
22 23
     }
23 24
 
24
-    public Person findByID(long id) {
25
-        Person personToFind = null;
26
-        for (Person person : personList) {
25
+    public E findByID(long id) {
26
+        E personToFind = null;
27
+        for (E person : personList) {
27 28
             if (person.getID() == id) {
28 29
                 personToFind = person;
29 30
             }
@@ -31,11 +32,12 @@ public class People {
31 32
         return personToFind;
32 33
     }
33 34
 
34
-    public Person[] getArray() {
35
-        return personList.toArray(new Person[getCount()]);
36
-    }
35
+
36
+    public abstract E[] getArray();
37
+//        return personList.toArray(new Person[getCount()]);
38
+
37 39
 
38 40
     public void removeAll() {
39 41
         personList.removeAll(personList);
40 42
     }
41
-}
43
+}

+ 56
- 42
src/main/java/io/zipcoder/interfaces/Students.java 查看文件

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

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

@@ -7,13 +7,13 @@ public enum ZipCodeWilmington {
7 7
     Instructors instructors = Instructors.getInstance();
8 8
 
9 9
     public void hostLecture(Teacher teacher, double numberOfHours) {
10
-        Student[] studentsArray = (Student[]) students.studentList.getArray();
10
+        Student[] studentsArray = students.getArray();
11 11
         teacher.lecture(studentsArray, numberOfHours);
12 12
     }
13 13
 
14 14
     public void hostLecture(long id, double numberOfHours) {
15
-        Student[] studentsArray = (Student[]) students.studentList.getArray();
16
-        Teacher teacher = (Teacher) instructors.instructorList.findByID(id);
15
+        Student[] studentsArray = students.getArray();
16
+        Teacher teacher = instructors.findByID(id);
17 17
         teacher.lecture(studentsArray, numberOfHours);
18 18
     }
19 19
 

+ 28
- 0
src/test/java/io/zipcoder/interfaces/EducatorTest.java 查看文件

@@ -0,0 +1,28 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Before;
5
+import org.junit.Test;
6
+
7
+public class EducatorTest {
8
+
9
+    @Test
10
+    public void testImplementation(){
11
+        Educator educator = Educator.DOLIO;
12
+
13
+        Assert.assertTrue(educator instanceof Teacher);
14
+    }
15
+
16
+    @Test
17
+    public void testTeach(){
18
+        Educator educator = Educator.NHU;
19
+
20
+        Student student = new Student(1);
21
+        double before = student.getTotalStudyTime();
22
+        educator.teach(student, 3);
23
+        double after = student.getTotalStudyTime();
24
+
25
+        Assert.assertTrue(after-before == 3);
26
+    }
27
+
28
+}

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

@@ -7,7 +7,7 @@ public class InstructorsTest {
7 7
 
8 8
     @Test public void testInitializationSetupInstructors() {
9 9
         Instructors instructors = Instructors.getInstance();
10
-        Person[] InstructorsArray = instructors.instructorList.getArray();
10
+        Person[] InstructorsArray = instructors.getArray();
11 11
 
12 12
         int actual = InstructorsArray.length;
13 13
         int expected = 5;

+ 24
- 24
src/test/java/io/zipcoder/interfaces/PeopleTest.java 查看文件

@@ -6,22 +6,22 @@ import org.junit.Test;
6 6
 
7 7
 public class PeopleTest {
8 8
 
9
-    People people;
9
+    Students people;
10 10
 
11 11
     @Before public void setup() {
12
-        people = new People();
12
+        people = Students.getInstance();
13 13
     }
14 14
 
15 15
     @Test public void testAdd() {
16
-        Person person = new Person(1);
16
+        Student person = new Student(1);
17 17
         people.personList.add(person);
18 18
 
19 19
         Assert.assertNotNull(people.personList.get(0));
20 20
     }
21 21
 
22 22
     @Test public void testAdd2() {
23
-        Person one = new Person(1);
24
-        Person two = new Person(2);
23
+        Student one = new Student(1);
24
+        Student two = new Student(2);
25 25
 
26 26
         people.personList.add(one);
27 27
         people.personList.add(two);
@@ -32,10 +32,10 @@ public class PeopleTest {
32 32
         Assert.assertEquals(expected,actual);
33 33
     }
34 34
 
35
-    @Test public void testRemoveByPerson() {
36
-        Person one = new Person(1);
37
-        Person two = new Person(2);
38
-        Person three = new Person(3);
35
+    @Test public void testRemoveByStudent() {
36
+        Student one = new Student(1);
37
+        Student two = new Student(2);
38
+        Student three = new Student(3);
39 39
 
40 40
         people.personList.add(one);
41 41
         people.personList.add(two);
@@ -49,9 +49,9 @@ public class PeopleTest {
49 49
     }
50 50
 
51 51
     @Test public void testRemoveByID() {
52
-        Person one = new Person(1);
53
-        Person two = new Person(2);
54
-        Person three = new Person(3);
52
+        Student one = new Student(1);
53
+        Student two = new Student(2);
54
+        Student three = new Student(3);
55 55
 
56 56
         people.personList.add(one);
57 57
         people.personList.add(two);
@@ -65,30 +65,30 @@ public class PeopleTest {
65 65
     }
66 66
 
67 67
     @Test public void testFindByID() {
68
-        Person one = new Person(1);
69
-        Person two = new Person(2);
70
-        Person three = new Person(3);
68
+        Student one = new Student(1);
69
+        Student two = new Student(2);
70
+        Student three = new Student(3);
71 71
 
72 72
         people.personList.add(one);
73 73
         people.personList.add(two);
74 74
         people.personList.add(three);
75 75
 
76
-        Person actual = people.findByID(2);
77
-        Person expected = two;
76
+        Student actual = people.findByID(2);
77
+        Student expected = two;
78 78
 
79 79
         Assert.assertEquals(expected, actual);
80 80
     }
81 81
 
82 82
     @Test public void testGetArray() {
83
-        Person one = new Person(1);
84
-        Person two = new Person(2);
85
-        Person three = new Person(3);
83
+        Student one = new Student(1);
84
+        Student two = new Student(2);
85
+        Student three = new Student(3);
86 86
 
87 87
         people.personList.add(one);
88 88
         people.personList.add(two);
89 89
         people.personList.add(three);
90 90
 
91
-        Person[] personArray = people.getArray();
91
+        Student[] personArray = people.getArray();
92 92
         boolean allAccountedFor = true;
93 93
 
94 94
         for (int i = 0; i < personArray.length; i++) {
@@ -101,9 +101,9 @@ public class PeopleTest {
101 101
     }
102 102
 
103 103
     @Test public void testRemoveAll() {
104
-        Person one = new Person(1);
105
-        Person two = new Person(2);
106
-        Person three = new Person(3);
104
+        Student one = new Student(1);
105
+        Student two = new Student(2);
106
+        Student three = new Student(3);
107 107
 
108 108
         people.personList.add(one);
109 109
         people.personList.add(two);

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

@@ -7,7 +7,7 @@ public class StudentsTest {
7 7
 
8 8
     @Test public void testInitializationSetupStudents() {
9 9
         Students students = Students.getInstance();
10
-        Person[] studentArray = students.studentList.getArray();
10
+        Person[] studentArray = students.getArray();
11 11
 
12 12
         int actual = studentArray.length;
13 13
         int expected = 39;

+ 6
- 4
src/test/java/io/zipcoder/interfaces/ZipCodeWilmingtonTest.java 查看文件

@@ -8,14 +8,16 @@ public class ZipCodeWilmingtonTest {
8 8
     @Test
9 9
     public void testHostLecture() {
10 10
         ZipCodeWilmington zcw = ZipCodeWilmington.INSTANCE;
11
-        Student[] studentsArray = (Student[]) zcw.students.studentList.getArray();
12
-        Instructor[] instructorsArray = (Instructor[]) zcw.instructors.instructorList.getArray();
11
+        Student[] studentsArray = zcw.students.getArray();
12
+        Instructor[] instructorsArray = zcw.instructors.getArray();
13 13
 
14 14
         double before = studentsArray[0].getTotalStudyTime();
15
-        zcw.hostLecture(instructorsArray[0], 1);
15
+        System.out.println(before);
16
+        zcw.hostLecture(instructorsArray[0], 390);
16 17
         double after = studentsArray[0].getTotalStudyTime();
18
+        System.out.println(after);
17 19
 
18
-        Assert.assertTrue(after-before == 1/39);
20
+        Assert.assertTrue(after-before == 10);
19 21
     }
20 22
 
21 23
 }