From 1044ecadf8c5e0f7b3a6617d8f73449ce444cf55 Mon Sep 17 00:00:00 2001 From: Rodriques Date: Mon, 15 Nov 2021 14:51:39 -0600 Subject: [PATCH 1/2] complete: part one up to bonus section --- src/main/java/Student.java | 42 +++++++++++++++++++++++++++++++ src/test/java/StudentTest.java | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 src/main/java/Student.java create mode 100644 src/test/java/StudentTest.java diff --git a/src/main/java/Student.java b/src/main/java/Student.java new file mode 100644 index 00000000..b4d10398 --- /dev/null +++ b/src/main/java/Student.java @@ -0,0 +1,42 @@ +import java.util.ArrayList; + +public class Student { + private long id; + private String name; + private ArrayList grades; + + public Student(long id, String name) { + this.id = id; + this.name = name; + this.grades = new ArrayList<>(); + } + + public long getId() { + return this.id; + } + + public String getName() { + return this.name; + } + + public ArrayList getGrades() { + System.out.println(this.grades); + return this.grades; + } + + public ArrayList addGrade(int grade) { + this.grades.add(grade); + System.out.println(this.grades); + return this.grades; + + } + + public double getGradeAverage() { + int sum = 0; + for (int grade : grades) { + sum += grade; + } + return (double) sum / grades.size(); + } + +} diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java new file mode 100644 index 00000000..cbe009cd --- /dev/null +++ b/src/test/java/StudentTest.java @@ -0,0 +1,45 @@ +import org.junit.Test; +import static org.junit.Assert.*; +import org.junit.Before; + +public class StudentTest { + + Student student; + + @Before + public void setUpNewStudent() { + student = new Student(42337L, "Rodriques"); + } + + @Test + public void getIdTest() { + assertEquals(42337, student.getId(), 0); + assertNotEquals(" \"assertNotEquals()\" The unexpected id does match up with the actual id.",42338, student.getId(), 0); + } + + @Test + public void getNameTest() { + assertSame("Rodriques", student.getName()); + } + + @Test + public void gradesInitTest() { + assertNotNull(student.getGrades()); + } + + @Test + public void addGradeTest() { + student.addGrade(100); + assertEquals(1, student.getGrades().size(), 0); + student.addGrade(90); + assertEquals(2, student.getGrades().size(), 0); + + } + + @Test + public void getGradeAverageTest() { + student.addGrade(100); + student.addGrade(90); + assertEquals(95, student.getGradeAverage(), 0); + } +} \ No newline at end of file From afd4f1391cd6c855327ff21d6e741bdf987e970e Mon Sep 17 00:00:00 2001 From: Rodriques Date: Mon, 15 Nov 2021 15:21:30 -0600 Subject: [PATCH 2/2] complete: part one bonus section --- src/main/java/Student.java | 11 +++++++++-- src/test/java/StudentTest.java | 15 +++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index b4d10398..5297a78e 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -20,13 +20,11 @@ public String getName() { } public ArrayList getGrades() { - System.out.println(this.grades); return this.grades; } public ArrayList addGrade(int grade) { this.grades.add(grade); - System.out.println(this.grades); return this.grades; } @@ -39,4 +37,13 @@ public double getGradeAverage() { return (double) sum / grades.size(); } + + public void updateGrade(int indexOf, int i) { + grades.set(indexOf, i); + } + + public void deleteGrade(Integer integer) { + grades.remove(integer); + System.out.println(grades); + } } diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index cbe009cd..e343b7ac 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -42,4 +42,19 @@ public void getGradeAverageTest() { student.addGrade(90); assertEquals(95, student.getGradeAverage(), 0); } + + @Test + public void updateGradeTest() { + student.addGrade(100); + student.addGrade(90); + student.updateGrade(student.getGrades().indexOf(90), 95); + } + + @Test + public void deleteGradeTest() { + student.addGrade(100); + student.addGrade(90); + student.addGrade(95); + student.deleteGrade(student.getGrades().get(1)); + } } \ No newline at end of file