From f7643d8dd8a6522e923408fcf373aad080b69c5b Mon Sep 17 00:00:00 2001 From: Emmanuel Stephen Date: Fri, 14 May 2021 12:07:01 -0500 Subject: [PATCH 1/4] Feat: repo is forked and exercise is starting --- pom.xml | 3 --- src/main/java/Student.java | 3 +++ src/main/java/StudentTest.java | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 src/main/java/Student.java create mode 100644 src/main/java/StudentTest.java diff --git a/pom.xml b/pom.xml index d9c0c6eb..a9eaf2e8 100644 --- a/pom.xml +++ b/pom.xml @@ -3,16 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - junit-tests tests 1.0-SNAPSHOT - 11 11 - junit diff --git a/src/main/java/Student.java b/src/main/java/Student.java new file mode 100644 index 00000000..66c33269 --- /dev/null +++ b/src/main/java/Student.java @@ -0,0 +1,3 @@ +public class Student { + +} diff --git a/src/main/java/StudentTest.java b/src/main/java/StudentTest.java new file mode 100644 index 00000000..32d0877e --- /dev/null +++ b/src/main/java/StudentTest.java @@ -0,0 +1,3 @@ +public class StudentTest { + +} From f97c638ad21efe6383e026de0813099ef82ee5ae Mon Sep 17 00:00:00 2001 From: Emmanuel Stephen Date: Fri, 14 May 2021 15:08:31 -0500 Subject: [PATCH 2/4] finish with student controctor test and the setName and get id --- pom.xml | 1 + src/main/java/Student.java | 54 ++++++++++++++++++++++++++++++++++ src/main/java/StudentTest.java | 3 -- src/test/java/StudentTest.java | 26 ++++++++++++++++ 4 files changed, 81 insertions(+), 3 deletions(-) delete mode 100644 src/main/java/StudentTest.java create mode 100644 src/test/java/StudentTest.java diff --git a/pom.xml b/pom.xml index a9eaf2e8..4f451d4a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ 11 11 + junit diff --git a/src/main/java/Student.java b/src/main/java/Student.java index 66c33269..ebe091b9 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -1,3 +1,57 @@ +import java.util.ArrayList; + public class Student { + long id; + String name ; + ArrayList grades; + + //Constructor + public Student(long id, String name) { + this.id = id; + this.name = name; + this.grades = grades; + } + + // returns the student's id + public long getId(){ + return this.id; + } + + // returns the student's name + public String getName(){ + return this.name; + } + + // adds the given grade to the grades list + public void addGrade(int grade){ + + } + + // returns the list of grades + public ArrayList getGrades(){ + return this.grades; + } + + // returns the average of the students grades + public double getGradeAverage(){ + double bucket = 0; + for(int grade : grades) { + bucket += grade; + } + return bucket/grades.size(); + // int averGrade = grades.getGrades()/ grades.size; + } + + // updated the grades in the grade list + public void addGrade(){ + + } + + // delete Grade from the grade list + public void deleteGrade(){ + + } + + } diff --git a/src/main/java/StudentTest.java b/src/main/java/StudentTest.java deleted file mode 100644 index 32d0877e..00000000 --- a/src/main/java/StudentTest.java +++ /dev/null @@ -1,3 +0,0 @@ -public class StudentTest { - -} diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java new file mode 100644 index 00000000..857313fb --- /dev/null +++ b/src/test/java/StudentTest.java @@ -0,0 +1,26 @@ +import org.junit.Test; +import static org.junit.Assert.*; + +public class StudentTest { + + @Test + public void StudentTest() { + Student me = new Student(11, "Manii"); + Student nullMe = null; + assertNotNull(me); + assertNull(nullMe); + } + + @Test + public void SettersGettersTest(){ + Student me = new Student(11, "Manii"); + assertEquals(11, me.getId()); + assertEquals("Manii", me.getName()); + + Student her = new Student(12, "Stephanie"); + assertEquals(12, her.getId()); + assertEquals("Stephanie", her.getName()); + } + + +} From 4eca6d89a196cb86823ccffddbf1bbf2a50c1811 Mon Sep 17 00:00:00 2001 From: Emmanuel Stephen Date: Sun, 16 May 2021 21:48:30 -0500 Subject: [PATCH 3/4] feat: finished first exercise --- src/main/java/Student.java | 5 +++-- src/test/java/StudentTest.java | 26 ++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index ebe091b9..c4771f8a 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -1,4 +1,5 @@ import java.util.ArrayList; +import java.util.Collection; public class Student { @@ -25,7 +26,7 @@ public String getName(){ // adds the given grade to the grades list public void addGrade(int grade){ - + grades.add(grade); } // returns the list of grades @@ -36,7 +37,7 @@ public ArrayList getGrades(){ // returns the average of the students grades public double getGradeAverage(){ double bucket = 0; - for(int grade : grades) { + for(int grade : this.grades) { bucket += grade; } return bucket/grades.size(); diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index 857313fb..c852506e 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -22,5 +22,31 @@ public void SettersGettersTest(){ assertEquals("Stephanie", her.getName()); } + @Test + public void AddGradeTest(){ + Student me = new Student(11, "Manii"); + assertEquals(0, me.addGrade().size()); + me.addGrade(60); + assertEquals(1, me.addGrade().size()); + me.addGrade(75); + } + @Test + public void AddGetTest(){ + Student me = new Student(11, "Manii"); + me.addGrade(75); + me.addGrade(60); + assertSame(75, me.getGrades().get(0)); + assertSame(60, me.getGrades().get(1)); + } + + @Test + public void getAverageTest(){ + Student me = new Student(11, "Manii"); + me.addGrade(90); + me.addGrade(80); + assertEquals(80, me.getGradeAverage(), 0); + me.addGrade(50); + assertEquals(60, me.getGradeAverage(), 0); + } } From 00c4e94ba2b1449cb30a9d9548cac3c8af183c2c Mon Sep 17 00:00:00 2001 From: Emmanuel Stephen Date: Sun, 16 May 2021 22:33:23 -0500 Subject: [PATCH 4/4] feat:created cohort test --- src/main/java/Cohort.java | 7 +++++++ src/test/java/CohortTest.java | 3 +++ 2 files changed, 10 insertions(+) create mode 100644 src/main/java/Cohort.java create mode 100644 src/test/java/CohortTest.java diff --git a/src/main/java/Cohort.java b/src/main/java/Cohort.java new file mode 100644 index 00000000..c9e36a90 --- /dev/null +++ b/src/main/java/Cohort.java @@ -0,0 +1,7 @@ +import java.util.ArrayList; +import java.util.List; + +public class Cohort { + public List students; + +} diff --git a/src/test/java/CohortTest.java b/src/test/java/CohortTest.java new file mode 100644 index 00000000..58b32470 --- /dev/null +++ b/src/test/java/CohortTest.java @@ -0,0 +1,3 @@ +public class CohortTest { + +}