diff --git a/bin/main/Cohort.class b/bin/main/Cohort.class index b711444dcd8420005b3b0d49848c0bb4c5fefead..c4b92545bc116d4b184b4fca5fe7af1b43e4e8a3 100644 Binary files a/bin/main/Cohort.class and b/bin/main/Cohort.class differ diff --git a/bin/test/CohortTest.class b/bin/test/CohortTest.class index 53ebfd526b57de644b304a98635de4c0e79d07e5..2d99ffeced0c3211ee50b789ef402b1a12cfd711 100644 Binary files a/bin/test/CohortTest.class and b/bin/test/CohortTest.class differ diff --git a/src/main/java/Cohort.java b/src/main/java/Cohort.java index 5bd0257ba5a10e293860de1bd1000aad74423123..8c49e5f89a88d034ce94498cd8f5646177de4801 100644 --- a/src/main/java/Cohort.java +++ b/src/main/java/Cohort.java @@ -40,7 +40,11 @@ public class Cohort { * grade. */ public void printStudentsResults(){ - // TODO : add code + System.out.println(this.toString()); + for (Student student : this.students) { + student.printResults(); + System.out.println(); + } } /** @@ -49,13 +53,6 @@ public class Cohort { */ @Override public String toString() { - String textToReturn = ""; - System.out.println(this.name + "\n"); - for (Student student : this.students) { - System.out.println("\n"); - student.printResults(); - } - - return null; + return this.name + "\n"; } } diff --git a/src/test/java/CohortTest.java b/src/test/java/CohortTest.java index a3d1b7dea08aa91e09f4e28eb21f4bd991f9b7a7..7c9ccadb06cbd38d2992bcee5566db70874d8894 100644 --- a/src/test/java/CohortTest.java +++ b/src/test/java/CohortTest.java @@ -22,19 +22,19 @@ class CohortTest { cohort.addStudent(jeanMichelBruitage); } - @Disabled("Disabled until Cohort is coded") + //@Disabled("Disabled until Cohort is coded") @Test void testGetStudentsIsEmpty_whenEmptyCohort(){ assertThat(l1Descartes.getStudents()).isEmpty(); } - @Disabled("Disabled until Cohort is coded") + //@Disabled("Disabled until Cohort is coded") @Test void testGetStudents_whenCohortContainsStudents(){ assertThat(cohort.getStudents()).isEqualTo(List.of(davidGoodenough, jeanMichelBruitage)); } - @Disabled("Disabled until Cohort is coded") + //@Disabled("Disabled until Cohort is coded") @Test void testPrintStudentsResults_whenCohortIsEmpty() { StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(l1Descartes::printStudentsResults); @@ -43,7 +43,7 @@ class CohortTest { assertThat(standardOutputSandbox.getProducedOutput()).isEqualTo(expectedOutput); } - @Disabled("Disabled until Cohort is coded") + //@Disabled("Disabled until Cohort is coded") @Test void testPrintStudentsResults_whenCohortContainsStudents() { StandardOutputSandbox standardOutputSandbox = new StandardOutputSandbox(cohort::printStudentsResults);