Soujanya Buragapu 6 vuotta sitten
vanhempi
commit
9d504fcbd8

+ 159
- 179
.idea/workspace.xml Näytä tiedosto

@@ -2,13 +2,15 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="2e21c53f-9cee-4913-b823-001f5b142f43" name="Default Changelist" comment="">
5
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" afterDir="false" />
6
-      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" afterDir="false" />
7
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" afterDir="false" />
8
-      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" afterDir="false" />
5
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" afterDir="false" />
6
+      <change afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" afterDir="false" />
7
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" afterDir="false" />
8
+      <change afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" afterDir="false" />
9 9
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" afterDir="false" />
10
+      <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" />
11
+      <change beforePath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" afterDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" afterDir="false" />
13
+      <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" />
12 14
     </list>
13 15
     <ignored path="$PROJECT_DIR$/target/" />
14 16
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -21,31 +23,31 @@
21 23
     <session id="1054639744">
22 24
       <usages-collector id="statistics.lifecycle.project">
23 25
         <counts>
24
-          <entry key="project.closed" value="3" />
26
+          <entry key="project.closed" value="4" />
25 27
           <entry key="project.open.time.0" value="1" />
26
-          <entry key="project.open.time.1" value="2" />
28
+          <entry key="project.open.time.1" value="3" />
27 29
           <entry key="project.open.time.3" value="1" />
28
-          <entry key="project.opened" value="4" />
30
+          <entry key="project.opened" value="5" />
29 31
         </counts>
30 32
       </usages-collector>
31 33
       <usages-collector id="statistics.file.extensions.open">
32 34
         <counts>
33
-          <entry key="java" value="10" />
35
+          <entry key="java" value="35" />
34 36
         </counts>
35 37
       </usages-collector>
36 38
       <usages-collector id="statistics.file.types.open">
37 39
         <counts>
38
-          <entry key="JAVA" value="10" />
40
+          <entry key="JAVA" value="35" />
39 41
         </counts>
40 42
       </usages-collector>
41 43
       <usages-collector id="statistics.file.extensions.edit">
42 44
         <counts>
43
-          <entry key="java" value="305" />
45
+          <entry key="java" value="702" />
44 46
         </counts>
45 47
       </usages-collector>
46 48
       <usages-collector id="statistics.file.types.edit">
47 49
         <counts>
48
-          <entry key="JAVA" value="305" />
50
+          <entry key="JAVA" value="702" />
49 51
         </counts>
50 52
       </usages-collector>
51 53
       <usages-collector id="statistics.spring.boot.run.usages" />
@@ -59,106 +61,30 @@
59 61
       <file pinned="false" current-in-tab="false">
60 62
         <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
61 63
           <provider selected="true" editor-type-id="text-editor">
62
-            <state relative-caret-position="120">
63
-              <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
64
-            </state>
65
-          </provider>
66
-        </entry>
67
-      </file>
68
-      <file pinned="false" current-in-tab="false">
69
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
70
-          <provider selected="true" editor-type-id="text-editor">
71
-            <state relative-caret-position="105">
72
-              <caret line="7" selection-start-line="7" selection-end-line="7" />
73
-            </state>
74
-          </provider>
75
-        </entry>
76
-      </file>
77
-      <file pinned="false" current-in-tab="false">
78
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
79
-          <provider selected="true" editor-type-id="text-editor">
80
-            <state relative-caret-position="315">
81
-              <caret line="21" selection-start-line="21" selection-end-line="21" />
82
-            </state>
83
-          </provider>
84
-        </entry>
85
-      </file>
86
-      <file pinned="false" current-in-tab="false">
87
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
88
-          <provider selected="true" editor-type-id="text-editor">
89
-            <state relative-caret-position="105">
90
-              <caret line="7" column="41" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="41" />
91
-              <folding>
92
-                <element signature="imports" expanded="true" />
93
-              </folding>
94
-            </state>
95
-          </provider>
96
-        </entry>
97
-      </file>
98
-      <file pinned="false" current-in-tab="false">
99
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
100
-          <provider selected="true" editor-type-id="text-editor">
101
-            <state>
102
-              <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
103
-            </state>
104
-          </provider>
105
-        </entry>
106
-      </file>
107
-      <file pinned="false" current-in-tab="true">
108
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
109
-          <provider selected="true" editor-type-id="text-editor">
110 64
             <state relative-caret-position="270">
111
-              <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
112
-              <folding>
113
-                <element signature="e#191#192#0" expanded="true" />
114
-                <element signature="e#235#236#0" expanded="true" />
115
-              </folding>
65
+              <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
116 66
             </state>
117 67
           </provider>
118 68
         </entry>
119 69
       </file>
120 70
       <file pinned="false" current-in-tab="false">
121
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
71
+        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
122 72
           <provider selected="true" editor-type-id="text-editor">
123
-            <state relative-caret-position="60">
124
-              <caret line="4" column="43" lean-forward="true" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
125
-            </state>
126
-          </provider>
127
-        </entry>
128
-      </file>
129
-      <file pinned="false" current-in-tab="false">
130
-        <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
131
-          <provider selected="true" editor-type-id="text-editor">
132
-            <state relative-caret-position="442">
133
-              <caret line="60" selection-start-line="60" selection-end-line="60" />
73
+            <state relative-caret-position="195">
74
+              <caret line="13" column="45" selection-start-line="13" selection-start-column="45" selection-end-line="13" selection-end-column="45" />
134 75
               <folding>
135
-                <element signature="e#110#111#0" expanded="true" />
136
-                <element signature="e#162#163#0" expanded="true" />
137
-                <element signature="e#232#233#0" expanded="true" />
138
-                <element signature="e#257#258#0" expanded="true" />
139
-                <element signature="e#308#309#0" expanded="true" />
140
-                <element signature="e#334#335#0" expanded="true" />
141
-                <element signature="e#1206#1207#0" expanded="true" />
142
-                <element signature="e#1263#1264#0" expanded="true" />
76
+                <element signature="e#610#611#0" expanded="true" />
77
+                <element signature="e#641#642#0" expanded="true" />
143 78
               </folding>
144 79
             </state>
145 80
           </provider>
146 81
         </entry>
147 82
       </file>
148
-      <file pinned="false" current-in-tab="false">
149
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
150
-          <provider selected="true" editor-type-id="text-editor">
151
-            <state relative-caret-position="45">
152
-              <caret line="3" selection-start-line="3" selection-end-line="3" />
153
-            </state>
154
-          </provider>
155
-        </entry>
156
-      </file>
157
-      <file pinned="false" current-in-tab="false">
158
-        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
83
+      <file pinned="false" current-in-tab="true">
84
+        <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
159 85
           <provider selected="true" editor-type-id="text-editor">
160
-            <state relative-caret-position="300">
161
-              <caret line="21" column="37" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
86
+            <state relative-caret-position="180">
87
+              <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
162 88
               <folding>
163 89
                 <element signature="imports" expanded="true" />
164 90
               </folding>
@@ -184,14 +110,18 @@
184 110
       <list>
185 111
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java" />
186 112
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java" />
187
-        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
188 113
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java" />
189 114
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java" />
190 115
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java" />
191 116
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java" />
192 117
         <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java" />
193
-        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
194 118
         <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java" />
119
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java" />
120
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java" />
121
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java" />
122
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java" />
123
+        <option value="$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java" />
124
+        <option value="$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java" />
195 125
       </list>
196 126
     </option>
197 127
   </component>
@@ -212,6 +142,7 @@
212 142
       <foldersAlwaysOnTop value="true" />
213 143
     </navigator>
214 144
     <panes>
145
+      <pane id="Scope" />
215 146
       <pane id="ProjectPane">
216 147
         <subPane>
217 148
           <expand>
@@ -274,14 +205,13 @@
274 205
           <select />
275 206
         </subPane>
276 207
       </pane>
277
-      <pane id="Scope" />
278 208
       <pane id="PackagesPane" />
279 209
     </panes>
280 210
   </component>
281 211
   <component name="PropertiesComponent">
282 212
     <property name="WebServerToolWindowFactoryState" value="false" />
283 213
     <property name="aspect.path.notification.shown" value="true" />
284
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541295616656" />
214
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1541393577725" />
285 215
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
286 216
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
287 217
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
@@ -298,8 +228,8 @@
298 228
       </list>
299 229
     </option>
300 230
   </component>
301
-  <component name="RunManager" selected="JUnit.StudentTest.testLearn">
302
-    <configuration name="StudentTest.testImplementation" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
231
+  <component name="RunManager" selected="JUnit.InstructorsTest.testInitializationSetupInstructors">
232
+    <configuration name="InstructorsTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
303 233
       <module name="interfaces-1" />
304 234
       <extension name="coverage">
305 235
         <pattern>
@@ -308,14 +238,12 @@
308 238
         </pattern>
309 239
       </extension>
310 240
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
311
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentTest" />
312
-      <option name="METHOD_NAME" value="testImplementation" />
313
-      <option name="TEST_OBJECT" value="method" />
241
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
314 242
       <method v="2">
315 243
         <option name="Make" enabled="true" />
316 244
       </method>
317 245
     </configuration>
318
-    <configuration name="StudentTest.testInheritance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
246
+    <configuration name="InstructorsTest.testInitializationSetupInstructors" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
319 247
       <module name="interfaces-1" />
320 248
       <extension name="coverage">
321 249
         <pattern>
@@ -324,14 +252,14 @@
324 252
         </pattern>
325 253
       </extension>
326 254
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
327
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentTest" />
328
-      <option name="METHOD_NAME" value="testInheritance" />
255
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.InstructorsTest" />
256
+      <option name="METHOD_NAME" value="testInitializationSetupInstructors" />
329 257
       <option name="TEST_OBJECT" value="method" />
330 258
       <method v="2">
331 259
         <option name="Make" enabled="true" />
332 260
       </method>
333 261
     </configuration>
334
-    <configuration name="StudentTest.testLearn" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
262
+    <configuration name="PeopleTest.testAdd" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
335 263
       <module name="interfaces-1" />
336 264
       <extension name="coverage">
337 265
         <pattern>
@@ -340,14 +268,14 @@
340 268
         </pattern>
341 269
       </extension>
342 270
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
343
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentTest" />
344
-      <option name="METHOD_NAME" value="testLearn" />
271
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.PeopleTest" />
272
+      <option name="METHOD_NAME" value="testAdd" />
345 273
       <option name="TEST_OBJECT" value="method" />
346 274
       <method v="2">
347 275
         <option name="Make" enabled="true" />
348 276
       </method>
349 277
     </configuration>
350
-    <configuration name="TestPerson.testConstructor" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
278
+    <configuration name="StudentsTest.testInitializationSetupStudents" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
351 279
       <module name="interfaces-1" />
352 280
       <extension name="coverage">
353 281
         <pattern>
@@ -356,14 +284,14 @@
356 284
         </pattern>
357 285
       </extension>
358 286
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
359
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPerson" />
360
-      <option name="METHOD_NAME" value="testConstructor" />
287
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
288
+      <option name="METHOD_NAME" value="testInitializationSetupStudents" />
361 289
       <option name="TEST_OBJECT" value="method" />
362 290
       <method v="2">
363 291
         <option name="Make" enabled="true" />
364 292
       </method>
365 293
     </configuration>
366
-    <configuration name="TestPerson.testSetAndGetName" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
294
+    <configuration name="StudentsTest.testSingletonInstance" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
367 295
       <module name="interfaces-1" />
368 296
       <extension name="coverage">
369 297
         <pattern>
@@ -372,27 +300,27 @@
372 300
         </pattern>
373 301
       </extension>
374 302
       <option name="PACKAGE_NAME" value="io.zipcoder.interfaces" />
375
-      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.TestPerson" />
376
-      <option name="METHOD_NAME" value="testSetAndGetName" />
303
+      <option name="MAIN_CLASS_NAME" value="io.zipcoder.interfaces.StudentsTest" />
304
+      <option name="METHOD_NAME" value="testSingletonInstance" />
377 305
       <option name="TEST_OBJECT" value="method" />
378 306
       <method v="2">
379 307
         <option name="Make" enabled="true" />
380 308
       </method>
381 309
     </configuration>
382 310
     <list>
383
-      <item itemvalue="JUnit.TestPerson.testConstructor" />
384
-      <item itemvalue="JUnit.TestPerson.testSetAndGetName" />
385
-      <item itemvalue="JUnit.StudentTest.testImplementation" />
386
-      <item itemvalue="JUnit.StudentTest.testInheritance" />
387
-      <item itemvalue="JUnit.StudentTest.testLearn" />
311
+      <item itemvalue="JUnit.PeopleTest.testAdd" />
312
+      <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
313
+      <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
314
+      <item itemvalue="JUnit.InstructorsTest" />
315
+      <item itemvalue="JUnit.InstructorsTest.testInitializationSetupInstructors" />
388 316
     </list>
389 317
     <recent_temporary>
390 318
       <list>
391
-        <item itemvalue="JUnit.StudentTest.testLearn" />
392
-        <item itemvalue="JUnit.StudentTest.testInheritance" />
393
-        <item itemvalue="JUnit.StudentTest.testImplementation" />
394
-        <item itemvalue="JUnit.TestPerson.testSetAndGetName" />
395
-        <item itemvalue="JUnit.TestPerson.testConstructor" />
319
+        <item itemvalue="JUnit.InstructorsTest.testInitializationSetupInstructors" />
320
+        <item itemvalue="JUnit.InstructorsTest" />
321
+        <item itemvalue="JUnit.StudentsTest.testInitializationSetupStudents" />
322
+        <item itemvalue="JUnit.StudentsTest.testSingletonInstance" />
323
+        <item itemvalue="JUnit.PeopleTest.testAdd" />
396 324
       </list>
397 325
     </recent_temporary>
398 326
   </component>
@@ -409,41 +337,51 @@
409 337
       <workItem from="1541193736960" duration="1165000" />
410 338
       <workItem from="1541196592239" duration="467000" />
411 339
       <workItem from="1541271635211" duration="2137000" />
412
-      <workItem from="1541292748624" duration="1815000" />
340
+      <workItem from="1541292748624" duration="2134000" />
341
+      <workItem from="1541344422166" duration="6586000" />
413 342
     </task>
414 343
     <servers />
415 344
   </component>
416 345
   <component name="TestHistory">
417
-    <history-entry file="TestPerson_testConstructor - 2018.11.03 at 18h 42m 41s.xml">
418
-      <configuration name="TestPerson.testConstructor" configurationId="JUnit" />
346
+    <history-entry file="StudentTest - 2018.11.04 at 22h 46m 38s.xml">
347
+      <configuration name="StudentTest" configurationId="JUnit" />
348
+    </history-entry>
349
+    <history-entry file="TestPerson - 2018.11.04 at 22h 46m 53s.xml">
350
+      <configuration name="TestPerson" configurationId="JUnit" />
351
+    </history-entry>
352
+    <history-entry file="PeopleTest_testAdd - 2018.11.04 at 22h 59m 25s.xml">
353
+      <configuration name="PeopleTest.testAdd" configurationId="JUnit" />
354
+    </history-entry>
355
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.04 at 23h 45m 34s.xml">
356
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
419 357
     </history-entry>
420
-    <history-entry file="TestPerson_testConstructor - 2018.11.03 at 18h 43m 12s.xml">
421
-      <configuration name="TestPerson.testConstructor" configurationId="JUnit" />
358
+    <history-entry file="StudentsTest_testSingletonInstance - 2018.11.04 at 23h 45m 59s.xml">
359
+      <configuration name="StudentsTest.testSingletonInstance" configurationId="JUnit" />
422 360
     </history-entry>
423
-    <history-entry file="TestPerson_testConstructor - 2018.11.03 at 18h 43m 51s.xml">
424
-      <configuration name="TestPerson.testConstructor" configurationId="JUnit" />
361
+    <history-entry file="StudentsTest_testInitializationSetupStudents - 2018.11.04 at 23h 46m 15s.xml">
362
+      <configuration name="StudentsTest.testInitializationSetupStudents" configurationId="JUnit" />
425 363
     </history-entry>
426
-    <history-entry file="TestPerson_testSetAndGetName - 2018.11.03 at 18h 43m 58s.xml">
427
-      <configuration name="TestPerson.testSetAndGetName" configurationId="JUnit" />
364
+    <history-entry file="InstructorsTest - 2018.11.04 at 23h 49m 44s.xml">
365
+      <configuration name="InstructorsTest" configurationId="JUnit" />
428 366
     </history-entry>
429
-    <history-entry file="StudentTest_testImplementation - 2018.11.03 at 18h 45m 38s.xml">
430
-      <configuration name="StudentTest.testImplementation" configurationId="JUnit" />
367
+    <history-entry file="InstructorsTest_testInitializationSetupInstructors - 2018.11.04 at 23h 50m 33s.xml">
368
+      <configuration name="InstructorsTest.testInitializationSetupInstructors" configurationId="JUnit" />
431 369
     </history-entry>
432
-    <history-entry file="StudentTest_testInheritance - 2018.11.03 at 18h 45m 44s.xml">
433
-      <configuration name="StudentTest.testInheritance" configurationId="JUnit" />
370
+    <history-entry file="InstructorsTest_testInitializationSetupInstructors - 2018.11.04 at 23h 52m 29s.xml">
371
+      <configuration name="InstructorsTest.testInitializationSetupInstructors" configurationId="JUnit" />
434 372
     </history-entry>
435
-    <history-entry file="StudentTest_testLearn - 2018.11.03 at 18h 45m 49s.xml">
436
-      <configuration name="StudentTest.testLearn" configurationId="JUnit" />
373
+    <history-entry file="InstructorsTest_testInitializationSetupInstructors - 2018.11.04 at 23h 52m 44s.xml">
374
+      <configuration name="InstructorsTest.testInitializationSetupInstructors" configurationId="JUnit" />
437 375
     </history-entry>
438 376
   </component>
439 377
   <component name="TimeTrackingManager">
440
-    <option name="totallyTimeSpent" value="5584000" />
378
+    <option name="totallyTimeSpent" value="12489000" />
441 379
   </component>
442 380
   <component name="ToolWindowManager">
443 381
     <frame x="0" y="23" width="1280" height="701" extended-state="0" />
444 382
     <editor active="true" />
445 383
     <layout>
446
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.26171243" />
384
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.2657512" />
447 385
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
448 386
       <window_info id="Image Layers" order="2" />
449 387
       <window_info id="Designer" order="3" />
@@ -480,41 +418,41 @@
480 418
     <option name="myLimit" value="2678400000" />
481 419
   </component>
482 420
   <component name="editorHistoryManager">
483
-    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
421
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
484 422
       <provider selected="true" editor-type-id="text-editor">
485
-        <state relative-caret-position="300">
486
-          <caret line="21" column="37" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
487
-          <folding>
488
-            <element signature="imports" expanded="true" />
489
-          </folding>
423
+        <state relative-caret-position="75">
424
+          <caret line="7" column="18" selection-start-line="7" selection-start-column="18" selection-end-line="7" selection-end-column="18" />
490 425
         </state>
491 426
       </provider>
492 427
     </entry>
493 428
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Learner.java">
494 429
       <provider selected="true" editor-type-id="text-editor">
495
-        <state relative-caret-position="105">
496
-          <caret line="7" selection-start-line="7" selection-end-line="7" />
430
+        <state relative-caret-position="30">
431
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
497 432
         </state>
498 433
       </provider>
499 434
     </entry>
500 435
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Teacher.java">
501 436
       <provider selected="true" editor-type-id="text-editor">
502
-        <state>
503
-          <caret column="31" lean-forward="true" selection-start-column="31" selection-end-column="31" />
437
+        <state relative-caret-position="30">
438
+          <caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" />
504 439
         </state>
505 440
       </provider>
506 441
     </entry>
507
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
442
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/TestPerson.java">
508 443
       <provider selected="true" editor-type-id="text-editor">
509
-        <state relative-caret-position="120">
510
-          <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
444
+        <state relative-caret-position="315">
445
+          <caret line="21" column="37" selection-start-line="21" selection-start-column="37" selection-end-line="21" selection-end-column="37" />
446
+          <folding>
447
+            <element signature="imports" expanded="true" />
448
+          </folding>
511 449
         </state>
512 450
       </provider>
513 451
     </entry>
514 452
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentTest.java">
515 453
       <provider selected="true" editor-type-id="text-editor">
516
-        <state relative-caret-position="105">
517
-          <caret line="7" column="41" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="41" />
454
+        <state relative-caret-position="345">
455
+          <caret line="23" column="14" lean-forward="true" selection-start-line="23" selection-start-column="14" selection-end-line="23" selection-end-column="14" />
518 456
           <folding>
519 457
             <element signature="imports" expanded="true" />
520 458
           </folding>
@@ -523,49 +461,91 @@
523 461
     </entry>
524 462
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/PeopleTest.java">
525 463
       <provider selected="true" editor-type-id="text-editor">
526
-        <state relative-caret-position="45">
527
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
464
+        <state relative-caret-position="90">
465
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
466
+          <folding>
467
+            <element signature="imports" expanded="true" />
468
+          </folding>
469
+        </state>
470
+      </provider>
471
+    </entry>
472
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
473
+      <provider selected="true" editor-type-id="text-editor">
474
+        <state relative-caret-position="30">
475
+          <caret line="2" column="13" selection-start-line="2" selection-start-column="13" selection-end-line="2" selection-end-column="13" />
528 476
         </state>
529 477
       </provider>
530 478
     </entry>
531 479
     <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorTest.java">
532 480
       <provider selected="true" editor-type-id="text-editor">
533
-        <state relative-caret-position="60">
534
-          <caret line="4" column="43" lean-forward="true" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
481
+        <state relative-caret-position="90">
482
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
483
+          <folding>
484
+            <element signature="imports" expanded="true" />
485
+          </folding>
486
+        </state>
487
+      </provider>
488
+    </entry>
489
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Students.java">
490
+      <provider selected="true" editor-type-id="text-editor">
491
+        <state relative-caret-position="45">
492
+          <caret line="3" column="42" lean-forward="true" selection-start-line="3" selection-start-column="42" selection-end-line="3" selection-end-column="42" />
493
+          <folding>
494
+            <element signature="e#2558#2559#0" expanded="true" />
495
+            <element signature="e#2589#2590#0" expanded="true" />
496
+          </folding>
535 497
         </state>
536 498
       </provider>
537 499
     </entry>
538 500
     <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/People.java">
539 501
       <provider selected="true" editor-type-id="text-editor">
540
-        <state relative-caret-position="442">
541
-          <caret line="60" selection-start-line="60" selection-end-line="60" />
502
+        <state relative-caret-position="450">
503
+          <caret line="32" column="31" lean-forward="true" selection-start-line="32" selection-start-column="31" selection-end-line="32" selection-end-column="31" />
542 504
           <folding>
543
-            <element signature="e#110#111#0" expanded="true" />
544
-            <element signature="e#162#163#0" expanded="true" />
545 505
             <element signature="e#232#233#0" expanded="true" />
546
-            <element signature="e#257#258#0" expanded="true" />
506
+            <element signature="e#270#271#0" expanded="true" />
547 507
             <element signature="e#308#309#0" expanded="true" />
548
-            <element signature="e#334#335#0" expanded="true" />
508
+            <element signature="e#346#347#0" expanded="true" />
549 509
             <element signature="e#1206#1207#0" expanded="true" />
550 510
             <element signature="e#1263#1264#0" expanded="true" />
551 511
           </folding>
552 512
         </state>
553 513
       </provider>
554 514
     </entry>
555
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Student.java">
515
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/StudentsTest.java">
556 516
       <provider selected="true" editor-type-id="text-editor">
557
-        <state relative-caret-position="315">
558
-          <caret line="21" selection-start-line="21" selection-end-line="21" />
517
+        <state relative-caret-position="375">
518
+          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
519
+          <folding>
520
+            <element signature="imports" expanded="true" />
521
+          </folding>
559 522
         </state>
560 523
       </provider>
561 524
     </entry>
562
-    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructor.java">
525
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Person.java">
563 526
       <provider selected="true" editor-type-id="text-editor">
564 527
         <state relative-caret-position="270">
565
-          <caret line="18" lean-forward="true" selection-start-line="18" selection-end-line="18" />
528
+          <caret line="24" lean-forward="true" selection-start-line="24" selection-end-line="24" />
529
+        </state>
530
+      </provider>
531
+    </entry>
532
+    <entry file="file://$PROJECT_DIR$/src/main/java/io/zipcoder/interfaces/Instructors.java">
533
+      <provider selected="true" editor-type-id="text-editor">
534
+        <state relative-caret-position="195">
535
+          <caret line="13" column="45" selection-start-line="13" selection-start-column="45" selection-end-line="13" selection-end-column="45" />
566 536
           <folding>
567
-            <element signature="e#191#192#0" expanded="true" />
568
-            <element signature="e#235#236#0" expanded="true" />
537
+            <element signature="e#610#611#0" expanded="true" />
538
+            <element signature="e#641#642#0" expanded="true" />
539
+          </folding>
540
+        </state>
541
+      </provider>
542
+    </entry>
543
+    <entry file="file://$PROJECT_DIR$/src/test/java/io/zipcoder/interfaces/InstructorsTest.java">
544
+      <provider selected="true" editor-type-id="text-editor">
545
+        <state relative-caret-position="180">
546
+          <caret line="12" column="25" selection-start-line="12" selection-start-column="25" selection-end-line="12" selection-end-column="25" />
547
+          <folding>
548
+            <element signature="imports" expanded="true" />
569 549
           </folding>
570 550
         </state>
571 551
       </provider>

+ 3
- 2
src/main/java/io/zipcoder/interfaces/Instructor.java Näytä tiedosto

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

+ 20
- 0
src/main/java/io/zipcoder/interfaces/Instructors.java Näytä tiedosto

@@ -0,0 +1,20 @@
1
+package io.zipcoder.interfaces;
2
+
3
+public final class Instructors {
4
+    private final static Instructors INSTANCE = new Instructors();
5
+    People instructorList;
6
+
7
+    private Instructors() {
8
+        instructorList = new People();
9
+        instructorList.add(new Instructor(100, "Kris Younger"));
10
+        instructorList.add(new Instructor(101, "Leon"));
11
+        instructorList.add(new Instructor(102, "Nhu Nguyen"));
12
+        instructorList.add(new Instructor(103, "Froilan Miranda"));
13
+        instructorList.add(new Instructor(104, "L. Dolio Durant"));
14
+        instructorList.add(new Instructor(105, "Wilhem Alcivar"));
15
+    }
16
+
17
+    public static Instructors getInstance() {
18
+        return INSTANCE;
19
+    }
20
+}

+ 1
- 1
src/main/java/io/zipcoder/interfaces/Person.java Näytä tiedosto

@@ -6,7 +6,7 @@ public class Person
6 6
     private String name;
7 7
 
8 8
     public Person(long id) {
9
-        this.id = 10;
9
+        this.id = id;
10 10
         this.name = "";
11 11
     }
12 12
 

+ 53
- 0
src/main/java/io/zipcoder/interfaces/Students.java Näytä tiedosto

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

+ 32
- 1
src/test/java/io/zipcoder/interfaces/InstructorTest.java Näytä tiedosto

@@ -1,6 +1,37 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
+import org.junit.Assert;
4
+import org.junit.Before;
5
+import org.junit.Test;
6
+
3 7
 public class InstructorTest
4 8
 {
5
-    Instructor instructor = new Instructor();
9
+
10
+    Instructor instructor;
11
+
12
+    @Before
13
+    public void setup() {
14
+        instructor = new Instructor(32, "Soujanya Buragapu");
15
+    }
16
+
17
+    @Test
18
+    public void testImplementation(){
19
+        Assert.assertTrue(instructor instanceof Teacher);
20
+    }
21
+
22
+    @Test
23
+    public void testInheritance(){
24
+        Assert.assertTrue(instructor instanceof Person);
25
+    }
26
+
27
+    @Test
28
+    public void testTeach(){
29
+        Student student = new Student(32,"");
30
+        double before = student.getTotalStudyTime();
31
+        instructor.teach(student, 8);
32
+        double after = student.getTotalStudyTime();
33
+
34
+        Assert.assertTrue(after-before == 8);
35
+    }
36
+
6 37
 }

+ 26
- 0
src/test/java/io/zipcoder/interfaces/InstructorsTest.java Näytä tiedosto

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

+ 47
- 0
src/test/java/io/zipcoder/interfaces/PeopleTest.java Näytä tiedosto

@@ -1,5 +1,52 @@
1 1
 package io.zipcoder.interfaces;
2 2
 
3
+import org.junit.Assert;
4
+import org.junit.Before;
5
+import org.junit.Test;
6
+
3 7
 public class PeopleTest
4 8
 {
9
+    People people = new People();
10
+    @Test
11
+    public void testAdd() {
12
+        Person person = new Person(1);
13
+        people.personList.add(person);
14
+
15
+        Assert.assertNotNull(people.personList.get(0));
16
+    }
17
+    @Test
18
+    public void testRemoveByPerson()
19
+    {
20
+
21
+    }
22
+    @Test
23
+    public void testRemoveById()
24
+    {
25
+
26
+    }
27
+    @Test
28
+    public void testFindById()
29
+    {
30
+
31
+    }
32
+    @Test
33
+    public void testGetArray()
34
+    {
35
+
36
+    }
37
+    @Test
38
+    public void testRemoveAll()
39
+    {
40
+        Person one = new Person(1);
41
+        Person two = new Person(2);
42
+        Person three = new Person(3);
43
+
44
+        people.personList.add(one);
45
+        people.personList.add(two);
46
+        people.personList.add(three);
47
+
48
+        people.removeAll();
49
+
50
+
51
+    }
5 52
 }

+ 25
- 0
src/test/java/io/zipcoder/interfaces/StudentsTest.java Näytä tiedosto

@@ -0,0 +1,25 @@
1
+package io.zipcoder.interfaces;
2
+
3
+import org.junit.Assert;
4
+import org.junit.Test;
5
+
6
+public class StudentsTest {
7
+    @Test
8
+    public void testInitializationSetupStudents() {
9
+        Students students = Students.getInstance();
10
+        Person[] studentArray = students.studentList.getArray();
11
+
12
+        int actual = studentArray.length;
13
+        int expected = 39;
14
+
15
+        Assert.assertEquals(expected,actual);
16
+    }
17
+
18
+    @Test
19
+    public void testSingletonInstance() {
20
+        Students one = Students.getInstance();
21
+        Students two = Students.getInstance();
22
+
23
+        Assert.assertSame(one, two);
24
+    }
25
+}