From 37257d7a930e8d7e1e70b9b698eec4cb104ca0c7 Mon Sep 17 00:00:00 2001 From: Michael Meyer Date: Thu, 22 Oct 2020 09:30:20 -0500 Subject: [PATCH 1/5] Testing to see of properties work --- src/main/java/Student.java | 7 +++++++ src/test/java/StudentTest.java | 14 ++++++++++++++ 2 files changed, 21 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..0ff10130 --- /dev/null +++ b/src/main/java/Student.java @@ -0,0 +1,7 @@ +import java.util.ArrayList; + +public class Student { + public long id; + public String name; + public ArrayList grades; +} diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java new file mode 100644 index 00000000..6e937501 --- /dev/null +++ b/src/test/java/StudentTest.java @@ -0,0 +1,14 @@ +import org.junit.Test; +import static org.junit.Assert.*; + +public class StudentTest { + @Test + public void testIfStudentClassHasCorrectProperties() { + Student test = new Student(); + assertEquals(test.id, 0); + assertEquals(test.name, null); + assertEquals(test.grades, null); + } + + +} From 6d7a10129106c7705c2cc1ec6fdc81efb64775f1 Mon Sep 17 00:00:00 2001 From: Michael Meyer Date: Thu, 22 Oct 2020 09:35:35 -0500 Subject: [PATCH 2/5] Tested to see if constructor works properly --- src/main/java/Student.java | 6 ++++++ src/test/java/StudentTest.java | 16 +++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index 0ff10130..5f3578bc 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -4,4 +4,10 @@ public class Student { public long id; public String name; public ArrayList grades; + + public Student (long id, String name) { + this.id = id; + this.name = name; + grades = new ArrayList<>(); + } } diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index 6e937501..e7b239c1 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -3,12 +3,14 @@ public class StudentTest { @Test - public void testIfStudentClassHasCorrectProperties() { - Student test = new Student(); - assertEquals(test.id, 0); - assertEquals(test.name, null); - assertEquals(test.grades, null); - } - +// public void testIfStudentClassHasCorrectProperties() { +// Student test = new Student(); +// assertEquals(test.id, 0); +// assertEquals(test.name, null); +// assertEquals(test.grades, null); +// } + public void testIfConstructorWorksProperly() { + Student test = new Student(01, "test"); + } } From ae4814b18a9f6304f6e2424448949ecb7d342520 Mon Sep 17 00:00:00 2001 From: Michael Meyer Date: Thu, 22 Oct 2020 10:03:52 -0500 Subject: [PATCH 3/5] tested getters --- src/main/java/Student.java | 8 ++++++++ src/test/java/StudentTest.java | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index 5f3578bc..5d2586f8 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -10,4 +10,12 @@ public Student (long id, String name) { this.name = name; grades = new ArrayList<>(); } + + public long getId() { + return this.id; + } + + public String getName() { + return this.name; + } } diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index e7b239c1..b6598574 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -1,8 +1,15 @@ +import org.junit.Before; import org.junit.Test; + +import java.util.ArrayList; +import java.util.List; + import static org.junit.Assert.*; + public class StudentTest { - @Test + private List tests; +// @Test // public void testIfStudentClassHasCorrectProperties() { // Student test = new Student(); // assertEquals(test.id, 0); @@ -10,7 +17,23 @@ public class StudentTest { // assertEquals(test.grades, null); // } + @Before + public void setUp() { + this.tests = new ArrayList<>(); + Student test01 = new Student(01, "test01"); + this.tests.add(test01); +; } + + @Test public void testIfConstructorWorksProperly() { Student test = new Student(01, "test"); } + + @Test + public void testGetters() { + assertNotEquals(tests.get(0).getId(), 0); + assertNotEquals(tests.get(0).getName(), null); + assertEquals(tests.get(0).getId(), 01); + assertEquals(tests.get(0).getName(), "test01"); + } } From f21e48120f8dbf102a256e711edf60c2ffe87d90 Mon Sep 17 00:00:00 2001 From: Michael Meyer Date: Thu, 22 Oct 2020 10:15:37 -0500 Subject: [PATCH 4/5] Tested addGrade and Getgrade --- src/main/java/Student.java | 8 ++++++++ src/test/java/StudentTest.java | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index 5d2586f8..c3aff1b4 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -18,4 +18,12 @@ public long getId() { public String getName() { return this.name; } + + public void addGrade(int grade) { + grades.add(grade); + } + + public ArrayList getGrades() { + return this.grades; + } } diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index b6598574..b051b25f 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -8,7 +8,7 @@ public class StudentTest { - private List tests; + private ArrayList tests; // @Test // public void testIfStudentClassHasCorrectProperties() { // Student test = new Student(); @@ -36,4 +36,12 @@ public void testGetters() { assertEquals(tests.get(0).getId(), 01); assertEquals(tests.get(0).getName(), "test01"); } + + @Test + public void testGradeFunctionality() { + tests.get(0).addGrade(85); + ArrayList expected = new ArrayList<>(); + expected.add(85); + assertTrue(expected.equals(tests.get(0).getGrades())); + } } From e318d99f69fba7a791e4ccd3e6b51140e56e9400 Mon Sep 17 00:00:00 2001 From: Michael Meyer Date: Thu, 22 Oct 2020 10:22:26 -0500 Subject: [PATCH 5/5] tested getGradeAverage --- src/main/java/Student.java | 8 ++++++++ src/test/java/StudentTest.java | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/main/java/Student.java b/src/main/java/Student.java index c3aff1b4..c2a68000 100644 --- a/src/main/java/Student.java +++ b/src/main/java/Student.java @@ -26,4 +26,12 @@ public void addGrade(int grade) { public ArrayList getGrades() { return this.grades; } + + public double getGradeAverage() { + double total = 0; + for (Integer grade : grades) { + total += grade; + } + return total / grades.size(); + } } diff --git a/src/test/java/StudentTest.java b/src/test/java/StudentTest.java index b051b25f..4cae4714 100644 --- a/src/test/java/StudentTest.java +++ b/src/test/java/StudentTest.java @@ -38,10 +38,17 @@ public void testGetters() { } @Test - public void testGradeFunctionality() { + public void testAddAndGetGradeFunctionality() { tests.get(0).addGrade(85); ArrayList expected = new ArrayList<>(); expected.add(85); assertTrue(expected.equals(tests.get(0).getGrades())); } + + @Test + public void testGetGradeAverage() { + tests.get(0).addGrade(90); + tests.get(0).addGrade(80); + assertTrue(85.0 == tests.get(0).getGradeAverage()); + } }