From 010627c3db410021adfce1b5a07a8e497df246f6 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 11:00:01 -0400 Subject: [PATCH 01/12] Completed part 1 --- .../java/com/github/curriculeon/Person.java | 22 +++++++++++ .../com/github/curriculeon/TestPerson.java | 38 ++++++++++++++++++- 2 files changed, 59 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/github/curriculeon/Person.java b/src/main/java/com/github/curriculeon/Person.java index 3c8350b..b576acf 100644 --- a/src/main/java/com/github/curriculeon/Person.java +++ b/src/main/java/com/github/curriculeon/Person.java @@ -1,5 +1,27 @@ package com.github.curriculeon; public class Person { + final long id; + private String name; + Person(long id, String name){ + this.id = id; + this.name = name; + } + + public long getId() { + return id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + + + } diff --git a/src/test/java/com/github/curriculeon/TestPerson.java b/src/test/java/com/github/curriculeon/TestPerson.java index 6c523fe..57c0a47 100644 --- a/src/test/java/com/github/curriculeon/TestPerson.java +++ b/src/test/java/com/github/curriculeon/TestPerson.java @@ -1,5 +1,41 @@ package com.github.curriculeon; - +import org.junit.Assert; +import org.junit.Test; +import com.github.curriculeon.Person; public class TestPerson { + private void test(String expected) { + + // When + Person person = new Person(1234567,expected); + + // Then + String actual = person.getName(); + Assert.assertEquals(expected, actual); + } + + + @Test + public void test0() { + test(null); + } + @Test + public void test1() { + test("John Charles Cutler"); + } + @Test + public void test2() { + test("John Africa Vincent Leaphart"); + } + + @Test + public void test3() { + test("Tuskegee & Guatemala"); + } + + @Test + public void test4() { + test("What is morality?"); + } + } From 12301beb9ef6ecfab9640ba270738cb89fd5a318 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 11:11:03 -0400 Subject: [PATCH 02/12] Completed part 2 --- .../github/curriculeon/LearnerInterface.java | 21 +++++++++++++++++++ .../com/github/curriculeon/TestPerson.java | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 src/main/java/com/github/curriculeon/LearnerInterface.java diff --git a/src/main/java/com/github/curriculeon/LearnerInterface.java b/src/main/java/com/github/curriculeon/LearnerInterface.java new file mode 100644 index 0000000..c036d8f --- /dev/null +++ b/src/main/java/com/github/curriculeon/LearnerInterface.java @@ -0,0 +1,21 @@ +package com.github.curriculeon; + +public interface LearnerInterface { + Long getId(); + String getName(); + void learn(double numberOfHours); + Double getTotalStudyTime(); +// String getAddress(); +// Long getPhoneNumber(); +// Double getBasicSalary(); +// Double getSpecialAllowance(); +// Double getHealthReimbursementAccount(); + void setName(String name); +// void setAddress(String address); +// void setPhoneNumber(Long phoneNumber); +// void setBasicSalary(Double basicSalary); +// void setSpecialAllowance(Double specialAllowance); +// void setHealthReimbursementAccount(Double healthReimbursementAccount); +// Double calculateSalary(); + +} \ No newline at end of file diff --git a/src/test/java/com/github/curriculeon/TestPerson.java b/src/test/java/com/github/curriculeon/TestPerson.java index 57c0a47..2fe88e7 100644 --- a/src/test/java/com/github/curriculeon/TestPerson.java +++ b/src/test/java/com/github/curriculeon/TestPerson.java @@ -11,6 +11,8 @@ private void test(String expected) { // Then String actual = person.getName(); + long actualId = person.getId(); + Assert.assertEquals(1234567, actualId); Assert.assertEquals(expected, actual); } From 4b380a30bc111215a3625f71886683643ae12780 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 13:23:17 -0400 Subject: [PATCH 03/12] Completed part 3-5 --- src/main/java/com/github/curriculeon/Instructor.java | 4 ++++ .../curriculeon/{LearnerInterface.java => Learner.java} | 2 +- src/main/java/com/github/curriculeon/Student.java | 4 ++++ src/main/java/com/github/curriculeon/Teacher.java | 4 ++++ src/test/java/com/github/curriculeon/TestInstructor.java | 4 ++++ src/test/java/com/github/curriculeon/TestStudent.java | 4 ++++ 6 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/github/curriculeon/Instructor.java rename src/main/java/com/github/curriculeon/{LearnerInterface.java => Learner.java} (97%) create mode 100644 src/main/java/com/github/curriculeon/Student.java create mode 100644 src/main/java/com/github/curriculeon/Teacher.java create mode 100644 src/test/java/com/github/curriculeon/TestInstructor.java create mode 100644 src/test/java/com/github/curriculeon/TestStudent.java diff --git a/src/main/java/com/github/curriculeon/Instructor.java b/src/main/java/com/github/curriculeon/Instructor.java new file mode 100644 index 0000000..16839eb --- /dev/null +++ b/src/main/java/com/github/curriculeon/Instructor.java @@ -0,0 +1,4 @@ +package com.github.curriculeon; + +public class Instructor { +} diff --git a/src/main/java/com/github/curriculeon/LearnerInterface.java b/src/main/java/com/github/curriculeon/Learner.java similarity index 97% rename from src/main/java/com/github/curriculeon/LearnerInterface.java rename to src/main/java/com/github/curriculeon/Learner.java index c036d8f..dd29c8b 100644 --- a/src/main/java/com/github/curriculeon/LearnerInterface.java +++ b/src/main/java/com/github/curriculeon/Learner.java @@ -1,7 +1,7 @@ package com.github.curriculeon; public interface LearnerInterface { - Long getId(); + long getId(); String getName(); void learn(double numberOfHours); Double getTotalStudyTime(); diff --git a/src/main/java/com/github/curriculeon/Student.java b/src/main/java/com/github/curriculeon/Student.java new file mode 100644 index 0000000..a48ef32 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Student.java @@ -0,0 +1,4 @@ +package com.github.curriculeon; + +public class Student { +} diff --git a/src/main/java/com/github/curriculeon/Teacher.java b/src/main/java/com/github/curriculeon/Teacher.java new file mode 100644 index 0000000..81c35cc --- /dev/null +++ b/src/main/java/com/github/curriculeon/Teacher.java @@ -0,0 +1,4 @@ +package com.github.curriculeon; + +public interface TeacherInterface { +} diff --git a/src/test/java/com/github/curriculeon/TestInstructor.java b/src/test/java/com/github/curriculeon/TestInstructor.java new file mode 100644 index 0000000..44ca705 --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestInstructor.java @@ -0,0 +1,4 @@ +package com.github.curriculeon; + +public class TestInstructor { +} diff --git a/src/test/java/com/github/curriculeon/TestStudent.java b/src/test/java/com/github/curriculeon/TestStudent.java new file mode 100644 index 0000000..3bf68ca --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestStudent.java @@ -0,0 +1,4 @@ +package com.github.curriculeon; + +public class TestStudent { +} From 4aa12dfd6065274672d98208e37d58df8ab4799d Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 13:23:33 -0400 Subject: [PATCH 04/12] Completed part 3-5 --- .../com/github/curriculeon/Instructor.java | 18 ++++- .../java/com/github/curriculeon/Learner.java | 2 +- .../java/com/github/curriculeon/Student.java | 19 +++++- .../java/com/github/curriculeon/Teacher.java | 7 +- .../github/curriculeon/TestInstructor.java | 68 +++++++++++++++++++ .../com/github/curriculeon/TestStudent.java | 50 ++++++++++++++ 6 files changed, 160 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/curriculeon/Instructor.java b/src/main/java/com/github/curriculeon/Instructor.java index 16839eb..27ad599 100644 --- a/src/main/java/com/github/curriculeon/Instructor.java +++ b/src/main/java/com/github/curriculeon/Instructor.java @@ -1,4 +1,20 @@ package com.github.curriculeon; -public class Instructor { +public class Instructor extends Person implements Teacher { + Instructor(long id, String name) { + super(id, name); + } + + @Override + public void teach(Learner learner, double numberOfHours) { + learner.learn(numberOfHours); + } + + @Override + public void lecture(Learner[] learners, double numberOfHours) { + double numberOfHoursPerLearner = numberOfHours / learners.length; + for (Learner learner : learners){ + this.teach(learner,numberOfHoursPerLearner); + } + } } diff --git a/src/main/java/com/github/curriculeon/Learner.java b/src/main/java/com/github/curriculeon/Learner.java index dd29c8b..073392e 100644 --- a/src/main/java/com/github/curriculeon/Learner.java +++ b/src/main/java/com/github/curriculeon/Learner.java @@ -1,6 +1,6 @@ package com.github.curriculeon; -public interface LearnerInterface { +public interface Learner { long getId(); String getName(); void learn(double numberOfHours); diff --git a/src/main/java/com/github/curriculeon/Student.java b/src/main/java/com/github/curriculeon/Student.java index a48ef32..d4ab46b 100644 --- a/src/main/java/com/github/curriculeon/Student.java +++ b/src/main/java/com/github/curriculeon/Student.java @@ -1,4 +1,21 @@ package com.github.curriculeon; -public class Student { +public class Student extends Person implements Learner { + double totalStudyTime; + + Student(long id, String name) { + super(id, name); + } + + @Override + public void learn(double numberOfHours) { + this.totalStudyTime+=numberOfHours; + + } + + @Override + public Double getTotalStudyTime() { + return this.totalStudyTime; + } + } diff --git a/src/main/java/com/github/curriculeon/Teacher.java b/src/main/java/com/github/curriculeon/Teacher.java index 81c35cc..04ec541 100644 --- a/src/main/java/com/github/curriculeon/Teacher.java +++ b/src/main/java/com/github/curriculeon/Teacher.java @@ -1,4 +1,9 @@ package com.github.curriculeon; -public interface TeacherInterface { +public interface Teacher { + void teach(Learner learner, double numberOfHours); + void lecture(Learner[] learners, double numberOfHours); + + + } diff --git a/src/test/java/com/github/curriculeon/TestInstructor.java b/src/test/java/com/github/curriculeon/TestInstructor.java index 44ca705..65c3e12 100644 --- a/src/test/java/com/github/curriculeon/TestInstructor.java +++ b/src/test/java/com/github/curriculeon/TestInstructor.java @@ -1,4 +1,72 @@ package com.github.curriculeon; +import org.junit.Assert; +import org.junit.Test; + public class TestInstructor { + + public void testTeach(Learner learner,Double expected, Double numOfHours){ + // When + Instructor instructor = new Instructor(1234, "John Doe"); + instructor.teach(learner,numOfHours); + + // Then + Double actual = learner.getTotalStudyTime(); + Assert.assertEquals(expected, actual); + } + + public void testLecture(Learner[] learners,Double expected, Double numOfHours){ + // When + Instructor instructor = new Instructor(1234, "John Doe"); + instructor.lecture(learners,numOfHours); + + // Then + Double actual = learners[0].getTotalStudyTime(); + Assert.assertEquals(expected, actual); + } + + + + @Test + public void testInheritance() { + // given + Object instructor = new Instructor(1234, ""); + + // when + Boolean outcome = instructor instanceof Person; + + // then + Assert.assertTrue(outcome); + } + @Test + public void testImplementation() { + //given + Object instructor = new Instructor(0,""); + //when + boolean outcome = instructor instanceof Teacher; + //then + Assert.assertTrue(outcome); + } + + @Test + public void test0(){ + Student student = new Student(1234, ""); + testTeach(student,5.0,5.0); + } + + @Test + public void test1(){ + Student student = new Student(1234, ""); + Student student2 = new Student(1234, ""); + Student student3 = new Student(1234, ""); + Learner[] students = new Learner[3]; + students[0] = student; + students[1] = student2; + students[2] = student3; + testLecture(students,3.0,9.0); + + + + } + } diff --git a/src/test/java/com/github/curriculeon/TestStudent.java b/src/test/java/com/github/curriculeon/TestStudent.java index 3bf68ca..3050e2c 100644 --- a/src/test/java/com/github/curriculeon/TestStudent.java +++ b/src/test/java/com/github/curriculeon/TestStudent.java @@ -1,4 +1,54 @@ package com.github.curriculeon; +import org.junit.Assert; +import org.junit.Test; public class TestStudent { + + private void testLearn(Double expected) { + + // When + Student student = new Student(1234, "John Doe"); + student.learn(expected); + + // Then + Double actual = student.getTotalStudyTime(); + Assert.assertEquals(expected, actual); + + } + + + @Test + public void testInheritance() { + // given + Object student = new Student(1234, ""); + + // when + Boolean outcome = student instanceof Person; + + // then + Assert.assertTrue(outcome); + } + @Test + public void testImplementation() { + //given + Object student = new Student(0,""); + //when + boolean outcome = student instanceof Learner; + //then + Assert.assertTrue(outcome); + } + + @Test + public void test0(){ + testLearn((double) 5); + } + @Test + public void test1(){ + testLearn((double) 6); + } + @Test + public void test2(){ + testLearn((double) 0); + } + } From 03768bf53e67ffd5fe390435f8233cc7fbc3bd33 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 14:20:46 -0400 Subject: [PATCH 05/12] Completed part 6.0 --- .../java/com/github/curriculeon/People.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 src/main/java/com/github/curriculeon/People.java diff --git a/src/main/java/com/github/curriculeon/People.java b/src/main/java/com/github/curriculeon/People.java new file mode 100644 index 0000000..69c6989 --- /dev/null +++ b/src/main/java/com/github/curriculeon/People.java @@ -0,0 +1,55 @@ +package com.github.curriculeon; + +import java.util.ArrayList; +import java.util.Iterator; + +public class People implements Iterable { + private ArrayList personList; + + public void add(Person person){ + personList.add(person); + } + public Person findById(long id){ + for(Person person: this.personList){ + if(person.id == id) + return person; + } + return null; + } + public boolean contains(Person person){ + return personList.contains(person); + } + public void remove(Person person) { + personList.remove(person); + } + + public void remove(long id){ + for(Person person: personList){ + if(person.id == id) { + personList.remove(person); + return; + } + } + } + public void removeAll(){ + this.personList = null; + } + + public int count(){ + return personList.size(); + } + public Person[] toArray(){ + return (Person[]) personList.toArray(); + } + + @Override + public Iterator iterator() { + return personList.iterator(); + } + + + + + + +} From c3adcebedd26b097d4d3413e787021f08d7cc90f Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 14:55:41 -0400 Subject: [PATCH 06/12] Added test for part 6 --- .../java/com/github/curriculeon/People.java | 9 ++- .../com/github/curriculeon/TestPeople.java | 67 +++++++++++++++++++ 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/github/curriculeon/TestPeople.java diff --git a/src/main/java/com/github/curriculeon/People.java b/src/main/java/com/github/curriculeon/People.java index 69c6989..64c9c57 100644 --- a/src/main/java/com/github/curriculeon/People.java +++ b/src/main/java/com/github/curriculeon/People.java @@ -2,9 +2,10 @@ import java.util.ArrayList; import java.util.Iterator; +import java.util.List; public class People implements Iterable { - private ArrayList personList; + private List personList = new ArrayList(); public void add(Person person){ personList.add(person); @@ -39,7 +40,11 @@ public int count(){ return personList.size(); } public Person[] toArray(){ - return (Person[]) personList.toArray(); + Person[] tempPersonArray = new Person[personList.size()]; + for (int i = 0; i < personList.size();i++) + tempPersonArray[i] = personList.get(i); + + return tempPersonArray; } @Override diff --git a/src/test/java/com/github/curriculeon/TestPeople.java b/src/test/java/com/github/curriculeon/TestPeople.java new file mode 100644 index 0000000..f9212e6 --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestPeople.java @@ -0,0 +1,67 @@ +package com.github.curriculeon; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; + +public class TestPeople { + public void testAdd(Person person1, Person person2, Person person3){ + // When + ArrayList expected = new ArrayList(); + expected.add(person1); expected.add(person2); expected.add(person3); + People people = new People(); + + //Then + people.add(person1); people.add(person2); people.add(person3); + + Person[] actual = people.toArray(); + Assert.assertEquals(expected.toArray(), actual); + } + + @Test + public void test(){ + Person person = new Person(1, "Person1"); + Person person2 = new Person(2, "Person2"); + Person person3 = new Person(3, "Person3"); + testAdd(person,person2,person3); + } + @Test + public void testRemove(){ + People people = new People(); + Person person = new Person(1, "Person1"); + Person person2 = new Person(2, "Person2"); + Person person3 = new Person(3, "Person3"); + people.add(person); + people.add(person2); + people.add(person3); + + people.remove(person); + ArrayList expected = new ArrayList(); + expected.add(person2); expected.add(person3); + + Person[] actual = people.toArray(); + Assert.assertEquals(expected.toArray(),actual); + + + } + + @Test + public void testFindById(){ + People people = new People(); + Person person = new Person(1, "Person1"); + Person person2 = new Person(2, "Person2"); + Person person3 = new Person(3, "Person3"); + people.add(person); + people.add(person2); + people.add(person3); + + Assert.assertEquals(person,people.findById(1)); + Assert.assertEquals(person2,people.findById(2)); + + } + +} + + + From b1ec30a2d80a0c307e5bcfc27e18c934fc7949b5 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 16:25:49 -0400 Subject: [PATCH 07/12] Competed part 7 --- .../java/com/github/curriculeon/Students.java | 21 +++++++++++++++++++ .../com/github/curriculeon/TestStudents.java | 20 ++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 src/main/java/com/github/curriculeon/Students.java create mode 100644 src/test/java/com/github/curriculeon/TestStudents.java diff --git a/src/main/java/com/github/curriculeon/Students.java b/src/main/java/com/github/curriculeon/Students.java new file mode 100644 index 0000000..c842c87 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Students.java @@ -0,0 +1,21 @@ +package com.github.curriculeon; + +import java.util.List; + +public final class Students extends People { + + final static Students INSTANCE = new Students(); + public People students = new People(); + private Students(){ + Student student1 = new Student(1, "Marcus"); + Student student2 = new Student(2, "Yuru"); + Student student3 = new Student(3,"David"); + students.add(student1); + students.add(student2); + students.add(student3); + } + + public static Students getINSTANCE() { + return INSTANCE; + } +} diff --git a/src/test/java/com/github/curriculeon/TestStudents.java b/src/test/java/com/github/curriculeon/TestStudents.java new file mode 100644 index 0000000..e3ab7ac --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestStudents.java @@ -0,0 +1,20 @@ +package com.github.curriculeon; + +import org.junit.Assert; +import org.junit.Test; + +public class TestStudents { + @Test + public void test(){ + Students students = Students.getINSTANCE(); + String expected = "Marucs"; + String actual = students.students.findById(1).getName(); + Assert.assertEquals("Marcus",actual); + actual = students.students.findById(2).getName(); + Assert.assertEquals("Yuru",actual); + actual = students.students.findById(3).getName(); + Assert.assertEquals("David",actual); + + + } +} From f9b9e91338121124c35a2ea25052a4a3aed1e7ea Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Mon, 20 Jul 2020 18:16:00 -0400 Subject: [PATCH 08/12] Completed part 8 --- .../com/github/curriculeon/Instructors.java | 17 +++++++++++++++++ .../github/curriculeon/TestInstructors.java | 19 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 src/main/java/com/github/curriculeon/Instructors.java create mode 100644 src/test/java/com/github/curriculeon/TestInstructors.java diff --git a/src/main/java/com/github/curriculeon/Instructors.java b/src/main/java/com/github/curriculeon/Instructors.java new file mode 100644 index 0000000..2656c48 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Instructors.java @@ -0,0 +1,17 @@ +package com.github.curriculeon; + +public class Instructors { + final static Instructors INSTANCE = new Instructors(); + public People instructors = new People(); + private Instructors(){ + Student instructor1 = new Student(1, "Leon"); + Student instructor2 = new Student(2, "Haseeb"); + + instructors.add(instructor1); + instructors.add(instructor2); + } + + public static Instructors getINSTANCE() { + return INSTANCE; + } +} diff --git a/src/test/java/com/github/curriculeon/TestInstructors.java b/src/test/java/com/github/curriculeon/TestInstructors.java new file mode 100644 index 0000000..05f200c --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestInstructors.java @@ -0,0 +1,19 @@ +package com.github.curriculeon; + +import org.junit.Assert; +import org.junit.Test; + +public class TestInstructors { + @Test + public void test(){ + Instructors instructors = Instructors.getINSTANCE(); + String expected = "Marucs"; + String actual = instructors.instructors.findById(1).getName(); + Assert.assertEquals("Leon",actual); + actual = instructors.instructors.findById(2).getName(); + Assert.assertEquals("Haseeb",actual); + + + + } +} From 1eb951467090d33136567745adb4e7b7b2c49a65 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Tue, 21 Jul 2020 10:48:01 -0400 Subject: [PATCH 09/12] Completed part 10 --- .../com/github/curriculeon/Classroom.java | 27 ++++++++++ .../com/github/curriculeon/Instructors.java | 32 +++++++++--- .../java/com/github/curriculeon/People.java | 29 ++++++----- .../java/com/github/curriculeon/Student.java | 1 + .../java/com/github/curriculeon/Students.java | 32 ++++++++++-- .../com/github/curriculeon/TestClassroom.java | 23 +++++++++ .../github/curriculeon/TestInstructors.java | 5 +- .../com/github/curriculeon/TestPeople.java | 49 ++++++++++++------- .../com/github/curriculeon/TestStudents.java | 6 +-- 9 files changed, 155 insertions(+), 49 deletions(-) create mode 100644 src/main/java/com/github/curriculeon/Classroom.java create mode 100644 src/test/java/com/github/curriculeon/TestClassroom.java diff --git a/src/main/java/com/github/curriculeon/Classroom.java b/src/main/java/com/github/curriculeon/Classroom.java new file mode 100644 index 0000000..8a4b4f7 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Classroom.java @@ -0,0 +1,27 @@ +package com.github.curriculeon; + +import java.util.HashMap; +import java.util.Map; + +public class Classroom { + Students students = Students.getINSTANCE(); + Instructors instructors = Instructors.getINSTANCE(); + + public void hostLecture(Teacher teacher, double numOfHours){ + teacher.lecture(students.toArray(),numOfHours); + } + + public void hostLecture(long id, double numberOfHours){ + Instructor instructorToHostLecture = instructors.findById(id); + hostLecture(instructorToHostLecture, numberOfHours); + } + + public Map getStudyMap(){ + Map tempMapping = new HashMap(); + Student[] tempStudents = new Student[students.count()]; + tempStudents = students.toArray(); + for (Student student: tempStudents) + tempMapping.put(student,student.getTotalStudyTime()); + return tempMapping; + } +} diff --git a/src/main/java/com/github/curriculeon/Instructors.java b/src/main/java/com/github/curriculeon/Instructors.java index 2656c48..8eeaa43 100644 --- a/src/main/java/com/github/curriculeon/Instructors.java +++ b/src/main/java/com/github/curriculeon/Instructors.java @@ -1,17 +1,37 @@ package com.github.curriculeon; -public class Instructors { +import java.util.Iterator; +import java.util.List; +import java.util.function.Consumer; + +public class Instructors extends People { final static Instructors INSTANCE = new Instructors(); - public People instructors = new People(); + private Instructors(){ - Student instructor1 = new Student(1, "Leon"); - Student instructor2 = new Student(2, "Haseeb"); + Instructor instructor1 = new Instructor(1, "Leon"); + Instructor instructor2 = new Instructor(2, "Haseeb"); - instructors.add(instructor1); - instructors.add(instructor2); + this.add(instructor1); + this.add(instructor2); } public static Instructors getINSTANCE() { return INSTANCE; } + + @Override + public Instructor[] toArray() { + Instructor[] tempArray = new Instructor[this.count()]; + int i = 0; + for (Instructor instructor : this) { + tempArray[i] = instructor; + i++; + } + return tempArray ; + } + + @Override + public void forEach(Consumer action) { + + } } diff --git a/src/main/java/com/github/curriculeon/People.java b/src/main/java/com/github/curriculeon/People.java index 64c9c57..cfac444 100644 --- a/src/main/java/com/github/curriculeon/People.java +++ b/src/main/java/com/github/curriculeon/People.java @@ -4,28 +4,29 @@ import java.util.Iterator; import java.util.List; -public class People implements Iterable { - private List personList = new ArrayList(); +public abstract class People implements Iterable { + private List personList = new ArrayList(); - public void add(Person person){ + public void add(E person){ personList.add(person); } - public Person findById(long id){ - for(Person person: this.personList){ + + public E findById(long id){ + for(E person: this.personList){ if(person.id == id) return person; } return null; } - public boolean contains(Person person){ + public boolean contains(E person){ return personList.contains(person); } - public void remove(Person person) { + public void remove(E person) { personList.remove(person); } public void remove(long id){ - for(Person person: personList){ + for(E person: personList){ if(person.id == id) { personList.remove(person); return; @@ -39,16 +40,11 @@ public void removeAll(){ public int count(){ return personList.size(); } - public Person[] toArray(){ - Person[] tempPersonArray = new Person[personList.size()]; - for (int i = 0; i < personList.size();i++) - tempPersonArray[i] = personList.get(i); - return tempPersonArray; - } + public abstract E[] toArray(); @Override - public Iterator iterator() { + public Iterator iterator() { return personList.iterator(); } @@ -57,4 +53,7 @@ public Iterator iterator() { + + + } diff --git a/src/main/java/com/github/curriculeon/Student.java b/src/main/java/com/github/curriculeon/Student.java index d4ab46b..44c53c8 100644 --- a/src/main/java/com/github/curriculeon/Student.java +++ b/src/main/java/com/github/curriculeon/Student.java @@ -19,3 +19,4 @@ public Double getTotalStudyTime() { } } + diff --git a/src/main/java/com/github/curriculeon/Students.java b/src/main/java/com/github/curriculeon/Students.java index c842c87..0774f7e 100644 --- a/src/main/java/com/github/curriculeon/Students.java +++ b/src/main/java/com/github/curriculeon/Students.java @@ -1,21 +1,43 @@ package com.github.curriculeon; import java.util.List; +import java.util.Spliterator; +import java.util.function.Consumer; -public final class Students extends People { +public final class Students extends People { final static Students INSTANCE = new Students(); - public People students = new People(); private Students(){ Student student1 = new Student(1, "Marcus"); Student student2 = new Student(2, "Yuru"); Student student3 = new Student(3,"David"); - students.add(student1); - students.add(student2); - students.add(student3); + this.add(student1); + this.add(student2); + this.add(student3); } public static Students getINSTANCE() { return INSTANCE; } + + @Override + public Student[] toArray() { + Student[] tempArray = new Student[this.count()]; + int i = 0; + for (Student student : this) { + tempArray[i] = student; + i++; + } + return tempArray ; + } + + @Override + public void forEach(Consumer action) { + + } + + @Override + public Spliterator spliterator() { + return null; + } } diff --git a/src/test/java/com/github/curriculeon/TestClassroom.java b/src/test/java/com/github/curriculeon/TestClassroom.java new file mode 100644 index 0000000..cd44226 --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestClassroom.java @@ -0,0 +1,23 @@ +package com.github.curriculeon; + +import org.junit.Assert; +import org.junit.Test; + +import java.util.HashMap; +import java.util.Map; + +public class TestClassroom { + + @Test + public void testHostLecture(){ + Classroom classroom = new Classroom(); + Instructor leon = new Instructor(1, "Leon"); + classroom.hostLecture(leon,9); + Student student = classroom.students.findById(1); + double expected = 3; + Map tempMap = classroom.getStudyMap(); + double actual = tempMap.get(student); + Assert.assertEquals(actual,expected,0.0); + + } +} diff --git a/src/test/java/com/github/curriculeon/TestInstructors.java b/src/test/java/com/github/curriculeon/TestInstructors.java index 05f200c..9a2bbf6 100644 --- a/src/test/java/com/github/curriculeon/TestInstructors.java +++ b/src/test/java/com/github/curriculeon/TestInstructors.java @@ -7,10 +7,9 @@ public class TestInstructors { @Test public void test(){ Instructors instructors = Instructors.getINSTANCE(); - String expected = "Marucs"; - String actual = instructors.instructors.findById(1).getName(); + String actual = instructors.findById(1).getName(); Assert.assertEquals("Leon",actual); - actual = instructors.instructors.findById(2).getName(); + actual = instructors.findById(2).getName(); Assert.assertEquals("Haseeb",actual); diff --git a/src/test/java/com/github/curriculeon/TestPeople.java b/src/test/java/com/github/curriculeon/TestPeople.java index f9212e6..71d8f6b 100644 --- a/src/test/java/com/github/curriculeon/TestPeople.java +++ b/src/test/java/com/github/curriculeon/TestPeople.java @@ -5,18 +5,22 @@ import java.util.ArrayList; -public class TestPeople { +public class TestPeople extends People { public void testAdd(Person person1, Person person2, Person person3){ // When ArrayList expected = new ArrayList(); expected.add(person1); expected.add(person2); expected.add(person3); - People people = new People(); + + + + //Then - people.add(person1); people.add(person2); people.add(person3); + this.add(person1); this.add(person2); this.add(person3); - Person[] actual = people.toArray(); + Person[] actual = this.toArray(); Assert.assertEquals(expected.toArray(), actual); + this.removeAll(); } @Test @@ -27,40 +31,51 @@ public void test(){ testAdd(person,person2,person3); } @Test - public void testRemove(){ - People people = new People(); + public void testRemove() { + Person person = new Person(1, "Person1"); Person person2 = new Person(2, "Person2"); Person person3 = new Person(3, "Person3"); - people.add(person); - people.add(person2); - people.add(person3); + this.add(person); + this.add(person2); + this.add(person3); - people.remove(person); + this.remove(person); ArrayList expected = new ArrayList(); expected.add(person2); expected.add(person3); - Person[] actual = people.toArray(); + Person[] actual = this.toArray(); Assert.assertEquals(expected.toArray(),actual); + this.removeAll(); } @Test public void testFindById(){ - People people = new People(); Person person = new Person(1, "Person1"); Person person2 = new Person(2, "Person2"); Person person3 = new Person(3, "Person3"); - people.add(person); - people.add(person2); - people.add(person3); + this.add(person); + this.add(person2); + this.add(person3); - Assert.assertEquals(person,people.findById(1)); - Assert.assertEquals(person2,people.findById(2)); + Assert.assertEquals(person,this.findById(1)); + Assert.assertEquals(person2,this.findById(2)); + this.removeAll(); } + @Override + public Person[] toArray() { + Person[] tempArray = new Person[this.count()]; + int i = 0; + for (Person person : this) { + tempArray[i] = person; + i++; + } + return tempArray ; + } } diff --git a/src/test/java/com/github/curriculeon/TestStudents.java b/src/test/java/com/github/curriculeon/TestStudents.java index e3ab7ac..3aec2c0 100644 --- a/src/test/java/com/github/curriculeon/TestStudents.java +++ b/src/test/java/com/github/curriculeon/TestStudents.java @@ -8,11 +8,11 @@ public class TestStudents { public void test(){ Students students = Students.getINSTANCE(); String expected = "Marucs"; - String actual = students.students.findById(1).getName(); + String actual = students.findById(1).getName(); Assert.assertEquals("Marcus",actual); - actual = students.students.findById(2).getName(); + actual = students.findById(2).getName(); Assert.assertEquals("Yuru",actual); - actual = students.students.findById(3).getName(); + actual = students.findById(3).getName(); Assert.assertEquals("David",actual); From a9450d339197d244d1a4dcec29659487b37a57fc Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Tue, 21 Jul 2020 13:55:49 -0400 Subject: [PATCH 10/12] Completed part 11 --- .../com/github/curriculeon/Classroom.java | 4 +-- .../java/com/github/curriculeon/Educator.java | 29 +++++++++++++++++++ .../com/github/curriculeon/Instructors.java | 3 +- .../java/com/github/curriculeon/Learner.java | 11 ------- .../com/github/curriculeon/TestEducator.java | 17 +++++++++++ 5 files changed, 50 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/github/curriculeon/Educator.java create mode 100644 src/test/java/com/github/curriculeon/TestEducator.java diff --git a/src/main/java/com/github/curriculeon/Classroom.java b/src/main/java/com/github/curriculeon/Classroom.java index 8a4b4f7..1a74e4e 100644 --- a/src/main/java/com/github/curriculeon/Classroom.java +++ b/src/main/java/com/github/curriculeon/Classroom.java @@ -7,13 +7,13 @@ public class Classroom { Students students = Students.getINSTANCE(); Instructors instructors = Instructors.getINSTANCE(); + public void hostLecture(Teacher teacher, double numOfHours){ teacher.lecture(students.toArray(),numOfHours); } public void hostLecture(long id, double numberOfHours){ - Instructor instructorToHostLecture = instructors.findById(id); - hostLecture(instructorToHostLecture, numberOfHours); + hostLecture(instructors.findById(id), numberOfHours); } public Map getStudyMap(){ diff --git a/src/main/java/com/github/curriculeon/Educator.java b/src/main/java/com/github/curriculeon/Educator.java new file mode 100644 index 0000000..5776e1b --- /dev/null +++ b/src/main/java/com/github/curriculeon/Educator.java @@ -0,0 +1,29 @@ +package com.github.curriculeon; + +public enum Educator implements Teacher{ + LEON ( 1,"Leon"), + HASEEB(2,"Haseeb"); + private final Instructor teacher; + private double timeWorked = 0; + + Educator(long id, String name) { + teacher = new Instructor(id,name); + Instructors instructors = Instructors.getINSTANCE(); + instructors.add(teacher); + } + + @Override + public void teach(Learner learner, double numberOfHours) { + this.teacher.teach(learner,numberOfHours); + timeWorked+=numberOfHours; + } + + @Override + public void lecture(Learner[] learners, double numberOfHours) { + this.teacher.lecture(learners,numberOfHours); + } + + public double getTimeWorked() { + return timeWorked; + } +} diff --git a/src/main/java/com/github/curriculeon/Instructors.java b/src/main/java/com/github/curriculeon/Instructors.java index 8eeaa43..2ef9bde 100644 --- a/src/main/java/com/github/curriculeon/Instructors.java +++ b/src/main/java/com/github/curriculeon/Instructors.java @@ -6,6 +6,7 @@ public class Instructors extends People { final static Instructors INSTANCE = new Instructors(); + public People instructors; private Instructors(){ Instructor instructor1 = new Instructor(1, "Leon"); @@ -21,7 +22,7 @@ public static Instructors getINSTANCE() { @Override public Instructor[] toArray() { - Instructor[] tempArray = new Instructor[this.count()]; + Instructor[] tempArray = new Instructor[this.instructors.count()]; int i = 0; for (Instructor instructor : this) { tempArray[i] = instructor; diff --git a/src/main/java/com/github/curriculeon/Learner.java b/src/main/java/com/github/curriculeon/Learner.java index 073392e..27d95ca 100644 --- a/src/main/java/com/github/curriculeon/Learner.java +++ b/src/main/java/com/github/curriculeon/Learner.java @@ -5,17 +5,6 @@ public interface Learner { String getName(); void learn(double numberOfHours); Double getTotalStudyTime(); -// String getAddress(); -// Long getPhoneNumber(); -// Double getBasicSalary(); -// Double getSpecialAllowance(); -// Double getHealthReimbursementAccount(); void setName(String name); -// void setAddress(String address); -// void setPhoneNumber(Long phoneNumber); -// void setBasicSalary(Double basicSalary); -// void setSpecialAllowance(Double specialAllowance); -// void setHealthReimbursementAccount(Double healthReimbursementAccount); -// Double calculateSalary(); } \ No newline at end of file diff --git a/src/test/java/com/github/curriculeon/TestEducator.java b/src/test/java/com/github/curriculeon/TestEducator.java new file mode 100644 index 0000000..28b6dec --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestEducator.java @@ -0,0 +1,17 @@ +package com.github.curriculeon; + +import org.junit.Assert; +import org.junit.Test; + +public class TestEducator { + + @Test + public void testConstructor(){ + Instructors instructors = Instructors.getINSTANCE(); + Educator educator = Educator.HASEEB; + double actual = educator.getTimeWorked(); + Assert.assertEquals(actual,0.0,0.0); + + + } +} From 9c44984874a2263c396141a0264ae0e2a916d508 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Tue, 21 Jul 2020 14:43:18 -0400 Subject: [PATCH 11/12] Completed assignment --- .../com/github/curriculeon/Classroom.java | 2 +- .../java/com/github/curriculeon/Educator.java | 22 ++++++++++++++----- .../com/github/curriculeon/Instructors.java | 9 ++++---- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/github/curriculeon/Classroom.java b/src/main/java/com/github/curriculeon/Classroom.java index 1a74e4e..85fff55 100644 --- a/src/main/java/com/github/curriculeon/Classroom.java +++ b/src/main/java/com/github/curriculeon/Classroom.java @@ -9,7 +9,7 @@ public class Classroom { public void hostLecture(Teacher teacher, double numOfHours){ - teacher.lecture(students.toArray(),numOfHours); + teacher.lecture(students.toArray(),numOfHours); } public void hostLecture(long id, double numberOfHours){ diff --git a/src/main/java/com/github/curriculeon/Educator.java b/src/main/java/com/github/curriculeon/Educator.java index 5776e1b..bf37c6d 100644 --- a/src/main/java/com/github/curriculeon/Educator.java +++ b/src/main/java/com/github/curriculeon/Educator.java @@ -1,15 +1,17 @@ package com.github.curriculeon; public enum Educator implements Teacher{ - LEON ( 1,"Leon"), - HASEEB(2,"Haseeb"); + LEON ( 1,"Leon",0), + HASEEB(2,"Haseeb",0); + private final long id; + private final String name; private final Instructor teacher; private double timeWorked = 0; - Educator(long id, String name) { - teacher = new Instructor(id,name); - Instructors instructors = Instructors.getINSTANCE(); - instructors.add(teacher); + Educator(long id, String name,double timeWorked) { + this.id = id; + this.name = name; + teacher = new Instructor(id,name); } @Override @@ -26,4 +28,12 @@ public void lecture(Learner[] learners, double numberOfHours) { public double getTimeWorked() { return timeWorked; } + + public String getName() { + return name; + } + + public long getId() { + return id; + } } diff --git a/src/main/java/com/github/curriculeon/Instructors.java b/src/main/java/com/github/curriculeon/Instructors.java index 2ef9bde..7eb8574 100644 --- a/src/main/java/com/github/curriculeon/Instructors.java +++ b/src/main/java/com/github/curriculeon/Instructors.java @@ -9,11 +9,10 @@ public class Instructors extends People { public People instructors; private Instructors(){ - Instructor instructor1 = new Instructor(1, "Leon"); - Instructor instructor2 = new Instructor(2, "Haseeb"); - - this.add(instructor1); - this.add(instructor2); + final Instructor leon = new Instructor(Educator.LEON.getId(),Educator.LEON.getName()); + final Instructor haseeb = new Instructor(Educator.HASEEB.getId(),Educator.HASEEB.getName()); + this.add(leon); + this.add(haseeb); } public static Instructors getINSTANCE() { From ba5f9c6f9e9e5d7c90c9ac8b1f2001ccc06cc1c3 Mon Sep 17 00:00:00 2001 From: CJ Fulton Date: Tue, 21 Jul 2020 19:25:01 -0400 Subject: [PATCH 12/12] Added changes from review @Git-Leon --- .../com/github/curriculeon/Classroom.java | 15 ++++++-- .../java/com/github/curriculeon/Educator.java | 10 +++--- .../com/github/curriculeon/Instructors.java | 16 ++++----- .../java/com/github/curriculeon/People.java | 35 ++++++++++++------- .../java/com/github/curriculeon/Person.java | 2 +- .../java/com/github/curriculeon/Student.java | 4 +-- .../java/com/github/curriculeon/Students.java | 10 +----- .../java/com/github/curriculeon/Teacher.java | 3 -- .../com/github/curriculeon/TestEducator.java | 2 +- .../github/curriculeon/TestInstructors.java | 4 +-- .../com/github/curriculeon/TestPeople.java | 5 --- .../com/github/curriculeon/TestStudent.java | 4 +-- 12 files changed, 54 insertions(+), 56 deletions(-) diff --git a/src/main/java/com/github/curriculeon/Classroom.java b/src/main/java/com/github/curriculeon/Classroom.java index 85fff55..164d86b 100644 --- a/src/main/java/com/github/curriculeon/Classroom.java +++ b/src/main/java/com/github/curriculeon/Classroom.java @@ -3,10 +3,19 @@ import java.util.HashMap; import java.util.Map; -public class Classroom { - Students students = Students.getINSTANCE(); - Instructors instructors = Instructors.getINSTANCE(); +public class Classroom { + Students students; + Instructors instructors; + public Classroom(){ + this(Students.getINSTANCE(),Instructors.getINSTANCE()); + } + + public Classroom(Students students, Instructors instructors) { + this.students = students; + this.instructors = instructors; + + } public void hostLecture(Teacher teacher, double numOfHours){ teacher.lecture(students.toArray(),numOfHours); diff --git a/src/main/java/com/github/curriculeon/Educator.java b/src/main/java/com/github/curriculeon/Educator.java index bf37c6d..2327df4 100644 --- a/src/main/java/com/github/curriculeon/Educator.java +++ b/src/main/java/com/github/curriculeon/Educator.java @@ -1,16 +1,16 @@ package com.github.curriculeon; public enum Educator implements Teacher{ - LEON ( 1,"Leon",0), - HASEEB(2,"Haseeb",0); + Leon(0.0), + Haseeb(0.0); private final long id; private final String name; private final Instructor teacher; private double timeWorked = 0; - Educator(long id, String name,double timeWorked) { - this.id = id; - this.name = name; + Educator(double timeWorked) { + this.id = this.ordinal(); + this.name = this.name(); teacher = new Instructor(id,name); } diff --git a/src/main/java/com/github/curriculeon/Instructors.java b/src/main/java/com/github/curriculeon/Instructors.java index 7eb8574..0f26338 100644 --- a/src/main/java/com/github/curriculeon/Instructors.java +++ b/src/main/java/com/github/curriculeon/Instructors.java @@ -1,16 +1,17 @@ package com.github.curriculeon; +import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.function.Consumer; -public class Instructors extends People { - final static Instructors INSTANCE = new Instructors(); - public People instructors; +public final class Instructors extends People { + private final static Instructors INSTANCE = new Instructors(); + private People instructors; private Instructors(){ - final Instructor leon = new Instructor(Educator.LEON.getId(),Educator.LEON.getName()); - final Instructor haseeb = new Instructor(Educator.HASEEB.getId(),Educator.HASEEB.getName()); + final Instructor leon = new Instructor(Educator.Leon.getId(),Educator.Leon.getName()); + final Instructor haseeb = new Instructor(Educator.Haseeb.getId(),Educator.Haseeb.getName()); this.add(leon); this.add(haseeb); } @@ -29,9 +30,4 @@ public Instructor[] toArray() { } return tempArray ; } - - @Override - public void forEach(Consumer action) { - - } } diff --git a/src/main/java/com/github/curriculeon/People.java b/src/main/java/com/github/curriculeon/People.java index cfac444..1463da0 100644 --- a/src/main/java/com/github/curriculeon/People.java +++ b/src/main/java/com/github/curriculeon/People.java @@ -4,47 +4,56 @@ import java.util.Iterator; import java.util.List; -public abstract class People implements Iterable { - private List personList = new ArrayList(); +public abstract class People implements Iterable { + private final List personList; - public void add(E person){ + public People(List personList){ + this.personList = personList; + } + + public People(){ + this(new ArrayList()); + } + + + public void add(PersonType person){ personList.add(person); } - public E findById(long id){ - for(E person: this.personList){ - if(person.id == id) + public PersonType findById(long id){ + for(PersonType person: this.personList){ + if(person.getId() == id) return person; } return null; } - public boolean contains(E person){ + public boolean contains(PersonType person){ return personList.contains(person); } - public void remove(E person) { + public void remove(PersonType person) { personList.remove(person); } public void remove(long id){ - for(E person: personList){ - if(person.id == id) { + for(PersonType person: personList){ + if(person.getId() == id) { personList.remove(person); return; } } } public void removeAll(){ - this.personList = null; + this.personList.clear(); } public int count(){ return personList.size(); } - public abstract E[] toArray(); + public abstract PersonType[] toArray(); @Override - public Iterator iterator() { + public Iterator iterator() { return personList.iterator(); } diff --git a/src/main/java/com/github/curriculeon/Person.java b/src/main/java/com/github/curriculeon/Person.java index b576acf..7307939 100644 --- a/src/main/java/com/github/curriculeon/Person.java +++ b/src/main/java/com/github/curriculeon/Person.java @@ -1,7 +1,7 @@ package com.github.curriculeon; public class Person { - final long id; + private final long id; private String name; Person(long id, String name){ this.id = id; diff --git a/src/main/java/com/github/curriculeon/Student.java b/src/main/java/com/github/curriculeon/Student.java index 44c53c8..12783c3 100644 --- a/src/main/java/com/github/curriculeon/Student.java +++ b/src/main/java/com/github/curriculeon/Student.java @@ -1,9 +1,9 @@ package com.github.curriculeon; public class Student extends Person implements Learner { - double totalStudyTime; + private double totalStudyTime; - Student(long id, String name) { + public Student(long id, String name) { super(id, name); } diff --git a/src/main/java/com/github/curriculeon/Students.java b/src/main/java/com/github/curriculeon/Students.java index 0774f7e..c685ffa 100644 --- a/src/main/java/com/github/curriculeon/Students.java +++ b/src/main/java/com/github/curriculeon/Students.java @@ -1,5 +1,6 @@ package com.github.curriculeon; +import java.util.ArrayList; import java.util.List; import java.util.Spliterator; import java.util.function.Consumer; @@ -31,13 +32,4 @@ public Student[] toArray() { return tempArray ; } - @Override - public void forEach(Consumer action) { - - } - - @Override - public Spliterator spliterator() { - return null; - } } diff --git a/src/main/java/com/github/curriculeon/Teacher.java b/src/main/java/com/github/curriculeon/Teacher.java index 04ec541..2d9a34b 100644 --- a/src/main/java/com/github/curriculeon/Teacher.java +++ b/src/main/java/com/github/curriculeon/Teacher.java @@ -3,7 +3,4 @@ public interface Teacher { void teach(Learner learner, double numberOfHours); void lecture(Learner[] learners, double numberOfHours); - - - } diff --git a/src/test/java/com/github/curriculeon/TestEducator.java b/src/test/java/com/github/curriculeon/TestEducator.java index 28b6dec..f4bc880 100644 --- a/src/test/java/com/github/curriculeon/TestEducator.java +++ b/src/test/java/com/github/curriculeon/TestEducator.java @@ -8,7 +8,7 @@ public class TestEducator { @Test public void testConstructor(){ Instructors instructors = Instructors.getINSTANCE(); - Educator educator = Educator.HASEEB; + Educator educator = Educator.Haseeb; double actual = educator.getTimeWorked(); Assert.assertEquals(actual,0.0,0.0); diff --git a/src/test/java/com/github/curriculeon/TestInstructors.java b/src/test/java/com/github/curriculeon/TestInstructors.java index 9a2bbf6..aa75d5e 100644 --- a/src/test/java/com/github/curriculeon/TestInstructors.java +++ b/src/test/java/com/github/curriculeon/TestInstructors.java @@ -7,9 +7,9 @@ public class TestInstructors { @Test public void test(){ Instructors instructors = Instructors.getINSTANCE(); - String actual = instructors.findById(1).getName(); + String actual = instructors.findById(0).getName(); Assert.assertEquals("Leon",actual); - actual = instructors.findById(2).getName(); + actual = instructors.findById(1).getName(); Assert.assertEquals("Haseeb",actual); diff --git a/src/test/java/com/github/curriculeon/TestPeople.java b/src/test/java/com/github/curriculeon/TestPeople.java index 71d8f6b..edf27de 100644 --- a/src/test/java/com/github/curriculeon/TestPeople.java +++ b/src/test/java/com/github/curriculeon/TestPeople.java @@ -10,11 +10,6 @@ public void testAdd(Person person1, Person person2, Person person3){ // When ArrayList expected = new ArrayList(); expected.add(person1); expected.add(person2); expected.add(person3); - - - - - //Then this.add(person1); this.add(person2); this.add(person3); diff --git a/src/test/java/com/github/curriculeon/TestStudent.java b/src/test/java/com/github/curriculeon/TestStudent.java index 3050e2c..518d826 100644 --- a/src/test/java/com/github/curriculeon/TestStudent.java +++ b/src/test/java/com/github/curriculeon/TestStudent.java @@ -20,7 +20,7 @@ private void testLearn(Double expected) { @Test public void testInheritance() { // given - Object student = new Student(1234, ""); + Student student = new Student(1234, ""); // when Boolean outcome = student instanceof Person; @@ -31,7 +31,7 @@ public void testInheritance() { @Test public void testImplementation() { //given - Object student = new Student(0,""); + Student student = new Student(0,""); //when boolean outcome = student instanceof Learner; //then