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..8acd77e --- /dev/null +++ b/src/main/java/com/github/curriculeon/Classroom.java @@ -0,0 +1,44 @@ +package com.github.curriculeon; + +import java.util.HashMap; +import java.util.Map; + +public class Classroom { + + private static final Classroom INSTANCE = new Classroom(); + Students students=Students.getInstance(); + Instructors instructors=Instructors.getInstance(); + + private Classroom() { + + } + + + public static Classroom getInstance() { + return INSTANCE; + } + + + public void hostLecture(Teacher teacher, double numberOfHours){ + teacher.lecture( students.toArray(),numberOfHours); + + } + public void hostLecture(long id, double numberOfHours){ + Instructor instructor=instructors.findById(id); + instructor.lecture( students.toArray(),numberOfHours); + } + + public Map getStudyMap(){ + Map studentMap=new HashMap<>(); + + for(Student student1 : students.toArray()) { + Double studyTime =student1.getTotalStudyTime(); + studentMap.put(student1,studyTime); + } + return studentMap; + } + + +} + + 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..2e733e4 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Instructor.java @@ -0,0 +1,26 @@ +package com.github.curriculeon; + +public class Instructor extends Person implements Teacher{ + + + public 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 (int i = 0; i < learners.length; i++) { + Learner learner = learners[i]; + learner.learn(numberOfHoursPerLearner); + + } + + } +} 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..a88e0f2 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Instructors.java @@ -0,0 +1,26 @@ +package com.github.curriculeon; + +import java.util.List; + +public class Instructors extends People { + + private static final Instructors INSTANCE = new Instructors(); + + private Instructors() { + super(); + this.add(new Instructor(01L, "Leon")); + this.add(new Instructor(02L, "Haseeb")); + } + + @Override + public Instructor[] toArray() { + int sizeOfArray = count(); + List oldList = personList; + return oldList.toArray(new Instructor[sizeOfArray]); + } + + + public static Instructors getInstance() { + return INSTANCE; + } +} diff --git a/src/main/java/com/github/curriculeon/Learner.java b/src/main/java/com/github/curriculeon/Learner.java new file mode 100644 index 0000000..5ed9a12 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Learner.java @@ -0,0 +1,10 @@ +package com.github.curriculeon; + +public interface Learner { + + public void learn(double numberOfHours); + + public double getTotalStudyTime(); + + +} 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..a33579c --- /dev/null +++ b/src/main/java/com/github/curriculeon/People.java @@ -0,0 +1,66 @@ +package com.github.curriculeon; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +abstract public class People implements Iterable{ + List personList; + + public People() { + this(new ArrayList<>()); + } + + public People(List personList) { + + this.personList = personList; + } + + public void add(SomeType person) { + + personList.add(person); + } + + public SomeType findById(long id) { + for (SomeType person : personList) { + if (person.getId() == id) { + return person; + } + } + return null; + } + + public Boolean contains(SomeType person) { + return personList.contains(person); + + } + + public void remove(SomeType person) { + if (personList.contains(person)) { + personList.remove(person); + } + + } + + public void removeById(long id) { + SomeType person = findById(id); + personList.remove(person); + + } + + public void removeAll() { + personList.clear(); + } + + public int count() { + return personList.size(); + } + + abstract public SomeType[] toArray(); + + + @Override + 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 3c8350b..29f7ecf 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 { + private Long id; + private String name; + public 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; + } + + public Person(){ + this.id = null; + } } 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..95ada18 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Student.java @@ -0,0 +1,23 @@ +package com.github.curriculeon; + +public class Student extends Person implements Learner { + double totalStudyTime; + + + + public Student(Long id, String name) { + super(id, name); + } + + + @Override + public void learn(double numberOfHours) { + totalStudyTime+=numberOfHours; + + } + + @Override + public double getTotalStudyTime() { + return totalStudyTime; + } +} 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..9194cb8 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Students.java @@ -0,0 +1,28 @@ +package com.github.curriculeon; + +import java.util.List; + +public class Students extends People { + + private static final Students INSTANCE = new Students(); + + private Students() { + super(); + this.add(new Student(01L, "Anjali")); + this.add(new Student(02L, "Deepti")); + } + + @Override + public Student[] toArray() { + int sizeOfArray = count(); + List oldList = personList; + return oldList.toArray(new Student[sizeOfArray]); + } + + + public static Students getInstance() { + return INSTANCE; + } + + +} 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..7b9ae36 --- /dev/null +++ b/src/main/java/com/github/curriculeon/Teacher.java @@ -0,0 +1,8 @@ +package com.github.curriculeon; + +public interface Teacher { + + public void teach(Learner learner,double numberOfHours); + + public void lecture(Learner[] learners,double numberOfHours); +} diff --git a/src/test/java/com/github/curriculeon/ClassroomTest.java b/src/test/java/com/github/curriculeon/ClassroomTest.java new file mode 100644 index 0000000..e5eed92 --- /dev/null +++ b/src/test/java/com/github/curriculeon/ClassroomTest.java @@ -0,0 +1,38 @@ +package com.github.curriculeon; + +import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Map; +import java.util.Set; + +public class ClassroomTest extends TestCase { + @Test + public void testHostLecture() { + //given + Classroom classroom = Classroom.getInstance(); + Teacher teacher = Instructors.getInstance().findById(1L); + Integer numberOfStudents = Students.getInstance().count(); + Double numberOfHoursToLecture = numberOfStudents.doubleValue(); + Double expectedHoursLearned = numberOfHoursToLecture / numberOfStudents; + Map preStudyMap = classroom.getStudyMap(); + + + //when + classroom.hostLecture(teacher, numberOfHoursToLecture); + Map postStudyMap = classroom.getStudyMap(); + Set keySet = postStudyMap.keySet(); + for (Student student : keySet) { + Double preStudyTime = preStudyMap.get(student); + Double expectedStudyTime = preStudyTime + expectedHoursLearned; + Double actualStudyTime = postStudyMap.get(student); + + // then + Assert.assertEquals(expectedStudyTime, actualStudyTime); + + } + + + } +} \ No newline at end of file diff --git a/src/test/java/com/github/curriculeon/InstructorsTest.java b/src/test/java/com/github/curriculeon/InstructorsTest.java new file mode 100644 index 0000000..b429000 --- /dev/null +++ b/src/test/java/com/github/curriculeon/InstructorsTest.java @@ -0,0 +1,29 @@ +package com.github.curriculeon; + +import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + +import java.util.Arrays; +import java.util.List; + +public class InstructorsTest extends TestCase { + + + @Test + public void testGetInstance() { + Instructors instructor = Instructors.getInstance(); + String[] instructorNameArray = {"Leon", "Haseeb"}; + List listInstructor = Arrays.asList(instructorNameArray); + + Person[] instructorArray = instructor.toArray(); + for (int i = 0; i < instructorArray.length; i++) { + Person person = instructorArray[i]; + String personName = person.getName(); + boolean hasPersonWithName = listInstructor.contains(personName); + Assert.assertTrue(hasPersonWithName); + + } + } + +} diff --git a/src/test/java/com/github/curriculeon/PeopleTest.java b/src/test/java/com/github/curriculeon/PeopleTest.java new file mode 100644 index 0000000..eac4e2c --- /dev/null +++ b/src/test/java/com/github/curriculeon/PeopleTest.java @@ -0,0 +1,74 @@ +package com.github.curriculeon; + +import junit.framework.TestCase; +import org.junit.Assert; + +public class PeopleTest extends TestCase { + + public void testAdd() { + //given + People people = Instructors.getInstance(); + Person person1 = new Person(); + Person person2 = new Person(); + Assert.assertFalse(people.contains(person1)); + Assert.assertFalse(people.contains(person2)); + + //when + people.add(person1); + people.add(person2); + + //then + Assert.assertTrue(people.contains(person1)); + Assert.assertTrue(people.contains(person2)); + } + + public void testFindById() { + //given + People people = Instructors.getInstance(); + people.removeAll(); + Person expected = new Person(1L, null); + Person person1 = new Person(2L, null); + Person person2 = new Person(3L, null); + + Assert.assertFalse(people.contains(expected)); + Assert.assertFalse(people.contains(person1)); + Assert.assertFalse(people.contains(person2)); + + //when + people.add(expected); + people.add(person1); + people.add(person2); + + Assert.assertTrue(people.contains(expected)); + Assert.assertTrue(people.contains(person1)); + Assert.assertTrue(people.contains(person2)); + + Person actual = people.findById(expected.getId()); + //then + Assert.assertEquals(expected, actual); + + } + + public void testRemove() { + //given + People people = Instructors.getInstance(); + Person person1 = new Person(); + Person person2 = new Person(); + + + people.add(person1); + people.add(person2); + + Assert.assertTrue(people.contains(person1)); + Assert.assertTrue(people.contains(person2)); + + //when + people.remove(person1); + people.remove(person2); + + //then + Assert.assertFalse(people.contains(person1)); + Assert.assertFalse(people.contains(person2)); + + } +} \ No newline at end of file diff --git a/src/test/java/com/github/curriculeon/StudentTest.java b/src/test/java/com/github/curriculeon/StudentTest.java new file mode 100644 index 0000000..b27aad7 --- /dev/null +++ b/src/test/java/com/github/curriculeon/StudentTest.java @@ -0,0 +1,50 @@ +package com.github.curriculeon; + +import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + +public class StudentTest extends TestCase { + @Test + public void testInheritance(){ + //given + Student student = new Student(null,null); + + // when + Boolean outcome = student instanceof Person; + + // then + Assert.assertTrue(outcome); + } + + + @Test + public void testLearn() { + //given + + Student student = new Student(null,null); + Double numberOfHours=9.4; + Double expected=student.getTotalStudyTime()+numberOfHours; + + //when + student.learn(numberOfHours); + Double actual=student.getTotalStudyTime(); + + //then + + Assert.assertEquals(expected,actual); + + } + + @Test + public void testImplementation() { + //given + Student student = new Student(null,null); + + // when + Boolean outcome = student instanceof Learner; + + // then + Assert.assertTrue(outcome); + } +} \ No newline at end of file diff --git a/src/test/java/com/github/curriculeon/StudentsTest.java b/src/test/java/com/github/curriculeon/StudentsTest.java new file mode 100644 index 0000000..2ca4048 --- /dev/null +++ b/src/test/java/com/github/curriculeon/StudentsTest.java @@ -0,0 +1,28 @@ +package com.github.curriculeon; + +import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class StudentsTest extends TestCase { + + @Test + public void testGetInstance() { + Students student = Students.getInstance(); + String[] studentNameArray = {"Anjali", "Deepti"}; + List listStudent = Arrays.asList(studentNameArray); + + Person[] studentArray = student.toArray(); + for (int i = 0; i < studentArray.length; i++) { + Person person = studentArray[i]; + String personName = person.getName(); + boolean hasPersonWithName = listStudent.contains(personName); + Assert.assertTrue(hasPersonWithName); + + } + } +} \ No newline at end of file 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..9a866a9 --- /dev/null +++ b/src/test/java/com/github/curriculeon/TestInstructor.java @@ -0,0 +1,78 @@ +package com.github.curriculeon; + +import junit.framework.TestCase; +import org.junit.Assert; +import org.junit.Test; + +public class TestInstructor extends TestCase { + + @Test + public void testInheritance() { + //given + + Instructor instructor = new Instructor(null, null); + + // when + Boolean outcome = instructor instanceof Person; + + // then + Assert.assertTrue(outcome); + } + + @Test + public void testImplementation() { + //given + + Instructor instructor = new Instructor(null, null); + + // when + Boolean outcome = instructor instanceof Teacher; + + // then + Assert.assertTrue(outcome); + } + + + @Test + public void testLearn() { + //given + + Learner learners = new Student(null, null); + Instructor instructor = new Instructor(null, null); + Double numberOfHours = 9.4; + Double expected = learners.getTotalStudyTime() + numberOfHours; + + //when + instructor.teach(learners, numberOfHours); + Double actual= learners.getTotalStudyTime(); + // Double actual = instructor.lecture(learner, numberOfHours); + + //then + + Assert.assertEquals(expected, actual); + + } + + public void testLecture() { + //given + Teacher teacher=new Instructor(null,null); + Learner[] learners = { + new Student(1L, "student1"), + new Student(2L, "student2"), + new Student(3L, "student3"), + new Student(4L, "student4"), + }; + Double numberOfHours = 28.2; + Double expected = numberOfHours / learners.length; + //when + teacher.lecture(learners,numberOfHours); + //then + for (int i = 0; i < learners.length; i++) { + Learner learner = learners[i]; + Double actual=learner.getTotalStudyTime(); + Assert.assertEquals(expected,actual); + } + + + } +} \ 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 6c523fe..1cc894a 100644 --- a/src/test/java/com/github/curriculeon/TestPerson.java +++ b/src/test/java/com/github/curriculeon/TestPerson.java @@ -1,5 +1,37 @@ package com.github.curriculeon; +import org.junit.Assert; +import org.junit.Test; + public class TestPerson { + @Test + public void testConstructor() { + // given + Long expectedId = 0L; + String expectedName = "Some name"; + + // when + Person person = new Person(expectedId, expectedName); + Long actualId = person.getId(); + String actualName = person.getName(); + + // then + Assert.assertEquals(expectedId, actualId); + Assert.assertEquals(expectedName, actualName); + } + + @Test + public void testSetName() { + // given + Person person = new Person(null, null); + String expectedName = "Some name"; + Assert.assertNotEquals(expectedName, person.getName()); + + // when + person.setName(expectedName); + String actualName = person.getName(); + // then + Assert.assertEquals(expectedName, actualName); + } }