From 18aecd77e7d69d467cc00d6b7421e2b58b55b3c0 Mon Sep 17 00:00:00 2001 From: Lou <louberg22300@gmail.com> Date: Fri, 8 Sep 2023 13:39:15 +0200 Subject: [PATCH] finished class cohort --- bin/main/Cohort.class | Bin 1906 -> 1857 bytes bin/test/CohortTest.class | Bin 4202 -> 4090 bytes src/main/java/Cohort.java | 15 ++++++--------- src/test/java/CohortTest.java | 8 ++++---- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/bin/main/Cohort.class b/bin/main/Cohort.class index b711444dcd8420005b3b0d49848c0bb4c5fefead..c4b92545bc116d4b184b4fca5fe7af1b43e4e8a3 100644 GIT binary patch delta 607 zcmeywcaV?k)W2Q(7#JAL8B#WKePs0DWYA{NWoOV~WDv+oEKAhSNz6;v53VdONzLV9 z&|}bNWMIxOEn#F3^#My~=IaL(W#*LxmlUNY=2~+xFfthOFc>iyPyWrQWX{E4%3#jU zV8+NGj72pMg9QT*BLjN@$bg(YZU%V<D;@@G2Aj!Gnbg?q7#!Fc>?aE{i!(biI8D}O zR!DMTWMB_2DNRYuE8${rW^m(SaAy!;WZ(fC5R_V6np08?veFY|vH&-O9fLOygAao* zBLjOzVzFOpMF}GVvxa6ABLi=6Nn&!gZ(>16Vp2}35Ca2401rbTL(t@GCg;gVnGM*& z86w#kA}0T4*5n9eh+<@zq2V)`k5z867fZEt7zaZvBLfp77b63YXI@@vk#kOBadB!f zJ43?c2P|5QNt?M@LmBI*FfcJNGcYiiZeq~V+Qwk8jlo1~3xn8B21`Z;-{lPAIy)I` z85s^RIQwXCV{qNXptX&`LuV(07bC;0|IaouFfcGPNH8!kNHMT6FfeE{a53mGC^G0W zs50m=Xfx<Am@pVHNHQ=mh%qpMEMbshkY-?DP-Ng@P+?GIU}UKGV_;wqWMKNwAkM(d z&cMjP&S1yDAk4rBiX8?<23`gR1``G*21W)31}?2F41&8D{23TFFfcGMf$e1j%UFQz u-~qF_pms1b1cOzDFoZHNFmNz1GDI^lGQ=>%flOjxWQb=-WJqRUlmq|=aB-^u delta 670 zcmX@e_lb||)W2Q(7#JAL8PYd$ePo>M%%r5o!Jx~?z`)6%&tS;TV8F;Akd;`LsGpOV zm#!aNSzMBu%fn#AU_4oxNsdd1fq}u4hrx`&d~yo2GY1!gC4)6PgVp3*CJAvH1|CKR z_JX3!ypo(eZU%V<J01pm28YRWnAGZ>7+lyHoEaH}z($vrWaj95mZTOXmgE=lFt{?f zF*2~^rB;+MGKgqs`heAdt@lsLN=+`YW@qqVWMB_2DNRYuE8$@9Vq{?C;$m=T@Zn+b zWe{Lw-~n42lv-SxQ&P;$;Kbn1!w|p_$jHE+kyz}PT2W%n$iS?j8O6xJQ<7Ry5|SU3 zT2fk+$H>4NT#}fa?VDH-l9-f}%FYmq>iLqQ%)Io;%b5+>q8MV>8KNiOW!B^{V~AyB zn4#e_`2&mGWF3}jxkwI%1V#oXMlMDM9?!hI)FS7c#Ny)AVs?gPMg~=oGA<RL{QT_F z0(OSf&2L#k8SAwf7#J8qcq0P?0~3P;0|NsaSU`tCl7WGN2h3(<kYbPqDPquK&}Lv{ z;ALQ7*ucQdz{0@5;2@;qvxz}ZYYT(mE(Q|@hHVTMT3Z;zb~4y9GWacLkksAD;K;~u zfWh5&6N8?R=Qailoox)>x;q*C7#U{$uYbb0fq{X68Eml}13Lo)g9!sOgDHa$gBgP+ zgE@mCg9U>rgBgPzgEiPe3JlC3OQ8;8X0T-l0y|iffrmkbL6w1tA((-IL4<+nKZ862 z3p)cNJ3|NqJA)GggD3+tLm1eT;S3QB3=A9$j0|xi42%r%42cX33|tJ13`q<r3~3CK E06ZCh?*IS* diff --git a/bin/test/CohortTest.class b/bin/test/CohortTest.class index 53ebfd526b57de644b304a98635de4c0e79d07e5..2d99ffeced0c3211ee50b789ef402b1a12cfd711 100644 GIT binary patch delta 803 zcmaE*@JpWS)W2Q(7#JAL8MbWXGGS(vnQYH2&L5ImTw=||z{e2C!w|#}Jb5FtDqAQ+ zI6FhwWIq-Oe#heC)S{Bi{Jdfwh6skp$;>RSY|#v{><lrJ{a92O<0cogSj!|bB(pOl zF*5LFC6*=XmzHGa==)?Am+&y8Fr-dC#p1vb&5+K+kin2SS%|e*Ifs!!G`J)&FD0=k z#lN(qptK}7F)t-4zk-W_nIVsdA)ldO@(NZ}wjv&eVuq5*msvG+vKh*F7(^J#85zVi ze886EB<7{-2bJdKB_`#hT5E=JGGsGU@-S2}R8Q7mQ(>#+VW?xMpB%&%E|ksC2r`I= ziy@n#nTMf;p>^_ZHeHTThIWvTIwpT$bK&e_=wWB*W@ONu9LOR%S(aUd73AEG$=U3+ zY?DAnP2T*DU73+>2E#0NhMAMaIn|kGGt8On$oYV0x&Q+YDEJoeFf5#`%O%4zA1ttx zVL3a)vdN)bn#^?!D<(H`&68Nd!LXW<fzQWK!6mggIkBiDwV08SgJJDtbMAL68yFc> zC-3JHpX|URz_@91AkP9uRyGDk2LH+bc}3X+b})o&V~Cn8&8KA&&%ndL#9+d}zyOwK zU|`^7U|?`%U}j)sU|<m6#2~hf0i=EtgW@Iz^&Jce+ZfU&H}PrvXJOUYz`(-5!oa{_ zw3{J2aub7g<Ti%f@Lddr3=G>DN_{plRBU3X*u_x8z~HC7jiEt%8$;6$hBn=844so% z`7P^v8TuF)859`=8TuKj8JHOu7$#t~<q!ie*p>i@En?Vgf!KwM+{G{viyMyd$GSt@ zU=Mc#Gs6@H1_maEsSMK?7#JiNm>K3WFf+_!Sj4cHVI>12!zwVjhG8880|OTWBg1-z JjSQO^Bmp_4!|MP5 delta 859 zcmew*|4M=D)W2Q(7#JAL8MbfaGGS&^m~781Zsd|#oS2l8nqtk!z*?4=Q<}=iAO{mu zD9tO$%u#U8&&V$-QOGP-NX}15O_^-Ntjrd|!w||4HaV49l`VoHik%^H@&slT=4ghP z$=jJ-+2R-y*csv{Phggq{GOSMnTH{9vO0^kObSC9J3}fX17B8RS)zVvNoJ0|PiAom z4?{Xb#^gE{2aY&~EFOkzhMdXASc)0*CtI<~uodz!6fqP}j$u`0E9GG*V<?~8&Z^0g z$56?`Ai_{Jc?YWuM;=2B4?`_O-Q+v0Dr^lr42=v;liAq9h4L6$KstE181fj}co^Cl zIwt3{>2gFcbn!4mGjva0!sf!(%h1ox&^P%Vn;vsEL-%BP_FAr~AQPrBGQ824#8Eei zBWiLThdbMBhPmtvb0(kWP-mXUFn{t_jt4xm1Q>X@82A_#^Dr!#{E$<IXAxLn1;Z+K zhLw{!xir}u8CEkg%+Q$Zz$r0Vp3`%(EC>7Kg<M7w%Q+a<F*5M^7%I4=7AGebm82Fk zGIB6%nEaaS9m{4$2Gz-qoZ^$^Ir-Sw8MZPq$bq<<<$2l|wfGsB82lL+83KwK0vUoB z7#MgN7#OS>7#SEr>`e^X+Zcj(FobVoh@E_lS4$#^fro*K!GwW<0afGV|Gc6CAcdP4 z6gM%b?_fyY#*jH#g-<&o7l#gz@eB+M4Gb&{EDQ_`M!OmEA~!K;M{Z*%2;ap}!oaYd zp~7bqL-i(x>Rk-=3=DqS+ZdX)w=uNtVCdA{#?Ui)9-n3X1cr$Wj0}nlf((-w>KK?A z7#Jqwx9$)FFW9;Oh;?Gvtb<sJi`>O91@0J5gloe1W8ERHv4^{cnPEBu0|OJo42GEu t3=9$s%nS<{m>Cu_EM-{6u!ez=VJ(<k&#;k!fq{#Gkzo_V7KUvMk^qV+(wYDO diff --git a/src/main/java/Cohort.java b/src/main/java/Cohort.java index 5bd0257..8c49e5f 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 a3d1b7d..7c9ccad 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); -- GitLab