From 43ea73b0a7727b63ed402356072911139b2fa2e3 Mon Sep 17 00:00:00 2001 From: KrYounger <35814586+xt0fer@users.noreply.github.com> Date: Fri, 20 Nov 2020 13:43:06 -0500 Subject: [PATCH 01/10] Setting up GitHub Classroom Feedback From 34d0d6237e3b1a640ca9d9a9edb743a18588a18a Mon Sep 17 00:00:00 2001 From: gunjan Date: Fri, 20 Nov 2020 21:28:27 -0500 Subject: [PATCH 02/10] Part 5 finishes --- .idea/.gitignore | 3 + .idea/.name | 1 + .idea/compiler.xml | 16 +++ .idea/encodings.xml | 6 + .idea/jarRepositories.xml | 20 +++ .idea/libraries/Maven__junit_junit_4_13_1.xml | 13 ++ ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 ++ .../Maven__org_hamcrest_hamcrest_core_1_3.xml | 13 ++ ..._org_junit_jupiter_junit_jupiter_5_7_0.xml | 13 ++ ..._junit_jupiter_junit_jupiter_api_5_7_0.xml | 13 ++ ...nit_jupiter_junit_jupiter_engine_5_7_0.xml | 13 ++ ...nit_jupiter_junit_jupiter_params_5_7_0.xml | 13 ++ ..._platform_junit_platform_commons_1_7_0.xml | 13 ++ ...t_platform_junit_platform_engine_1_7_0.xml | 13 ++ ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 ++ .idea/misc.xml | 11 ++ .idea/modules.xml | 8 ++ .idea/uiDesigner.xml | 124 ++++++++++++++++++ .idea/vcs.xml | 6 + interfaces-1.iml | 24 ++++ pom.xml | 6 + .../io/zipcoder/interfaces/Instructor.java | 25 ++++ .../java/io/zipcoder/interfaces/Learner.java | 5 + .../java/io/zipcoder/interfaces/Person.java | 17 +++ .../java/io/zipcoder/interfaces/Student.java | 21 +++ .../java/io/zipcoder/interfaces/Teacher.java | 6 + .../zipcoder/interfaces/TestInstructor.java | 57 ++++++++ .../io/zipcoder/interfaces/TestPerson.java | 29 +++- .../io/zipcoder/interfaces/TestStudent.java | 48 +++++++ 29 files changed, 562 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/compiler.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/libraries/Maven__junit_junit_4_13_1.xml create mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml create mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml create mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml create mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/uiDesigner.xml create mode 100644 .idea/vcs.xml create mode 100644 interfaces-1.iml create mode 100644 src/main/java/io/zipcoder/interfaces/Instructor.java create mode 100644 src/main/java/io/zipcoder/interfaces/Learner.java create mode 100644 src/main/java/io/zipcoder/interfaces/Student.java create mode 100644 src/main/java/io/zipcoder/interfaces/Teacher.java create mode 100644 src/test/java/io/zipcoder/interfaces/TestInstructor.java create mode 100644 src/test/java/io/zipcoder/interfaces/TestStudent.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..a0f2c3a --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +interfaces-1 \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..46a1310 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..63e9001 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 0000000..712ab9d --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_13_1.xml b/.idea/libraries/Maven__junit_junit_4_13_1.xml new file mode 100644 index 0000000..9fa24fc --- /dev/null +++ b/.idea/libraries/Maven__junit_junit_4_13_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml new file mode 100644 index 0000000..f854ab0 --- /dev/null +++ b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml new file mode 100644 index 0000000..f58bbc1 --- /dev/null +++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml new file mode 100644 index 0000000..f7cf4fe --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml new file mode 100644 index 0000000..cc01e3f --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml new file mode 100644 index 0000000..f198e4b --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml new file mode 100644 index 0000000..a53686b --- /dev/null +++ b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml new file mode 100644 index 0000000..cde8a48 --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml new file mode 100644 index 0000000..3391deb --- /dev/null +++ b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml new file mode 100644 index 0000000..fbc1b16 --- /dev/null +++ b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4361200 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..711b3a5 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/interfaces-1.iml b/interfaces-1.iml new file mode 100644 index 0000000..bd9ded9 --- /dev/null +++ b/interfaces-1.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 9b8c464..77e4d36 100644 --- a/pom.xml +++ b/pom.xml @@ -21,5 +21,11 @@ 3.8.1 test + + + junit + junit + 4.13.1 + diff --git a/src/main/java/io/zipcoder/interfaces/Instructor.java b/src/main/java/io/zipcoder/interfaces/Instructor.java new file mode 100644 index 0000000..7e24107 --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/Instructor.java @@ -0,0 +1,25 @@ +package io.zipcoder.interfaces; + +public class Instructor extends Person implements Teacher { + + public Instructor(String name) { + super(name); + } + + public void teach(Student student, double numberOfHours) { + student.learn(numberOfHours); + + } + + public void lecture(Student[] students, double numberOfHours) { + double numberOfHoursPerStudent = numberOfHours / students.length; + for (int i = 0; i < students.length; i++) { + students[i].learn(numberOfHoursPerStudent); + + } + + } + + + +} diff --git a/src/main/java/io/zipcoder/interfaces/Learner.java b/src/main/java/io/zipcoder/interfaces/Learner.java new file mode 100644 index 0000000..84ed4ad --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/Learner.java @@ -0,0 +1,5 @@ +package io.zipcoder.interfaces; + +public interface Learner { + public void learn(double numberOfHours); +} diff --git a/src/main/java/io/zipcoder/interfaces/Person.java b/src/main/java/io/zipcoder/interfaces/Person.java index fc6a3ff..ae7bce1 100644 --- a/src/main/java/io/zipcoder/interfaces/Person.java +++ b/src/main/java/io/zipcoder/interfaces/Person.java @@ -2,4 +2,21 @@ public class Person { + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + String name; + + public Person(String name) + { + this.name=name; + } + + + } diff --git a/src/main/java/io/zipcoder/interfaces/Student.java b/src/main/java/io/zipcoder/interfaces/Student.java new file mode 100644 index 0000000..ed6c546 --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/Student.java @@ -0,0 +1,21 @@ +package io.zipcoder.interfaces; + +public class Student extends Person implements Learner{ + + + double totalStudyTime; + public Student(String name) { + super(name); + } + + public void learn(double numberOfHours) { + totalStudyTime+=numberOfHours; + + } + + public double getTotalStudyTime() { + return totalStudyTime; + } + + +} diff --git a/src/main/java/io/zipcoder/interfaces/Teacher.java b/src/main/java/io/zipcoder/interfaces/Teacher.java new file mode 100644 index 0000000..cd3d1ef --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/Teacher.java @@ -0,0 +1,6 @@ +package io.zipcoder.interfaces; + +public interface Teacher { + public void teach(Student student , double numberOfHours); + public void lecture(Student[] students , double numberOfHours); +} diff --git a/src/test/java/io/zipcoder/interfaces/TestInstructor.java b/src/test/java/io/zipcoder/interfaces/TestInstructor.java new file mode 100644 index 0000000..908880b --- /dev/null +++ b/src/test/java/io/zipcoder/interfaces/TestInstructor.java @@ -0,0 +1,57 @@ +package io.zipcoder.interfaces; + +import static org.junit.Assert.*; +import org.junit.Test; +public class TestInstructor { + @Test + public void testImplementation(){ + // Given + Instructor instructor = new Instructor("Ram");; + + // When + Boolean instanceFlag= instructor instanceof Teacher; + // Then + assertEquals(true,instanceFlag) ; + } + @Test + public void testInheritance(){ + // Given + Instructor instructor = new Instructor("Ram");; + + // When + Boolean inheritanceFlag= instructor instanceof Person; + // Then + assertEquals(true,inheritanceFlag) ; + } + @Test + public void testTeach(){ + // Given + Instructor instructor = new Instructor("Ram");; + Student student = new Student("Gunjan");; + // When + instructor.teach(student,50); + // Then + assertEquals(50,student.totalStudyTime,0) ; + + } + + @Test + public void testLecture(){ + // Given + Instructor instructor = new Instructor("Ram");; + Student student1 = new Student("Gunjan"); + Student student2 = new Student("Radha");; + Student[] students = new Student[2]; + students[0]=student1; + students[1]=student2; + // When + instructor.lecture(students,100); + // Then + assertEquals(50,student1.getTotalStudyTime(),0) ; + assertEquals(50,student2.getTotalStudyTime(),0) ; + + } + + + +} diff --git a/src/test/java/io/zipcoder/interfaces/TestPerson.java b/src/test/java/io/zipcoder/interfaces/TestPerson.java index d64cd2f..e3a46c6 100644 --- a/src/test/java/io/zipcoder/interfaces/TestPerson.java +++ b/src/test/java/io/zipcoder/interfaces/TestPerson.java @@ -1,5 +1,32 @@ package io.zipcoder.interfaces; - +import static org.junit.Assert.*; +import org.junit.Test; public class TestPerson { + @Test + public void testSetName(){ + // Given + String name = "Gunjan"; + + + // When + Person person = new Person("test"); + + person.setName(name); + // Then + assertEquals("Gunjan", person.getName()); + } + + @Test + public void testConstructor(){ + // Given + String name = "Gunjan"; + + + // When + Person person = new Person("Constructor"); + //person.setName(name); + // Then + assertEquals("Constructor", person.getName()); + } } diff --git a/src/test/java/io/zipcoder/interfaces/TestStudent.java b/src/test/java/io/zipcoder/interfaces/TestStudent.java new file mode 100644 index 0000000..f112295 --- /dev/null +++ b/src/test/java/io/zipcoder/interfaces/TestStudent.java @@ -0,0 +1,48 @@ +package io.zipcoder.interfaces; +import static org.junit.Assert.*; +import org.junit.Test; + +public class TestStudent { + @Test + public void testImplementation(){ + // Given + Student student = new Student("Gunjan");; + + // When + Boolean instanceFlag= student instanceof Learner; + // Then + assertEquals(true,instanceFlag) ; + } + @Test + public void testInheritance(){ + // Given + Student student = new Student("Gunjan");; + + // When + Boolean inheritanceFlag= student instanceof Person; + // Then + assertEquals(true,inheritanceFlag) ; + } + @Test + public void testLearn(){ + // Given + Student student = new Student("Gunjan");; + + // When + student.learn(50);; + // Then + assertEquals(50,student.totalStudyTime,0) ; + + } + @Test + public void testLearnGetTime(){ + // Given + Student student = new Student("Gunjan");; + + // When + student.learn(50);; + // Then + assertEquals(50,student.getTotalStudyTime(),0) ; + + } +} From 37df83c261899afc2b2fe9a182641fa4ba1de8c8 Mon Sep 17 00:00:00 2001 From: gunjan Date: Fri, 20 Nov 2020 21:55:43 -0500 Subject: [PATCH 03/10] Part 6 done --- .../interfaces/ZipCodeWilmingtonClass.java | 31 +++++++++++++++++++ .../interfaces/TestZipCodeWilmington.java | 31 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 src/main/java/io/zipcoder/interfaces/ZipCodeWilmingtonClass.java create mode 100644 src/test/java/io/zipcoder/interfaces/TestZipCodeWilmington.java diff --git a/src/main/java/io/zipcoder/interfaces/ZipCodeWilmingtonClass.java b/src/main/java/io/zipcoder/interfaces/ZipCodeWilmingtonClass.java new file mode 100644 index 0000000..74e1346 --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/ZipCodeWilmingtonClass.java @@ -0,0 +1,31 @@ +package io.zipcoder.interfaces; + +import java.util.ArrayList; + +public class ZipCodeWilmingtonClass{ + + private static ArrayList instructorList = new ArrayList(); + static { // static initializer + String[] instructorNames = { "Leon", "Tariq", "Froilan", "David", "Zach", "Iyasu" }; + for (String instructorName : instructorNames) { + Instructor instructor = new Instructor(instructorName); + hire(instructor); + } + } + + public static void hire(Instructor instructor) + { + instructorList.add(instructor); + } + + + public static ArrayList getInstructors() + { + return instructorList; + } + + public static void fireStaff() + { + instructorList.clear(); + } +} diff --git a/src/test/java/io/zipcoder/interfaces/TestZipCodeWilmington.java b/src/test/java/io/zipcoder/interfaces/TestZipCodeWilmington.java new file mode 100644 index 0000000..9d2264c --- /dev/null +++ b/src/test/java/io/zipcoder/interfaces/TestZipCodeWilmington.java @@ -0,0 +1,31 @@ +package io.zipcoder.interfaces; +import static org.junit.Assert.*; + +import org.junit.Before; +import org.junit.Test; +public class TestZipCodeWilmington { + + @Before + public void setup() { + ZipCodeWilmingtonClass.fireStaff(); + } + + @Test + public void testFireStaff(){ + Boolean expected = true; + Boolean actual= ZipCodeWilmingtonClass.getInstructors().isEmpty(); + // Then + assertEquals(expected,actual) ; + } + @Test + public void testHireStaff(){ + Instructor instructor1 = new Instructor("Ram");; + Instructor instructor2 = new Instructor("Daksh");; + ZipCodeWilmingtonClass.hire(instructor1); + ZipCodeWilmingtonClass.hire(instructor2); + // Then + assertEquals("Ram",ZipCodeWilmingtonClass.getInstructors().get(0).getName()) ; + assertEquals("Daksh",ZipCodeWilmingtonClass.getInstructors().get(1).getName()) ; + } + +} From 5ccc772c3ac6237f61aa2b0e05592a98acce4e52 Mon Sep 17 00:00:00 2001 From: gunjan Date: Sat, 21 Nov 2020 18:02:42 -0500 Subject: [PATCH 04/10] Part 7 done --- .../io/zipcoder/interfaces/TechConnect.java | 39 ++++++++++++++++ .../zipcoder/interfaces/TestTechConnect.java | 44 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 src/main/java/io/zipcoder/interfaces/TechConnect.java create mode 100644 src/test/java/io/zipcoder/interfaces/TestTechConnect.java diff --git a/src/main/java/io/zipcoder/interfaces/TechConnect.java b/src/main/java/io/zipcoder/interfaces/TechConnect.java new file mode 100644 index 0000000..9729f96 --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/TechConnect.java @@ -0,0 +1,39 @@ +package io.zipcoder.interfaces; + +import java.util.ArrayList; + +public class TechConnect { + private static ArrayList studentList = new ArrayList(); + static { // static initializer + String[] studentNames = { "Karen", "Liel", "Quinn", "Destiny", "Blesson", "Danielle B.", "Andre", "Jeff", + "Carlo", "Julia D.", "Natalie", "Julia E.", "Shylee", "Genevieve", "Margo", "Whitney", "Rachel", + "Bridget", "Seung", "Jessica", "Harry", "Kesler", "Darin", "Jade", "Dominika", "Nashae", "Brianna", + "Laurent", "Rina", "Emily", "Elisha", "Caitlin", "Kierra", "Dana", "Alyssa", "Humaira", "Prajwal", + "Cristine", "Brendan" }; + for (String studentName : studentNames) { + Student student = new Student(studentName); + studentList.add(student); + } + } + public static void recruitStudent(Student student) + { + + studentList.add(student); + } + + public static ArrayList getStudents() + { + + return studentList; + } + + public static void removeStudents() + { + + studentList.clear(); + } + + + + +} diff --git a/src/test/java/io/zipcoder/interfaces/TestTechConnect.java b/src/test/java/io/zipcoder/interfaces/TestTechConnect.java new file mode 100644 index 0000000..f49d391 --- /dev/null +++ b/src/test/java/io/zipcoder/interfaces/TestTechConnect.java @@ -0,0 +1,44 @@ +package io.zipcoder.interfaces; + +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; + +import static org.junit.Assert.assertEquals; + +public class TestTechConnect { + TechConnect tc = new TechConnect(); + + @Before + public void setup() { + // TestTechConnect tc= new TestTechConnect(); + tc.removeStudents(); + + } + + @Test + public void testRemoveStudents() { + // Given + Boolean expected = true; + //When + Boolean actual = tc.getStudents().isEmpty(); + // Then + assertEquals(expected, actual); + } + + @Test + public void testRecruitStudents() { + // Given + Boolean expected = true; + Student student1 = new Student("gunjan"); + Student student2 = new Student("daksh"); + + + //When + tc.recruitStudent(student1); + tc.recruitStudent(student2); + // Then + assertEquals(2,tc.getStudents().size(),0); + } +} \ No newline at end of file From 3199fc6ed782852192999214285b20176d02acc0 Mon Sep 17 00:00:00 2001 From: gunjan Date: Sat, 21 Nov 2020 21:02:34 -0500 Subject: [PATCH 05/10] cannot figure part 8 --- .../io/zipcoder/interfaces/ClassRoom.java | 28 +++++++++++++++++++ .../io/zipcoder/interfaces/TestClassroom.java | 27 ++++++++++++++++++ .../zipcoder/interfaces/TestInstructor.java | 2 +- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 src/main/java/io/zipcoder/interfaces/ClassRoom.java create mode 100644 src/test/java/io/zipcoder/interfaces/TestClassroom.java diff --git a/src/main/java/io/zipcoder/interfaces/ClassRoom.java b/src/main/java/io/zipcoder/interfaces/ClassRoom.java new file mode 100644 index 0000000..aaa8249 --- /dev/null +++ b/src/main/java/io/zipcoder/interfaces/ClassRoom.java @@ -0,0 +1,28 @@ +package io.zipcoder.interfaces; + +import sun.jvm.hotspot.ui.tree.FieldTreeNodeAdapter; + +import java.util.ArrayList; +import java.util.HashMap; + +public class ClassRoom { + public ClassRoom() { + } + + TechConnect tc =new TechConnect(); + private ArrayList students = tc.getStudents(); + ZipCodeWilmingtonClass zcw =new ZipCodeWilmingtonClass(); + private ArrayList instructors = zcw.getInstructors(); + + public HashMap getRoster() + { + HashMap studentInstructor= new HashMap(); + + for (int i = 0; i < instructors.size(); i++) { + studentInstructor.put(instructors.get(i) , students.get(i)); + + } + return studentInstructor; + } + +} diff --git a/src/test/java/io/zipcoder/interfaces/TestClassroom.java b/src/test/java/io/zipcoder/interfaces/TestClassroom.java new file mode 100644 index 0000000..00c03c4 --- /dev/null +++ b/src/test/java/io/zipcoder/interfaces/TestClassroom.java @@ -0,0 +1,27 @@ +package io.zipcoder.interfaces; + +import static org.junit.Assert.*; +import org.junit.Test; +import static org.junit.Assert.assertEquals; + +public class TestClassroom { + + @Test + public void testgetRoster(){ + // Given + Instructor instructor1 = new Instructor("Ram"); + Instructor instructor2 = new Instructor("Ram");; + Student student1 = new Student("Gunjan"); + Student student2 = new Student("Radha");; + Student[] students = new Student[2]; + students[0]=student1; + students[1]=student2; + ClassRoom classR= new ClassRoom(); + // When + System.out.println(classR.getRoster()); + + // Then + //assertEquals(true,instanceFlag) ; + } + +} diff --git a/src/test/java/io/zipcoder/interfaces/TestInstructor.java b/src/test/java/io/zipcoder/interfaces/TestInstructor.java index 908880b..8bf769b 100644 --- a/src/test/java/io/zipcoder/interfaces/TestInstructor.java +++ b/src/test/java/io/zipcoder/interfaces/TestInstructor.java @@ -54,4 +54,4 @@ public void testLecture(){ -} +} \ No newline at end of file From 81557a5bfe16f62bdfd76d47e36136775462b140 Mon Sep 17 00:00:00 2001 From: gunjan Date: Sat, 21 Nov 2020 21:12:04 -0500 Subject: [PATCH 06/10] something --- src/main/java/io/zipcoder/interfaces/ClassRoom.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/zipcoder/interfaces/ClassRoom.java b/src/main/java/io/zipcoder/interfaces/ClassRoom.java index aaa8249..045232a 100644 --- a/src/main/java/io/zipcoder/interfaces/ClassRoom.java +++ b/src/main/java/io/zipcoder/interfaces/ClassRoom.java @@ -20,7 +20,6 @@ public HashMap getRoster() for (int i = 0; i < instructors.size(); i++) { studentInstructor.put(instructors.get(i) , students.get(i)); - } return studentInstructor; } From c84c8ebb7654a1b784fe349c9a2120dda03a9a5b Mon Sep 17 00:00:00 2001 From: gunjan Date: Sat, 21 Nov 2020 21:14:50 -0500 Subject: [PATCH 07/10] test --- src/main/java/io/zipcoder/interfaces/ClassRoom.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/io/zipcoder/interfaces/ClassRoom.java b/src/main/java/io/zipcoder/interfaces/ClassRoom.java index aaa8249..045232a 100644 --- a/src/main/java/io/zipcoder/interfaces/ClassRoom.java +++ b/src/main/java/io/zipcoder/interfaces/ClassRoom.java @@ -20,7 +20,6 @@ public HashMap getRoster() for (int i = 0; i < instructors.size(); i++) { studentInstructor.put(instructors.get(i) , students.get(i)); - } return studentInstructor; } From a3c5dadf2023ae60da773df0ece30a51fe1a4f9a Mon Sep 17 00:00:00 2001 From: gunjan Date: Sun, 22 Nov 2020 06:44:57 -0500 Subject: [PATCH 08/10] Part 8 done --- ..._org_apiguardian_apiguardian_api_1_1_0.xml | 13 --------- ..._org_junit_jupiter_junit_jupiter_5_7_0.xml | 13 --------- ..._junit_jupiter_junit_jupiter_api_5_7_0.xml | 13 --------- ...nit_jupiter_junit_jupiter_engine_5_7_0.xml | 13 --------- ...nit_jupiter_junit_jupiter_params_5_7_0.xml | 13 --------- ..._platform_junit_platform_commons_1_7_0.xml | 13 --------- ...t_platform_junit_platform_engine_1_7_0.xml | 13 --------- ...Maven__org_opentest4j_opentest4j_1_2_0.xml | 13 --------- interfaces-1.iml | 8 ----- .../io/zipcoder/interfaces/ClassRoom.java | 29 +++++++++++++++++-- .../io/zipcoder/interfaces/TestClassroom.java | 29 ++++++++++++------- 11 files changed, 44 insertions(+), 126 deletions(-) delete mode 100644 .idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml delete mode 100644 .idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml delete mode 100644 .idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml diff --git a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml b/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml deleted file mode 100644 index f854ab0..0000000 --- a/.idea/libraries/Maven__org_apiguardian_apiguardian_api_1_1_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml deleted file mode 100644 index f7cf4fe..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_5_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml deleted file mode 100644 index cc01e3f..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_api_5_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml deleted file mode 100644 index f198e4b..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_engine_5_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml b/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml deleted file mode 100644 index a53686b..0000000 --- a/.idea/libraries/Maven__org_junit_jupiter_junit_jupiter_params_5_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml deleted file mode 100644 index cde8a48..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_commons_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml b/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml deleted file mode 100644 index 3391deb..0000000 --- a/.idea/libraries/Maven__org_junit_platform_junit_platform_engine_1_7_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml b/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml deleted file mode 100644 index fbc1b16..0000000 --- a/.idea/libraries/Maven__org_opentest4j_opentest4j_1_2_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/interfaces-1.iml b/interfaces-1.iml index bd9ded9..a99ea01 100644 --- a/interfaces-1.iml +++ b/interfaces-1.iml @@ -12,13 +12,5 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/java/io/zipcoder/interfaces/ClassRoom.java b/src/main/java/io/zipcoder/interfaces/ClassRoom.java index 045232a..8fb1004 100644 --- a/src/main/java/io/zipcoder/interfaces/ClassRoom.java +++ b/src/main/java/io/zipcoder/interfaces/ClassRoom.java @@ -4,24 +4,47 @@ import java.util.ArrayList; import java.util.HashMap; +import java.util.Map; public class ClassRoom { public ClassRoom() { } TechConnect tc =new TechConnect(); + + public ArrayList getStudents() { + return students; + } + + public void setStudents(ArrayList students) { + this.students = students; + } + + public ArrayList getInstructors() { + return instructors; + } + + public void setInstructors(ArrayList instructors) { + this.instructors = instructors; + } + private ArrayList students = tc.getStudents(); ZipCodeWilmingtonClass zcw =new ZipCodeWilmingtonClass(); private ArrayList instructors = zcw.getInstructors(); - public HashMap getRoster() + public String getRoster() { HashMap studentInstructor= new HashMap(); - + StringBuilder str= new StringBuilder(); for (int i = 0; i < instructors.size(); i++) { studentInstructor.put(instructors.get(i) , students.get(i)); + //str.append(instructors.get(i)).append( students.get(i)); + } + for (Map.Entry entry : studentInstructor.entrySet()) { // Iterate through hashmap + str.append(entry.getKey().getName()).append(" ").append(entry.getValue().getName()).append("\n"); } - return studentInstructor; + + return str.toString(); } } diff --git a/src/test/java/io/zipcoder/interfaces/TestClassroom.java b/src/test/java/io/zipcoder/interfaces/TestClassroom.java index 00c03c4..86ad70f 100644 --- a/src/test/java/io/zipcoder/interfaces/TestClassroom.java +++ b/src/test/java/io/zipcoder/interfaces/TestClassroom.java @@ -2,6 +2,10 @@ import static org.junit.Assert.*; import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; + import static org.junit.Assert.assertEquals; public class TestClassroom { @@ -9,19 +13,22 @@ public class TestClassroom { @Test public void testgetRoster(){ // Given - Instructor instructor1 = new Instructor("Ram"); - Instructor instructor2 = new Instructor("Ram");; - Student student1 = new Student("Gunjan"); - Student student2 = new Student("Radha");; - Student[] students = new Student[2]; - students[0]=student1; - students[1]=student2; - ClassRoom classR= new ClassRoom(); - // When - System.out.println(classR.getRoster()); + ClassRoom classR= new ClassRoom(); + HashMap studentInstructor= new HashMap(); + StringBuilder expected= new StringBuilder(); + for (int i = 0; i < classR.getInstructors().size(); i++) { + studentInstructor.put(classR.getInstructors().get(i) , classR.getStudents().get(i)); + //str.append(instructors.get(i)).append( students.get(i)); + } + for (Map.Entry entry : studentInstructor.entrySet()) { // Iterate through hashmap + expected.append(entry.getKey().getName()).append(" ").append(entry.getValue().getName()).append("\n"); + } + // When + String actual = classR.getRoster(); + // System.out.println(actual); // Then - //assertEquals(true,instanceFlag) ; + assertEquals(expected.toString(),actual) ; } } From 5e64e25b2b0f24bff742c3da081a26e3b5782b71 Mon Sep 17 00:00:00 2001 From: gunjan Date: Sun, 22 Nov 2020 21:09:57 -0500 Subject: [PATCH 09/10] modified classroom --- .../io/zipcoder/interfaces/ClassRoom.java | 49 ++++--------------- .../io/zipcoder/interfaces/TestClassroom.java | 41 +++++++--------- 2 files changed, 27 insertions(+), 63 deletions(-) diff --git a/src/main/java/io/zipcoder/interfaces/ClassRoom.java b/src/main/java/io/zipcoder/interfaces/ClassRoom.java index 8fb1004..301928f 100644 --- a/src/main/java/io/zipcoder/interfaces/ClassRoom.java +++ b/src/main/java/io/zipcoder/interfaces/ClassRoom.java @@ -1,50 +1,21 @@ package io.zipcoder.interfaces; -import sun.jvm.hotspot.ui.tree.FieldTreeNodeAdapter; - -import java.util.ArrayList; import java.util.HashMap; -import java.util.Map; public class ClassRoom { - public ClassRoom() { - } - - TechConnect tc =new TechConnect(); - - public ArrayList getStudents() { - return students; - } - - public void setStudents(ArrayList students) { - this.students = students; - } - - public ArrayList getInstructors() { - return instructors; - } + private HashMap roster; - public void setInstructors(ArrayList instructors) { - this.instructors = instructors; + public ClassRoom(){ + roster = new HashMap(); } - - private ArrayList students = tc.getStudents(); - ZipCodeWilmingtonClass zcw =new ZipCodeWilmingtonClass(); - private ArrayList instructors = zcw.getInstructors(); - - public String getRoster() - { - HashMap studentInstructor= new HashMap(); - StringBuilder str= new StringBuilder(); - for (int i = 0; i < instructors.size(); i++) { - studentInstructor.put(instructors.get(i) , students.get(i)); - //str.append(instructors.get(i)).append( students.get(i)); + public HashMap getRoster(){ + for(Instructor x: ZipCodeWilmingtonClass.getInstructors()){ + roster.put(x.getName(), x); } - for (Map.Entry entry : studentInstructor.entrySet()) { // Iterate through hashmap - str.append(entry.getKey().getName()).append(" ").append(entry.getValue().getName()).append("\n"); + for(Student y: TechConnect.getStudents()){ + roster.put(y.getName(), y); } - - return str.toString(); + return roster; } -} +} \ No newline at end of file diff --git a/src/test/java/io/zipcoder/interfaces/TestClassroom.java b/src/test/java/io/zipcoder/interfaces/TestClassroom.java index 86ad70f..ef002cf 100644 --- a/src/test/java/io/zipcoder/interfaces/TestClassroom.java +++ b/src/test/java/io/zipcoder/interfaces/TestClassroom.java @@ -1,34 +1,27 @@ package io.zipcoder.interfaces; -import static org.junit.Assert.*; +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; +import java.util.Collections; import java.util.HashMap; -import java.util.Map; - -import static org.junit.Assert.assertEquals; +import java.util.ArrayList; public class TestClassroom { + ClassRoom classroom; - @Test - public void testgetRoster(){ - // Given - ClassRoom classR= new ClassRoom(); - HashMap studentInstructor= new HashMap(); - StringBuilder expected= new StringBuilder(); - for (int i = 0; i < classR.getInstructors().size(); i++) { - studentInstructor.put(classR.getInstructors().get(i) , classR.getStudents().get(i)); - //str.append(instructors.get(i)).append( students.get(i)); - } - for (Map.Entry entry : studentInstructor.entrySet()) { // Iterate through hashmap - expected.append(entry.getKey().getName()).append(" ").append(entry.getValue().getName()).append("\n"); - } - - // When - String actual = classR.getRoster(); - // System.out.println(actual); - // Then - assertEquals(expected.toString(),actual) ; + @Before + public void setup(){ + classroom = new ClassRoom(); } -} + @Test + public void testGetRoster(){ + ArrayList total = new ArrayList(); + total.addAll(ZipCodeWilmingtonClass.getInstructors()); + total.addAll(TechConnect.getStudents()); + for (Person x: classroom.getRoster().values()) + Assert.assertTrue(total.contains(x)); + } +} \ No newline at end of file From 8da9979075725eaea1e7adab3e022f9f9cdfaa21 Mon Sep 17 00:00:00 2001 From: gunjan Date: Mon, 23 Nov 2020 08:45:01 -0500 Subject: [PATCH 10/10] final --- src/main/java/io/zipcoder/interfaces/ClassRoom.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/interfaces/ClassRoom.java b/src/main/java/io/zipcoder/interfaces/ClassRoom.java index 301928f..22724e2 100644 --- a/src/main/java/io/zipcoder/interfaces/ClassRoom.java +++ b/src/main/java/io/zipcoder/interfaces/ClassRoom.java @@ -1,5 +1,6 @@ package io.zipcoder.interfaces; +import java.util.ArrayList; import java.util.HashMap; public class ClassRoom { @@ -9,10 +10,14 @@ public ClassRoom(){ roster = new HashMap(); } public HashMap getRoster(){ - for(Instructor x: ZipCodeWilmingtonClass.getInstructors()){ + ArrayList instructors = ZipCodeWilmingtonClass.getInstructors(); + for (int i = 0; i < instructors.size(); i++) { + Instructor x = instructors.get(i); roster.put(x.getName(), x); } - for(Student y: TechConnect.getStudents()){ + ArrayList students = TechConnect.getStudents(); + for (int i = 0; i < students.size(); i++) { + Student y = students.get(i); roster.put(y.getName(), y); } return roster;