From 1d2e48bf5beb7941a6bfa1c875d95e964e947293 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 07:26:17 -0500 Subject: [PATCH 01/11] first test works --- src/main/java/io/zipcoder/Student.java | 55 ++++++++++++++++++ src/test/java/io/zipcoder/StudentTest.java | 19 ++++++ target/classes/io/zipcoder/Classroom.class | Bin 0 -> 276 bytes target/classes/io/zipcoder/Student.class | Bin 0 -> 2092 bytes .../io/zipcoder/ClassroomTest.class | Bin 0 -> 288 bytes .../io/zipcoder/StudentTest.class | Bin 0 -> 1177 bytes 6 files changed, 74 insertions(+) create mode 100644 target/classes/io/zipcoder/Classroom.class create mode 100644 target/classes/io/zipcoder/Student.class create mode 100644 target/test-classes/io/zipcoder/ClassroomTest.class create mode 100644 target/test-classes/io/zipcoder/StudentTest.class diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index b543e36..f412b81 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,4 +1,59 @@ package io.zipcoder; +import java.util.ArrayList; +import java.util.Arrays; + public class Student { + String firstName; + String lastName; + ArrayList examScores = new ArrayList<>(); + + public Student(String firstName, String lastName, Double[] testScores){ + this.firstName = firstName; + this.lastName = lastName; + this.examScores.addAll(Arrays.asList(testScores)); + + } + + // Getters + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + public ArrayList getExamScores() { + return examScores; + } + + public Integer getNumberOfExamsTaken() { + return examScores.size(); + } + + // Setters + + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + // Other Methods + + public String getExamsTaken() { + String ans = " Exam Scores:"; + for (int i = 1; i <= examScores.size(); i++) { + ans += "\nExam " + i + " -> " + examScores.get(i); + } + return ans; + } + + + } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index a9fedec..8873364 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,5 +1,24 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + +import java.util.ArrayList; + public class StudentTest { + @Test + public void testGetFirstName() { + String first = "Lyon"; + String last = "Hunter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + + String actual = leonHunter.getFirstName(); + System.out.println(actual); + Assert.assertEquals("Lyon", actual); + + } + } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class new file mode 100644 index 0000000000000000000000000000000000000000..e3e3105f62ae6cfc0804ea21349da326cbeab864 GIT binary patch literal 276 zcmZvWy>7xl5QJxqf5347MMBhcK*2TX644-0Sx^wUKbsRAGQQ|+Qt(z(ktlco9x7su zA}V&JPdBqWr@j82F96=r4bi}BfOdcm!T;2SuBL>>aFh_-nOQ4BC)R~p9QLWQUoy?v zd5cXZ^F&%*>wnX&wz?$rV{ODye`lPvVwTIYw8rc|2;s^cY^LVA{-XVuOm^}|MsVQ~ zdQY>2ZoMONS!~2I-Kng?01jVX7jbi#>9Z1d4S3^U(1{HP0n=w29B4A5``becAuGZQ H(?N6t{#`mN literal 0 HcmV?d00001 diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class new file mode 100644 index 0000000000000000000000000000000000000000..a76719dae2e47d487807da16a9cf16d66788f51e GIT binary patch literal 2092 zcmZ`)TXWlF5Ivvo7o|y^*l9{y93bG>aZMofiN7CtId8kQqJBpnsb_L>x zy4A6F)FVwGRePX5QcH$vwn}x|(#=*yAZDoj=Lzk5^{C!xTUtjT?K*dD-6(BXmij|Y z@7VN@*Y%dE+Fgr)OXGZ2eOYd{y9b6=sWL9Is++o96)5L?4qh2&Z|?i9Jd~w|KWJ?{tTX-Yz}Xj~k4&$h_OsOi3kSYaP4K zcX~`l0i~tcTLT4WavtSj4U_b$oys`D(=DHpv;CkmS{BAXd4Ymy;<}u74<&wQPkpGF z>{K7cDQerawU%a)p3)hrJv~NuDQS{!XN&KH3td2L3j|e@N>0>mwej$_dh7@s#U~W8 z-tJlrZA+J3P&{$3$U#$Z8J`MFJ3}|jUBN}Xq+k{o6wKj56rU-mV^6{7*jI1|Uqo?N z!9Cn(%Br$r8(rOCUln|buQ+B2$6cPj=D1{w)vSVV@U6UHMF+^SqA}wj zFf{<)J$Rrs?4c`nP^m*sYUcV5I8mC2+L3RFz+%onNiI~y|E72^QbcVwHw;5y&TEVV zx7juf=GNP0W$7LXbo9s6m08(?^MeY#E(=5-sYX}ZJru~~w*A97n1hIVe5{#Gf#SFc z@V#d)M^8@<(EKps=;I*gQBL1bT95BYvSAf`FV7%Z%x=30u)wchhTq2^f1D6n$RTl7 zjty8C_W@i&jQh)YnKsLt9~lwi`g;BeME)59cb_15f>6G2f^dHM1d;q72o;|q+C%Kl z?+(TS?L|arlZ=gHlHbl5OfcU$EMf|;@JZf9#jALYC*nI*31=tk3OKt(-UnI98_0R} zl(2CGHQ%n-!eoSGH9$F+)UPDNSXhH;%YD-O?f ek7p2T6j|1Gjj;*>{~#R2yW(#~3;yK5T>l?0B(!t@ literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class new file mode 100644 index 0000000000000000000000000000000000000000..94b5da55a312f0b8571ebb6b1f3763ffdf71058d GIT binary patch literal 288 zcmZ`!yKcfj5S%rBfN=oPAu2kc;F@$nG)SqeP=M&q<^+d~FFKnP`75eO6np?56|uHx zQe;;e?ac0swD;fZ4ZtgUAsToI&azSW}CtHHMG&@D;#yVFY=ToBWMkX06 z{n(^3+e)h|{uJHvpbNq<)<%5m&y>AZEHhaY)|k^q73CWtT${5^)w`}^{%mJQ`6VN` z@Cbu{GYGxvPGmCQi&b(|X^9aW{-P@4<^V>YnW#D7O@BZa790eOKFeT3lQF7i4=seu J2yI3O(F2lmKNkQ1 literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class new file mode 100644 index 0000000000000000000000000000000000000000..df706f8c2f493d2410bf9e94e4419ceb2b5d3887 GIT binary patch literal 1177 zcmZux*>2NN5Is&DJ6NU-StwzrEKRzFeMw76_X>p;nko<>A-SnrTsd~}QmOnEJhTV| z;<+D%IM+!@D&mKG=gyrobLNcg<3Hbj0eFZN4LOV^F_y%*iV3CCpqq~d8Iwxo?eFNM zR6d*-?;;0Olr#+Bu2}A!!F@c?nC+2<$9SURsfuS3lxfScf*A?%La{DEo_DuQ34>M3 zF;~OZrs-`Mn>Ib^s@pW|y5U*k+;PgmN6VLxuUc;Dv$fYG)+^P5aLaUp4bu;%B%}iF z%Vw}-d48~Jw3sTfEo_l;*Vs2ow&Cm$pf?rP-$I ztb|TrdJ=N|$}>nYnn7sTfu|C8iF;!72-276I?q*! zoJm}yt+xYk372`2aE0Jl1U^QBk-&O7R!zrWsXrk%;#nlVL9I39ERvCt$U=(@B@0~` zt3NQ%7#p8B!eCj>%ZEsn6JK#IpEyK19m^A*=`tBcGU5=&S=JgL;S{Ej#vC$u$)?`0 z8NqU<&7{LJjx}7xHL_Ju#dTUSB5zWLVZ@0aqJ4`$l{sd+&D#X-Fo)=Rgu8?S*BFX_ E0Y+dEM*si- literal 0 HcmV?d00001 From 8d6bf0f35f1afa5ab23d03c2e4d3bcf9aef7e2e0 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 07:36:55 -0500 Subject: [PATCH 02/11] some neg tests added --- src/test/java/io/zipcoder/StudentTest.java | 44 +++++++++++++++++- .../io/zipcoder/StudentTest.class | Bin 1177 -> 2010 bytes 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 8873364..c53085e 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -7,6 +7,19 @@ public class StudentTest { + @Test + public void testGetNotFirstName() { + String first = "Lyon"; + String last = "Hunter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + + String actual = leonHunter.getFirstName(); + Assert.assertNotEquals("first", actual); + + } + @Test public void testGetFirstName() { String first = "Lyon"; @@ -16,9 +29,38 @@ public void testGetFirstName() { Student leonHunter = new Student(first, last, scores); String actual = leonHunter.getFirstName(); - System.out.println(actual); + //System.out.println(actual); Assert.assertEquals("Lyon", actual); } + @Test + public void testSetNotFirstName() { + String first = "Lyon"; + String last = "Hunter"; + Double[] scores = {100.0, 95.0, 123.0, 96.0}; + + Student leonHunter = new Student(first, last, scores); + leonHunter.setFirstName("Leon"); + + String actual = leonHunter.firstName; + Assert.assertNotEquals("Lyon", actual); + + } + + @Test + public void testSetFirstName() { + String first = "Lyon"; + String last = "Hunter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + leonHunter.setFirstName("Leon"); + + String actual = leonHunter.firstName; + //System.out.println(actual); + Assert.assertEquals("Leon", actual); + + } + } \ No newline at end of file diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index df706f8c2f493d2410bf9e94e4419ceb2b5d3887..f73189b7c13594a0f7f8f401372fa9d48dc86bd2 100644 GIT binary patch literal 2010 zcmb`HTXWlF5Qbm*AUPh9xQ?A*3IUSRI)}y-dZ2b1oHR|^)Nu|DZavH}qqu5N#+Hf> zohknchDjM1I^5EG{tm{P@(rhJ^xB4NiTB8v z^1rt{1*L}NRDQIcb$QmUwEW1L=(gW?N3+cFj#o zv@I9w#^HzhS_@I z`DUMc?*vR*9K^Ffd)z{w^-ZHM);H|Sc{f}0Oa%2fz+${~q&lPGUfAQiPW(MVv1cQtfo@G)(D5P(mZ1hi*)I1wIx#bhdd z+xbKzpWM;@K&q20ApI+}Rwq?JCN$CoWJ5zOKo>^ycZ_!ym#)6VL^V}Pog!CF=P#6a zEI(8*!~YslJBjyLW1K>Bs3DJaOmZcQp|aIM^+;I~TbRQoDpaw7&uArh>LM=V3bWKO zfimX#|F(_{7Wg%dMOF}`OCi@)$@MzoI(T=kpD|fVpQ4aY2)^QwZ+p(HsLl`1Rj zXpL0sq}gVt_sJr(F#D@}bRw7PCh!5T}#)?GzJ3{RIZ-{c5 zQ*TW3GR8Qo8$`WH)LVqRP1Gt;SBQFt(_F=4)ML0EiQAUAEs47zac3m%=!t&Lx(QtS E7flp|&;S4c delta 434 zcmXw#%T5z<6vlru)46mqfm(EiDHpjFP|%@rQ!b_81!GJUSfCq|3KJa{t!bx;VZ$>t zvm(3#Az?#^3&Wc51g_ot28J_@oW=M5&h0zr{C{^JW%sWB{rm;Y@!IAd4=tuFrcE9h zm5&k@v&rz-sO(;LJfrgImVD?0FbQnBm`S0O5DWX++%y2*yab6%Ld zba=(4g4e$El0)@4iL|eNuHN_(d~4OBI9P8s!$z#&R8x}7YbBRq?#g+osVJiD3HB!4 z8F#{$m?0im6a<|P*Xg5QJcR+NRi$=Je_y!c>*wV2s;^(rb0%q(w0#6CInDUhH!@^P z#8a8Fh{E=N8I5-ga$n>O-ZCUiC16z68bM=OMvO8hAH6}2qGWZ(r8`|~LSBVQL6rwL D5tlwM From aa05e51ba2c87fb999182cd7c3540c8fc8714f56 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 07:44:04 -0500 Subject: [PATCH 03/11] added more tests --- src/test/java/io/zipcoder/StudentTest.java | 56 ++++++++++++++++++ .../io/zipcoder/StudentTest.class | Bin 2010 -> 2906 bytes 2 files changed, 56 insertions(+) diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index c53085e..7609658 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -63,4 +63,60 @@ public void testSetFirstName() { } + @Test + public void testGetNotLastName() { + String first = "Leon"; + String last = "Hynter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + + String actual = leonHunter.getLastName(); + Assert.assertNotEquals("last", actual); + + } + + @Test + public void testGetLastName() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + + String actual = leonHunter.getLastName(); + //System.out.println(actual); + Assert.assertEquals("Hunter", actual); + + } + + @Test + public void testSetNotLastName() { + String first = "Leon"; + String last = "Hynter"; + Double[] scores = {100.0, 95.0, 123.0, 96.0}; + + Student leonHunter = new Student(first, last, scores); + leonHunter.setLastName("Hunter"); + + String actual = leonHunter.firstName; + Assert.assertNotEquals("Hynter", actual); + + } + + @Test + public void testSetLastName() { + String first = "Lyon"; + String last = "Hynter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + leonHunter.setFirstName("Hunter"); + + String actual = leonHunter.firstName; + //System.out.println(actual); + Assert.assertEquals("Hunter", actual); + + } + } \ No newline at end of file diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index f73189b7c13594a0f7f8f401372fa9d48dc86bd2..008fd9b774c553f7544d13fb941269249618b886 100644 GIT binary patch literal 2906 zcmcJQYjfK~6oy~<9#_Q1aT?svmZr3EdNYMys2zfnI(Nru;#}(K44^oQQO1#|EN3YH ziWw$lVCeKK{3wQZC0SC9`O;v0kamyvoITHZ&#wRa`?og$9-xuL$M`aVCkYheD8AHN#rc%#Kx4P8cnEB*r4@v2v;u z+KS$ypQ-6Bxev=RSzsAE*p;z|n;XG;@gxNdN4fJ(4&%W%ZVJL{#BP75GcGV~U+xPG(3{~J zCV3}_X9SW^n(wQe75J6-jox|<>1Pf?_=NA6ZA{P&kevmX!gbChd`jn#?feE&t_0RH zp=u_)5&r{`MmUS;uZY(hkt`DSAeu$e9>lVc#h~^(MjN;9+a zO?lE?bfsJU59#g?6EWMTpo933h>wW)m{3oMSR~>s5$A|l9s=U$9-@EhvenGQ`=7dx zC|_>isjHA}k!(w3TOr#T+1AOn5#U<$q&wfK`(iNHIc^id74Fl_xlOjnwN0)%xpv95 zPp$^JUJQZjfyd>ay7TCj37_Fo@6=87$>y}=x5WF7cna~F#5*M35%F4VNiBf*f1SFA t0}%N~@ZK#c5WS0~UqJ`)gorv34I;iIqDe%Hh^IvSaR`Wyc$tOp_#eur?mYki literal 2010 zcmb`HTXWlF5Qbm*AUPh9xQ?A*3IUSRI)}y-dZ2b1oHR|^)Nu|DZavH}qqu5N#+Hf> zohknchDjM1I^5EG{tm{P@(rhJ^xB4NiTB8v z^1rt{1*L}NRDQIcb$QmUwEW1L=(gW?N3+cFj#o zv@I9w#^HzhS_@I z`DUMc?*vR*9K^Ffd)z{w^-ZHM);H|Sc{f}0Oa%2fz+${~q&lPGUfAQiPW(MVv1cQtfo@G)(D5P(mZ1hi*)I1wIx#bhdd z+xbKzpWM;@K&q20ApI+}Rwq?JCN$CoWJ5zOKo>^ycZ_!ym#)6VL^V}Pog!CF=P#6a zEI(8*!~YslJBjyLW1K>Bs3DJaOmZcQp|aIM^+;I~TbRQoDpaw7&uArh>LM=V3bWKO zfimX#|F(_{7Wg%dMOF}`OCi@)$@MzoI(T=kpD|fVpQ4aY2)^QwZ+p(HsLl`1Rj zXpL0sq}gVt_sJr(F#D@}bRw7PCh!5T}#)?GzJ3{RIZ-{c5 zQ*TW3GR8Qo8$`WH)LVqRP1Gt;SBQFt(_F=4)ML0EiQAUAEs47zac3m%=!t&Lx(QtS E7flp|&;S4c From 98d6f86cdb05f9e304611246b8e99ec737df1100 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 08:15:17 -0500 Subject: [PATCH 04/11] even more tests --- src/test/java/io/zipcoder/StudentTest.java | 57 ++++++++++++++++++ .../io/zipcoder/StudentTest.class | Bin 2906 -> 4511 bytes 2 files changed, 57 insertions(+) diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 7609658..4c2620c 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import java.util.ArrayList; +import java.util.Arrays; public class StudentTest { @@ -119,4 +120,60 @@ public void testSetLastName() { } + @Test + public void testGetNotExamScores() { + String first = "Leon"; + String last = "Hynter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + + Double[] unexpected = scores; + ArrayList actual = leonHunter.examScores; + + Assert.assertNotEquals(unexpected,actual); + + } + + @Test + public void testGetExamScores() { + String first = "Leon"; + String last = "Hynter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + + ArrayList expected = new ArrayList<>(Arrays.asList(scores)); + ArrayList actual = leonHunter.examScores; + + Assert.assertEquals(expected,actual); + + } + + @Test + public void testGetNotNumberOfExamsTaken() { + String first = "Leon"; + String last = "Hynter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + int actual = leonHunter.getNumberOfExamsTaken(); + + Assert.assertFalse(actual <= 1); + + } + + @Test + public void testGetNumberOfExamsTaken() { + String first = "Leon"; + String last = "Hynter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + int actual = leonHunter.getNumberOfExamsTaken(); + + Assert.assertEquals(4,actual); + + } + } \ No newline at end of file diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index 008fd9b774c553f7544d13fb941269249618b886..d42d5239cfc135b3b64b56ee5afee466412cd014 100644 GIT binary patch literal 4511 zcmcJR?QaxS6vm(F?(8nhK+ASpT&M^Q$QCFIf(2VBZRtDPmeSf%KxEoZ%arYI*_|yE z1w>v%qsC~AAJk~n#FuCci7AalV&W(LFZ}2q;8*pzGt-&rvVNhoX=d*|b6?KyIp^Fv zfBf_FLje2nRv6EsKZFw@3EY<#-W8#g$ZGv4C6d>F?&k3mWN;T zE(DPZVp>Arke=3!MhU)n&5#8D(ag9ep){$dwch;nsFod6M^m&!l9@3zHKb;B(YK9$ zUUizQ$rGY2R-IC3 z)kI27PjX&XPfv1+Kc$Lyf!tUot8w}A)1FbSnLPLBsBlWlq&xFzL(592DCPkN1=KMk zucqkY369jKwIMyHbAEF=oiS8H&!oA2Su&HIOibmeL&EmD%=X&jvI#O!2x1PT)iW^S z5+?~_0hiiF*J2K{)^m;KFdAJ;)LpIZvN}CrYZA_njROLoWxXyOKyL-spyUO*?%9p+gF)}x(UeMAKq%H|-1`KuV zLXSFQW{sJ6=^*wo&l#7+>1M7iof{s=bn zH=(RlQINq5lc-3FiX|>8$RZbnp&*Z01(z@@7G-WJxQsakSFlGcKPM7R!7IoqcvaZ1 zqJ^s#5k81(3a;ZdvHA@Kuj6JAw-nsQ9R+XTuGr#D3G0jaGssdQsY}o|I>it#F<^nqaSaz<7t+WQy}$mPeASBdel;+w!}H0OfJdkXxzJnQ>kTc;WX!RT9&Ss zs%C@b-gc3d$MV|l^}`}+@c3a{%uTJiixZXH5+5qO>)0-cS*y&m#45AZbla_+)m*^s zg*8w8SR%U>Lq7v*PSlNrZE>$Ci~dqh*o0X0XQ z&l>g;{FV4C@3;@?9vdat!DqlUuEI{X6>9)?p_V-fyE(bUocs_nM*`iEl4Qi!6Z{4K z5nmMY0)hi0{wP9bLyjVBHUd#7qS5;RYe#nOs=bfWdVkD6kFt6>vM$DH5!ZuFyy%3p zKHgFRl+w|4Xh1ny5JeX%P0t#w-EGf&=-{Y5^e}){>}9Kj{f&4I`?yL2*VvEedAYVA zggU;JaezAr(t{?~3oF7^BDl&6xi-+FjoiD69&Vy3BU68;E$Ah)0OnyaI@a97MP3qRGhm$FI7l z7`|B1s%s-#JK01%b&>2C*^+Gadbqls&@Hd(4j1QI#%UtBd<8MHPLmVl8X(soxrWGf zl3b_Ab!G*)8XYdT>Xs9)h;JSn7OQT3LD;O6JV!j0c%#G{C!R*UN#dPnN=|tYpH$Ty zDT2t0;IUIuAUX$2VFWG2G!ZjIoFQVCh&dwWiFk>Kb1Q(@c-p+NeVviDlLe_!Uy}F9it% z(H+Dw^FJ9x55EbUq=Jm-btL%BmZ0y6NDxJJg?xJfTMNIEz9Id$r2mdw-;@3a(*MX? g=$?nZ&!JB`^j!}9W`{oN(1&gMrRm;BElP0wKW`W&H~;_u literal 2906 zcmcJQYjfK~6oy~<9#_Q1aT?svmZr3EdNYMys2zfnI(Nru;#}(K44^oQQO1#|EN3YH ziWw$lVCeKK{3wQZC0SC9`O;v0kamyvoITHZ&#wRa`?og$9-xuL$M`aVCkYheD8AHN#rc%#Kx4P8cnEB*r4@v2v;u z+KS$ypQ-6Bxev=RSzsAE*p;z|n;XG;@gxNdN4fJ(4&%W%ZVJL{#BP75GcGV~U+xPG(3{~J zCV3}_X9SW^n(wQe75J6-jox|<>1Pf?_=NA6ZA{P&kevmX!gbChd`jn#?feE&t_0RH zp=u_)5&r{`MmUS;uZY(hkt`DSAeu$e9>lVc#h~^(MjN;9+a zO?lE?bfsJU59#g?6EWMTpo933h>wW)m{3oMSR~>s5$A|l9s=U$9-@EhvenGQ`=7dx zC|_>isjHA}k!(w3TOr#T+1AOn5#U<$q&wfK`(iNHIc^id74Fl_xlOjnwN0)%xpv95 zPp$^JUJQZjfyd>ay7TCj37_Fo@6=87$>y}=x5WF7cna~F#5*M35%F4VNiBf*f1SFA t0}%N~@ZK#c5WS0~UqJ`)gorv34I;iIqDe%Hh^IvSaR`Wyc$tOp_#eur?mYki From 8e249bd008dde4bb9024b1714fe708d0f84c0c94 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 18:03:22 -0500 Subject: [PATCH 05/11] takeExam added and tested --- src/main/java/io/zipcoder/Student.java | 8 +- src/test/java/io/zipcoder/StudentTest.java | 69 +++++++++++++++++- target/classes/io/zipcoder/Student.class | Bin 2092 -> 2369 bytes .../io/zipcoder/StudentTest$1.class | Bin 0 -> 688 bytes .../io/zipcoder/StudentTest.class | Bin 4511 -> 5896 bytes 5 files changed, 71 insertions(+), 6 deletions(-) create mode 100644 target/test-classes/io/zipcoder/StudentTest$1.class diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index f412b81..3dd9ec9 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -47,13 +47,17 @@ public void setLastName(String lastName) { // Other Methods public String getExamsTaken() { - String ans = " Exam Scores:"; + String ans = "Exam Scores:"; for (int i = 1; i <= examScores.size(); i++) { - ans += "\nExam " + i + " -> " + examScores.get(i); + ans += "\nExam " + i + " -> " + Math.round(examScores.get(i - 1)); } return ans; } + public void takeExam(Double newScore) { + this.examScores.add(newScore); + } + } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 4c2620c..c68c9cd 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -1,5 +1,6 @@ package io.zipcoder; +import com.sun.org.apache.bcel.internal.generic.ARRAYLENGTH; import org.junit.Assert; import org.junit.Test; @@ -123,7 +124,7 @@ public void testSetLastName() { @Test public void testGetNotExamScores() { String first = "Leon"; - String last = "Hynter"; + String last = "Hunter"; Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; Student leonHunter = new Student(first, last, scores); @@ -138,7 +139,7 @@ public void testGetNotExamScores() { @Test public void testGetExamScores() { String first = "Leon"; - String last = "Hynter"; + String last = "Hunter"; Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; Student leonHunter = new Student(first, last, scores); @@ -153,7 +154,7 @@ public void testGetExamScores() { @Test public void testGetNotNumberOfExamsTaken() { String first = "Leon"; - String last = "Hynter"; + String last = "Hunter"; Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; Student leonHunter = new Student(first, last, scores); @@ -166,7 +167,7 @@ public void testGetNotNumberOfExamsTaken() { @Test public void testGetNumberOfExamsTaken() { String first = "Leon"; - String last = "Hynter"; + String last = "Hunter"; Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; Student leonHunter = new Student(first, last, scores); @@ -176,4 +177,64 @@ public void testGetNumberOfExamsTaken() { } + @Test + public void testGetExamsTaken() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; + + Student leonHunter = new Student(first, last, scores); + String actual = leonHunter.getExamsTaken(); + + System.out.println("Test Of getExamsTaken() Method \n"); + System.out.println(actual); + //This empirically worked as both a negative and a positive unit test + + } + + @Test + public void testTakeExamNegative() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = {}; + + Student leonHunter = new Student(first, last, scores); + + leonHunter.takeExam(100.0); + ArrayList unexpected = new ArrayList (Arrays.asList(scores)); + ArrayList actual = leonHunter.getExamScores(); + + Assert.assertNotEquals(unexpected,actual); + } + + @Test + public void testTakeExam() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = {}; + + Student leonHunter = new Student(first, last, scores); + + leonHunter.takeExam(100.0); + ArrayList expected = new ArrayList(){{add(100.0);}}; + ArrayList actual = leonHunter.getExamScores(); + + Assert.assertEquals(expected,actual); + } + + @Test + public void testTakeExamSysOut() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = {}; + + Student leonHunter = new Student(first, last, scores); + + leonHunter.takeExam(100.0); + String actual = leonHunter.getExamsTaken(); + + System.out.println("Test Of takeExam() Method \n"); + System.out.println(actual); + } + } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index a76719dae2e47d487807da16a9cf16d66788f51e..f96371e5c4220f725b4e6de90b0afd96603ccfa0 100644 GIT binary patch literal 2369 zcmaJ?TUQ%Z6#h8 zFpd>z?ntw$;(gqe2W!%-tJpv;icJMuDl{xfvmM0;^7&yDA4#XYf*ln@_*lg*?#Yu+ zq`5E8_7pr&@ToxTz^vBnE&bRK7|b2&r+T)mTcvE?u9{Y9P9R#=o9C+WwSJs0RH{Zz zV8nH<+h#etSgq>cYci_DvrX)g%OrhE=w z85egR__jQh^sYc?xl&}}{+wwUTlM38qq?IrgY2zR(964e)s*kvX2^bMI<1(M>|^t! zz}PA~uNMtVwxZfb&2IKP)FY#SRx<3>HiN?{ujNh-zS5EA?u@ST*G!HE%vQq*gUt z!{-7+j&3{Y)9?ab)bKnK8m=Ir;0q03f)V>DXeh!^aG;@thlG^nCEY>K3XFB%f~C4y zrZO~`IHXWj$6dZ1QE{)CNHAEWXdmC7i!LbA-($=(Tl~!a#>*9n~npwTq&2C z+pJh~={qPiD4B5X8bbnF1SC$ z-SSAMP7|Go-N!-7UTUi&t=BKrTXa4#yRtl|ffa#E?FKe=n*s<|D|J~}D7BJamkHPZ zub!w~X^ny8b?Lgv^d7GAyFI}#dyqfMkQP#j&Xd}NK$7bK{bF2S!%MU;bLU$|g!sIk zc>!USXyU|HMUrkYF;oIpRQTu7d~7 z5%&y^bO(?348DOZQ%ENKnM2*dS9$~|85F>)tmZYmPAfs);8Ru_m#j4qJBQj0b=3zI zZ#8j~|H&@I0zoA^5oZK##^paL$YvO62VvCpYB3z~7#1v|Csw2zYnoUy&%ly1lC8Yi zBKJp5RH|!ZFrEwDPIwJ|kNKz2D4M>h1}+Wu(qb7+-ffEi+;#3GzHl`i8C<~kp;f(BOLpUd-^Kz&QT(EJ`#?0EY z1w&o(Ju_h@aM_g}uDQ658!m3*mW^2#w{b_I$Mc_?>C_zN z6)b1!Y2%^iVh(o|0$#4l_#PJIqTyl@>G$8wW!0BU*PD$ejr@bgqvia}V)Ope;|c#| zaJYyhEk$YC{L?N-{vxtXGVCz%m-NS7#M8*uXtcf zaRynkJhC>61DnJdU2<>>b=&kP^En(Kdj7l}PyKr_xk=N#(QY0GHFwqS*Vg3QgBF4` zBKD&CY;6q6>I_Pu&{mRDB}Y_NCi@ZA8l$$;cCAs?%KfL7j9P|tNQSnejjwXz@?~q0 z?s}jS=j;M4biGF53*6aH=*hOw8`(yPw-AnOXCM?FA}#D_p|AeJP;Y*(XJuxl9(a@u zfKQk>j4*$dqui?~>Xtm-22tY87z*N{)^Td0f+M=SB5z$7KM}Msu6|IixWr@W4+!*H AZU6uP diff --git a/target/test-classes/io/zipcoder/StudentTest$1.class b/target/test-classes/io/zipcoder/StudentTest$1.class new file mode 100644 index 0000000000000000000000000000000000000000..c9ba433310dc157afbf000a2ed59fb6cb25144d5 GIT binary patch literal 688 zcmZ`%%Wl&^6g`uKxN!|NeNtMWj{r%KFqOJXRkdo1RLRgqq9WK$>>-`vj*&gCfWKnF zLtXFz`~v@iI8M9Bf{bL}d(Yf+=iW2(`|s5+0NZFc;NZTCDXi4@-V)++v5E&S@rMo` zIam{@+cTXvUkEIRIt{+)k5L+{Ea=%HR>t;KZo5p{(MH={fz{T;toEru?SN!~nNS<` zy0{pqtS<)%k=ZbfWO6DqUB)+Htvp)5J2pmT2Z_vc#c*ZP3C%5b(&*`-k+#TKv>l$y zOBobaC&7M}$E z&(hezx`z#HdT7A)FpW(IO%IRp#KTjxDAxqFnp*;M|LIF$X##@^Sjya&AJow&c_C13 zm0J3vB4cw1IF~Xh)X95+h1TKC^kWGevnu1b+#M6)WN@w`+ikzY8t;9Ik3jf-IaTTL zn}$bwo8B?1sL(ESo_&Mp{6M8MkLpj{`i}aWuiU8M4*&HL?GI+?FJ2SiW0n!Aqr!X$ bm}6AIJdx5aVu`kfdsxO@dM;}?v|RrH$xWf+ literal 0 HcmV?d00001 diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index d42d5239cfc135b3b64b56ee5afee466412cd014..59c6d24d88184e60a01a0ec3bf7a307350277e9d 100644 GIT binary patch literal 5896 zcmcJSdvIJ;9ml^n`|RdI((R^UZ76AN>85F#R-jEcHKdO`yLqu8AymHh>Uod4I(b?Ss}~?Fc-pUr{Fa2D?m;sYUk5O)j7J>qh203QmW8TSS7;Q;Pep!Q|6dj3d8 zD-`sC0{_8uHf?k$@Wh(N6nKy1rgQ~0iF8&UEY42q`B7~$LrFN1OKF)gEuR+ew$N*w zNK;2Nk)LPm@~T5`GPU1%~G3hT09G_C$)L4 zHKS!`I4_^h&TxvCw(*<4kjmwSi5rf)Mjg!+xjsjQGI}oCTg)1IUO`%(5D2w>BXXv&a@uN=e31I z+VuU#rBA^%NkdDW z8qns^%=%+p82E-H6=0A%Ke&LC=3;u zPoZS4m`~~5X_3ygt}NXxyr*Ih_A>Vp3ptwYFC|v3lb=@RsrU#UU`|%Zc%kB>Djvi` z0enow$8lc8!#FRLGF4SPf={S;6bFR*1(CNZK8c4^JSOCi;~2G8h+_bsQt<>nEwn$W z;xqVc0H0Iw6rNV`3_dTGcvi)8V$m9UK{;bYWO|zYHuciX$Eu_0j-g2^2 zm@J(uUqLc!2ysU;^$*KTmk zzhUkX20f{3voyh~m*ryS*_;@ZVHpPvyHkjia|O^&IJXU@##&#ZbsTN`t|3-wlMxj{ z_hAcKctQ|=>!FBV!s|Qu*2=rWyKm=3DBs{i6>j3yZwf;^Spcdv0JmTt-xTcUz;zl53P)x07p}TodFvPOf*a0auUYa;k1M@d|qu@wQUc)t80MN=c1)lf+9APbc0q z@lFsg&6GUlLcCg4*INOR8^IN)q(GF7r96TbVvdM&L_AHz0uc=&&J*zr5znpxqG(yx zUiSy~PO&2mgc-#v%+8j$PegE2+#mHt{q}a}F*jTb?{4DVL%e&5cOUWYXG=MUE4XvKgqU(hpJF z4_)-btr#K2ZCq^=s{T!f_yb4=Flzqa9sp0j=v2xwVqCi5JGKjku8IpH*jnd1w}frw zr=%B2{}Sn6CjD2*@io$a9fNqqML#6z6Oz79(l<)_h@=nM^qr)4()|tz_l6CZTqWH0 zxbGF*7~Zjn81GRZ?+&0qtO+sF0 zLmuWSztRzRLPGwYkfNP+Sdbnb-OG;U);WF=O=YFKh@BPs*Ns?5ZQmu&_sH{oRO59X z(%-;V{E%!v;!lSk)3%?u%C|!@wM(Wpo2i;T(duFK*kLoZnmtUE@4gk~Ykd>tYkgZ; zzIRIU-`M2s{||Zd1b-Lp5*^Eh?dn(-_D_lZGh+Xo*uNn5FNyst?82{!@mnJO&V}7B zvD+l}EfRZ=#NK9O?~+~XrWM%MH-T+^TZw&KVlQ%(=vwjrjV)mRYw}vuez{5#LZ|8OO6TvG3s)Hh3Nae@{bRy}_MS-;VmDkg9h-bI2cp4VD= M4{`Hq=AD240WCo@t^fc4 literal 4511 zcmcJR?QaxS6vm(F?(8nhK+ASpT&M^Q$QCFIf(2VBZRtDPmeSf%KxEoZ%arYI*_|yE z1w>v%qsC~AAJk~n#FuCci7AalV&W(LFZ}2q;8*pzGt-&rvVNhoX=d*|b6?KyIp^Fv zfBf_FLje2nRv6EsKZFw@3EY<#-W8#g$ZGv4C6d>F?&k3mWN;T zE(DPZVp>Arke=3!MhU)n&5#8D(ag9ep){$dwch;nsFod6M^m&!l9@3zHKb;B(YK9$ zUUizQ$rGY2R-IC3 z)kI27PjX&XPfv1+Kc$Lyf!tUot8w}A)1FbSnLPLBsBlWlq&xFzL(592DCPkN1=KMk zucqkY369jKwIMyHbAEF=oiS8H&!oA2Su&HIOibmeL&EmD%=X&jvI#O!2x1PT)iW^S z5+?~_0hiiF*J2K{)^m;KFdAJ;)LpIZvN}CrYZA_njROLoWxXyOKyL-spyUO*?%9p+gF)}x(UeMAKq%H|-1`KuV zLXSFQW{sJ6=^*wo&l#7+>1M7iof{s=bn zH=(RlQINq5lc-3FiX|>8$RZbnp&*Z01(z@@7G-WJxQsakSFlGcKPM7R!7IoqcvaZ1 zqJ^s#5k81(3a;ZdvHA@Kuj6JAw-nsQ9R+XTuGr#D3G0jaGssdQsY}o|I>it#F<^nqaSaz<7t+WQy}$mPeASBdel;+w!}H0OfJdkXxzJnQ>kTc;WX!RT9&Ss zs%C@b-gc3d$MV|l^}`}+@c3a{%uTJiixZXH5+5qO>)0-cS*y&m#45AZbla_+)m*^s zg*8w8SR%U>Lq7v*PSlNrZE>$Ci~dqh*o0X0XQ z&l>g;{FV4C@3;@?9vdat!DqlUuEI{X6>9)?p_V-fyE(bUocs_nM*`iEl4Qi!6Z{4K z5nmMY0)hi0{wP9bLyjVBHUd#7qS5;RYe#nOs=bfWdVkD6kFt6>vM$DH5!ZuFyy%3p zKHgFRl+w|4Xh1ny5JeX%P0t#w-EGf&=-{Y5^e}){>}9Kj{f&4I`?yL2*VvEedAYVA zggU;JaezAr(t{?~3oF7^BDl&6xi-+FjoiD69&Vy3BU68;E$Ah)0OnyaI@a97MP3qRGhm$FI7l z7`|B1s%s-#JK01%b&>2C*^+Gadbqls&@Hd(4j1QI#%UtBd<8MHPLmVl8X(soxrWGf zl3b_Ab!G*)8XYdT>Xs9)h;JSn7OQT3LD;O6JV!j0c%#G{C!R*UN#dPnN=|tYpH$Ty zDT2t0;IUIuAUX$2VFWG2G!ZjIoFQVCh&dwWiFk>Kb1Q(@c-p+NeVviDlLe_!Uy}F9it% z(H+Dw^FJ9x55EbUq=Jm-btL%BmZ0y6NDxJJg?xJfTMNIEz9Id$r2mdw-;@3a(*MX? g=$?nZ&!JB`^j!}9W`{oN(1&gMrRm;BElP0wKW`W&H~;_u From 2fce039013cf32bbac22153da62a7c969cebda47 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 18:12:46 -0500 Subject: [PATCH 06/11] setExamScore added & tested --- src/main/java/io/zipcoder/Student.java | 4 +++ src/test/java/io/zipcoder/StudentTest.java | 29 ++++++++++++++++++ target/classes/io/zipcoder/Student.class | Bin 2369 -> 2597 bytes .../io/zipcoder/StudentTest.class | Bin 5896 -> 6532 bytes 4 files changed, 33 insertions(+) diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 3dd9ec9..99d16f2 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -58,6 +58,10 @@ public void takeExam(Double newScore) { this.examScores.add(newScore); } + public void setExamScore(int examNumber, double newScore){ + this.examScores.set(examNumber - 1, newScore); + } + } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index c68c9cd..be46e6b 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -237,4 +237,33 @@ public void testTakeExamSysOut() { System.out.println(actual); } + @Test + public void testSetExamNegative() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = { 100.0 }; + + Student leonHunter = new Student(first, last, scores); + + leonHunter.setExamScore(1, 150.0); + ArrayList unexpected = new ArrayList (Arrays.asList(scores)); + ArrayList actual = leonHunter.getExamScores(); + + Assert.assertNotEquals(unexpected,actual); + } + + @Test + public void testSetExam() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = { 100.0 }; + + Student leonHunter = new Student(first, last, scores); + + leonHunter.setExamScore(1, 150.0); + ArrayList unexpected = new ArrayList (Arrays.asList(150.0)); + ArrayList actual = leonHunter.getExamScores(); + + Assert.assertEquals(unexpected,actual); + } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index f96371e5c4220f725b4e6de90b0afd96603ccfa0..47ab1c647eaad18846f17ac46d9a747f4d44a620 100644 GIT binary patch delta 1140 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 M4{`Hq=AD240WCo@t^fc4 From d09c12072d5edf1c731d908ff432aa49d459cdcd Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Mon, 4 Nov 2019 18:51:34 -0500 Subject: [PATCH 07/11] getExamScoreAverage added and tested --- src/main/java/io/zipcoder/Student.java | 8 +++++ src/test/java/io/zipcoder/StudentTest.java | 32 ++++++++++++++++-- target/classes/io/zipcoder/Student.class | Bin 2597 -> 2825 bytes .../io/zipcoder/StudentTest.class | Bin 6532 -> 7156 bytes 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 99d16f2..997c2ba 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -1,5 +1,6 @@ package io.zipcoder; +import javax.xml.crypto.dom.DOMCryptoContext; import java.util.ArrayList; import java.util.Arrays; @@ -62,6 +63,13 @@ public void setExamScore(int examNumber, double newScore){ this.examScores.set(examNumber - 1, newScore); } + public Double getAverageExamScore() { + Double sum = 0.0; + for (int i = 0; i < examScores.size(); i++) { + sum += this.examScores.get(i); + } + return sum/examScores.size(); + } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index be46e6b..2bdc458 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -261,9 +261,37 @@ public void testSetExam() { Student leonHunter = new Student(first, last, scores); leonHunter.setExamScore(1, 150.0); - ArrayList unexpected = new ArrayList (Arrays.asList(150.0)); + ArrayList expected = new ArrayList (Arrays.asList(150.0)); ArrayList actual = leonHunter.getExamScores(); - Assert.assertEquals(unexpected,actual); + Assert.assertEquals(expected,actual); + } + + @Test + public void testGetAverageExamScoreNegative() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = {100.0, 150.0, 250.0, 0.0}; + + Student leonHunter = new Student(first, last, scores); + + Double unexpected = 0.0; + Double actual = leonHunter.getAverageExamScore(); + + Assert.assertNotEquals(unexpected, actual); + } + + @Test + public void testGetAverageExamScore() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = {100.0, 150.0, 250.0, 0.0}; + + Student leonHunter = new Student(first, last, scores); + + Double expected = 125.0; + Double actual = leonHunter.getAverageExamScore(); + + Assert.assertEquals(expected, actual); } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index 47ab1c647eaad18846f17ac46d9a747f4d44a620..8ddc6ed9da9a91a58f2cfb816ab1d7e677d300d2 100644 GIT binary patch delta 664 zcmZ8e%T7~K6kX@u-ky7}M+90L(Z)1JEp0-iRKR|!LiHVPW22Px;z4l(~>~)g;!v84H`ttk3CjbLjw-H2^ z7dESsMab1*c5Rse0PP8D%=lan6Ph=WWcx zQObgXywVnx;3~#1a1=N$zFwc#*pmFFm8N|Kw?5o-t4_fkU2#gee5L9#`1>N+WvA&R zicYzZ7^yTCif)QQuQf^(#9-$tjcVRKv{WRs$kiK*Zn+*;F9ddAS=RLM=1T%almyDC z2wcV$j;cTnb@@h*%{0(t@Y*UeB+$TB22ZGeKk*e@W9a-pT;MuxaNHEQh1=>uOJEgo zfjhXXw%!w1!~M5O&y>bC$cNsE9sv(*Y{EwP(ScrKJJBV-d*@g{uJRr^%foC7u{7Hz zKk^LQE=_aLh`>NpX3R08pIBTzF&}p&q0_}Wu^R`ej$@BZS_LBo3u*b(nluj3?jiZZ zinYeTu#4{djIwpALmltYo7D${(Rc8)VLeAE)`nko!8W=-!$)0SdDb-c^3T_QB3U0) zX#9$H=m--A=r^Ez10(3hC?Zr7IE+4;hRDN-?H#~AIx@wQ9HnX?MV4XuRGK;g?H4%5 OIQvN}88S4}F!2}RlYKS- delta 393 zcmWlV%}!HM6otRr+snE4aKsuYKS3HuAZTidLBjyB42)@M5iC^HD%gSwRSFa=P!wAo zn8@@z0|SP}!~p{yz`0N0K<3Vg=S;r6lC`t;&idAQ($V;Jd3Fxm<%{GxX~DE4L^`0C zj78RBM)HtZYs^_ZlH{28SrFtUinPUJpG7;L_&l{s&jbZYJI^IAShCKt#Y^iItx>W{ ztO!;GufBgRhMd>>Z>XY=-I()6pSr`{Yl?NsinqK|Y)}zwDz@0x7jC?-%8o;ed~i^z z^ed|DI)wWZNu%FW)3?LX!9Df`2Z}m}cHx8KBO{6tfRB(LW9Q^goet26WQD=iR{Lrf&Kv@0L*sqq_7TzjkdD kmpepEtM|>EW=xlZHE-OcPw3x4&P$prQ#vl=9;SoTf0MvOKmY&$ diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index c4038436cdec9bef60d475c44af33bcdac3e4a47..37c7bbbd911d3256bd3d0235b450a2706f8e6dbe 100644 GIT binary patch literal 7156 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 Date: Mon, 4 Nov 2019 19:29:53 -0500 Subject: [PATCH 08/11] Student class done --- src/main/java/io/zipcoder/Student.java | 8 +++++++- src/test/java/io/zipcoder/StudentTest.java | 16 ++++++++++++++-- target/classes/io/zipcoder/Student.class | Bin 2825 -> 3096 bytes .../io/zipcoder/StudentTest.class | Bin 7156 -> 7434 bytes 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/zipcoder/Student.java b/src/main/java/io/zipcoder/Student.java index 997c2ba..ebc506e 100644 --- a/src/main/java/io/zipcoder/Student.java +++ b/src/main/java/io/zipcoder/Student.java @@ -50,7 +50,7 @@ public void setLastName(String lastName) { public String getExamsTaken() { String ans = "Exam Scores:"; for (int i = 1; i <= examScores.size(); i++) { - ans += "\nExam " + i + " -> " + Math.round(examScores.get(i - 1)); + ans += "\n Exam " + i + " -> " + Math.round(examScores.get(i - 1)); } return ans; } @@ -72,4 +72,10 @@ public Double getAverageExamScore() { return sum/examScores.size(); } + @Override + public String toString(){ + return "Student Name: " + firstName + " " + lastName + "\n" + +"> Average Score: " + getAverageExamScore() + "\n" + +"> " + getExamsTaken(); + } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 2bdc458..0d178a6 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -186,7 +186,7 @@ public void testGetExamsTaken() { Student leonHunter = new Student(first, last, scores); String actual = leonHunter.getExamsTaken(); - System.out.println("Test Of getExamsTaken() Method \n"); + System.out.println("\nTest Of getExamsTaken() Method \n"); System.out.println(actual); //This empirically worked as both a negative and a positive unit test @@ -233,7 +233,7 @@ public void testTakeExamSysOut() { leonHunter.takeExam(100.0); String actual = leonHunter.getExamsTaken(); - System.out.println("Test Of takeExam() Method \n"); + System.out.println("\nTest Of takeExam() Method \n"); System.out.println(actual); } @@ -294,4 +294,16 @@ public void testGetAverageExamScore() { Assert.assertEquals(expected, actual); } + + @Test + public void testToString() { + String first = "Leon"; + String last = "Hunter"; + Double[] scores = {100.0, 150.0, 250.0, 0.0}; + + Student leonHunter = new Student(first, last, scores); + + System.out.println("\n Test toString() method \n"); + System.out.println(leonHunter.toString()); + } } \ No newline at end of file diff --git a/target/classes/io/zipcoder/Student.class b/target/classes/io/zipcoder/Student.class index 8ddc6ed9da9a91a58f2cfb816ab1d7e677d300d2..cc425dd719ebeb004421781e5958113eb8009eb7 100644 GIT binary patch delta 1378 zcmZ`&Sx-|@5dKcLdwV%5sS%A;ynt(K3odo577MrwsKpgjDlJ%Lkx~%c>VmkhR}&w7 zHzpdj8clpQ{twCU?%uYW#%2Cy1W4OF2;!+rxc zw75};11t`*IAq{3jT?TYy_+wDRkcP9b$J%XT*!pIBE;|MEOkXUMPW5(K zH|^zhevAmrJQW{`R}W@V-PO@_IzF;HHIR{5f~67*u}ESu7HK#qaUK^WF5;3z7MC?# zk+_O$)_1$VY82N6q+zOO%W%BMlo-XBfWr(#NWX!bR*hp;$1U8}a7W@U?y z)FSjI<@hM9pex}J2rRXFT;&aUzIB7C?nE*jMg_H|ibiIqm-vwcQ&cCBhQKn?ZSX;o z?#FVH0qcuvtq4BW7G$f*=z~KA)nJ7RTdaVD`o~Z4SXb?Y9PbgckRbjnwdqX_eJf$$)*!WKs#snn;+X#=V*nyoY@|U}! zb~3USGpK^`dVtc2$WrX0%6OGZ31c_aDEKlcj8suvlZM)? zvQIG4H0&WJO9+LoC1VkOzrqH>pCAvv$25;Ohv~e&ba>|Fbrayzz(14eotYk=8gpLQqxFc= zR7z=XKKhe8La;&iB+C#er`W(|1Szh-7Q&d*FB?SMc`3`XTj{kDCSeTQDB@qtRT6H* zT80}{VLMe3s74KI&|NK^oMlyhfc1_7193vzy(|JtYcC-uEr{|jIqR|QLiWZr**mb4 zY7~|>3(4U%$lerok)7T2jd}j-AhNE%AT?lqLf|u0p;q}Stzf>5I@IShTF4O3$F8jU z2x~Dv1pcN#`4-KT2T|l@@W_#V;HntroNr#+-yIspGwREhP{@(<&D# z-;zQb+KC~s-{r@g=PKH|!feHQ%2@UTg!0S~d21vd-?gEWJPI7dA;OsRQ}s|M&B2vU fBxx*n(w5V(sE;nUdcG4WahN)ZlgbfNHqiYSP91ct diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index 37c7bbbd911d3256bd3d0235b450a2706f8e6dbe..fc22854003cdc24c6f4a3e9abca8f2555b5f2f4e 100644 GIT binary patch literal 7434 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 Date: Mon, 4 Nov 2019 21:18:04 -0500 Subject: [PATCH 09/11] classroom constructors made --- src/main/java/io/zipcoder/Classroom.java | 17 +++++++++++++++++ src/test/java/io/zipcoder/ClassroomTest.java | 4 ++++ target/classes/io/zipcoder/Classroom.class | Bin 276 -> 494 bytes .../io/zipcoder/ClassroomTest.class | Bin 288 -> 739 bytes .../io/zipcoder/StudentTest.class | Bin 7434 -> 7435 bytes 5 files changed, 21 insertions(+) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index 64566f0..d9fc421 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -1,4 +1,21 @@ package io.zipcoder; +import java.util.ArrayList; +import java.util.Arrays; + public class Classroom { + ArrayList students; + + public Classroom(int maxNumberOfStudents){ + this.students = new ArrayList<>(maxNumberOfStudents); + } + + public Classroom(Student[] classroom){ + this.students.addAll(Arrays.asList(classroom)); + } + + public Classroom(){ + this.students = new ArrayList<>(30); + } + } diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 7bac1ff..5338cfb 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -1,4 +1,8 @@ package io.zipcoder; +import org.junit.Assert; +import org.junit.Test; + public class ClassroomTest { + } diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index e3e3105f62ae6cfc0804ea21349da326cbeab864..0b63f4a1cb822a9f0360968a42f18b9768c35651 100644 GIT binary patch literal 494 zcmZvY%}&BV6ot=}N@+!Y1ypq54v4WEcMuXoVnR}7fgy1@l!`-2Yo=49zLg6@qKOaS zLm6*@5KUP0&YatGzV_blpN}s97dWwyM%6&gf`$VVJ2*6OWT4KFiBvrC0u?b-oEd-O zcC3VNUrNbe91*EDgEOs(d)&AjoK93?9hI7J~=lpqv8QiZw zOMcd8u!dnQUGGXH@Z2VIo=ljVU`=m5fegUYXZ&CmN delta 137 zcmaFIJcUW=)W2Q(7#J8#7zDT&m>GE48Ti;4_!$}4Y%=pQOY9gKm^CK$1yB4f$IQaO zI@yL%JD5R{feEM*1Q>x3C=4XofINLLpMil@YdZtuMxX!_13Qpp0}3+$HE;k)9x$7g Rfs=s?$YW&S29it+JOI#Q4y6D9 diff --git a/target/test-classes/io/zipcoder/ClassroomTest.class b/target/test-classes/io/zipcoder/ClassroomTest.class index 94b5da55a312f0b8571ebb6b1f3763ffdf71058d..a21cd41c7d56f71f9609422b8ec58a5290d64456 100644 GIT binary patch literal 739 zcmZuvTWb?R6#gdntgDS}W3{bX?@6m&5Pk9jAtoNR}5!e&QjX9fH24-&+R zfz+Pl&|(OtH)P@p znF@$KfopGz%;}jL>0Fb>Aj^!CP7_$56B|2;rUl!H=B0yorm%^6t;-JnBepx0pJa#& z2nD(e>3iqB5clz*iC&04wwu@q@eq&5V`0WwR~?TWr81jD2ji(q*l4Y{=ZD+MU2&u` zN3z|xj4GT?qk*;ZbF9l@tt>DzKi4PR0awHsbk5rx@sOUVY@C2wv~)@ApUC za+^QFp9+NUl=3295w)PMZ=XVZE!~$W8>O*GE48Ti;4_$QjCOcr5OVq;-oWn_??ctCV=GoyGg zgCYYHPz?w$0wGWmNU{NW`d~f-1FP0{2F8s*0VW1^Ajt+4W&mp70FpdlHY)=s0~e6T L$iNLGnHYEg>pu+0 diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index fc22854003cdc24c6f4a3e9abca8f2555b5f2f4e..dfa0c81cab56843ff14304443fedd35831c616bb 100644 GIT binary patch delta 15 WcmeCO>bBaD#mc0}wKayC9#mcC#Ifr$=H~=NA1f&1} From de97f41d83282fff42f0b9c2226df18bf698b85a Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Wed, 6 Nov 2019 08:42:45 -0500 Subject: [PATCH 10/11] getAverageExamScore added --- src/main/java/io/zipcoder/Classroom.java | 17 ++++- src/test/java/io/zipcoder/ClassroomTest.java | 70 ++++++++++++++++++ src/test/java/io/zipcoder/StudentTest.java | 6 +- target/classes/io/zipcoder/Classroom.class | Bin 494 -> 1751 bytes .../io/zipcoder/ClassroomTest.class | Bin 739 -> 2690 bytes .../io/zipcoder/StudentTest.class | Bin 7435 -> 7456 bytes 6 files changed, 89 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index d9fc421..f87e480 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -4,8 +4,9 @@ import java.util.Arrays; public class Classroom { - ArrayList students; + ArrayList students = new ArrayList<>(); + //Constructors public Classroom(int maxNumberOfStudents){ this.students = new ArrayList<>(maxNumberOfStudents); } @@ -18,4 +19,18 @@ public Classroom(){ this.students = new ArrayList<>(30); } + //Get Methods + public ArrayList getStudents(){ return this.students; } + + public Double getAverageExamScore(){ + Double sumScores = 0.0; + Double sumExams = 0.0; + for (int i = 0; i < students.size(); i++){ + Student kid = students.get(i); + sumExams += kid.getNumberOfExamsTaken(); + sumScores += (kid.getAverageExamScore() * kid.getNumberOfExamsTaken()); + } + return sumScores/sumExams; + } + } diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 5338cfb..7bad5d8 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -3,6 +3,76 @@ import org.junit.Assert; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; + public class ClassroomTest { + @Test + public void testGetStudents(){ + Double[] s1Scores = { 100.0, 150.0 }; + Double[] s2Scores = { 225.0, 25.0 }; + + Student s1 = new Student("student", "one", s1Scores); + Student s2 = new Student("student", "two", s2Scores); + + Student[] cohort = {s1,s2}; + Classroom testClass = new Classroom(cohort); + + ArrayList expected = new ArrayList<>(Arrays.asList(cohort)); + ArrayList actual = testClass.getStudents(); + + Assert.assertEquals(expected,actual); + } + + @Test + public void testGetNotStudents(){ + Double[] s1Scores = { 100.0, 150.0 }; + Double[] s2Scores = { 225.0, 25.0 }; + + Student s1 = new Student("student", "one", s1Scores); + Student s2 = new Student("student", "two", s2Scores); + + Student[] cohort = {s1,s2}; + Classroom testClass = new Classroom(cohort); + + Student[] unexpected = {s1,s2}; + ArrayList actual = testClass.getStudents(); + + Assert.assertNotEquals(unexpected,actual); + } + + @Test + public void testGetAverageExamScore(){ + Double[] s1Scores = { 100.0, 150.0 }; + Double[] s2Scores = { 225.0, 25.0 }; + + Student s1 = new Student("student", "one", s1Scores); + Student s2 = new Student("student", "two", s2Scores); + + Student[] cohort = {s1,s2}; + Classroom testClass = new Classroom(cohort); + + Double expected = 125.0; + Double actual = testClass.getAverageExamScore(); + + Assert.assertEquals(expected, actual); + } + + @Test + public void testGetNotAverageExamScore(){ + Double[] s1Scores = { 100.0, 150.0 }; + Double[] s2Scores = { 225.0, 26.0 }; + + Student s1 = new Student("student", "one", s1Scores); + Student s2 = new Student("student", "two", s2Scores); + + Student[] cohort = {s1,s2}; + Classroom testClass = new Classroom(cohort); + + Double unexpected = 125.0; + Double actual = testClass.getAverageExamScore(); + + Assert.assertNotEquals(unexpected, actual); + } } diff --git a/src/test/java/io/zipcoder/StudentTest.java b/src/test/java/io/zipcoder/StudentTest.java index 0d178a6..b1cd8b2 100644 --- a/src/test/java/io/zipcoder/StudentTest.java +++ b/src/test/java/io/zipcoder/StudentTest.java @@ -101,7 +101,7 @@ public void testSetNotLastName() { Student leonHunter = new Student(first, last, scores); leonHunter.setLastName("Hunter"); - String actual = leonHunter.firstName; + String actual = leonHunter.lastName; Assert.assertNotEquals("Hynter", actual); } @@ -113,9 +113,9 @@ public void testSetLastName() { Double[] scores = { 100.0, 95.0, 123.0, 96.0 }; Student leonHunter = new Student(first, last, scores); - leonHunter.setFirstName("Hunter"); + leonHunter.setLastName("Hunter"); - String actual = leonHunter.firstName; + String actual = leonHunter.lastName; //System.out.println(actual); Assert.assertEquals("Hunter", actual); diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 0b63f4a1cb822a9f0360968a42f18b9768c35651..3a5ab1c780d9f34af3f198206bc0f3e77f51e144 100644 GIT binary patch literal 1751 zcmZ`)TXWlF5Ivu7N)$EDJ*0`#5_)ki#8ASm4uRmb;MQph4#`lMVH8_6Y80y@%bC(= zX80ex@Cq~FWXcS~Gk=8tz(dPfNlxsJI+J`_?d9yA-TmZ$o9ziSt>n*lyve{kZ1VEw4}w0gD?9&8*u^ z+uu+~<;#nEe3a;-kgeEF>t6fl!18v@1BaTiid!?CJ=3%0JyNFp?`_sK-3MQC%vQ^D z-6O(}ADK@=n4O1FTKcQ9!c6{~zNl_dQp8}b3!yL-@1~H%^NVrxS;%U< z<<*TDC-CO6<(UoZ))VunT63kl6I~d`Y&Hs8ZkxRzdh*b&%Xs3tOu9BHwb~&D>5qjq z_CpNNK@!n^q3WBp!)^0%&}9v`6!faw_G;E`TShT_*5Osz2Ln@BV5?(x!@wBE#Xha! zwt>&^xq&k75YoV1R19q6o`D_QXLwBQ2EM?T2CCTA@Rfl*alVG@WZLU|R*k|)P(wg$ z=irf5^ZQg`ySl3LEhgoR*^*sWxXQJ78Kl@d)M({1X1%`YII>4Q6EC@r!>qR3EG|A! z(2h-~ZS6c{!TGHSq`&K_mi?3+6S*B!srr(iTK1HSjZU5y=!%?Ozkw;#U=`y*7nHHinqFn$P<1 zDF!NXY$rEzg4n^}&nStM>p=e-LpM_^9T+n-Tm<;|ktH9*b;@-0&rOC8geo mQySl487pL?;{iQa*o9Tvvq(ILp`pM(^&jrg;Vr5Yc>8~-HhK;K delta 202 zcmXAiOAY~H5QM+^|1rNA&+!;<2`eVCa}8T!<0{S|a}o=YkT`$~h%-nWL6ouR>Z
    E3J z-iT+M?d|38_#ilk=#7F&vU=e=YDVc&%b~C1>ke&aa>1UK|#)!8Q?FD z2)>l_n}54ca=v=QA3SjHP%sn2Yz%X8BrqStf`YH&xP(OokK_0n#W;GfBqGaktl%4Q z`Bu(9%e(0!zAERljanrIYZByXqh>e{CA6i7)+Iz|%q?9)XVIwX%k|w&-CEN&tBiCP z&5BlC*DOOk`@yL5+^{8FD;j3z*x0Ku*UHRPHQTmKb9YU*og8a9yf5fZ$*FJYHHY(K z_E@Q6S~`b48^s;%K+9CM+ID8vtg|*#V)l4rLc|`EaJgv#zYym|>~VHbF`t{3BcXTW z9n(650#}xVRMVV5t5{S&+|w(Lz9rUkMb#annkiV8c2qRnR%ET>)U_&?YNm0t*B~;| zDs#GN&4&DkTvJ`G*BoP4UpH)ntru!F)6pEmtPxFD(X_TRJ9TbP#z)!hqg*yaG~@N! znevoBqi~>G+O|G-sO`EW#Rj$jef6y1`HXnUtXma*-f;InKqa({idqTWKtFZ9T{nU6 zKr8ixP2o2!L9sm>&~Ro=7bU*u(D~IQ^>9M4oS5>2)mrR`f^q^sU_(rKn!u0vNx`!O zeg>s&ic1CDOtocM(M6N?mCYUQJ_R0V)w;g&3-zRDhgw0)rbE$^V;QyW-1$fgV~Yc( zrdzvIyz@w&xsE1~HCuR3!XWd`Kzm|yzC1U>x2Woib7M1RwaTXGr<|z&(RTP0rqbc` zu+6*9j90L2U7W21&ol>f`?No0-3lY{#k7#eH9NgTI<}G9Llx)EmTagAe+kf!K7J&{ zuN{)G8?OU=%J43U=WF|*MvXo`94#r-#|A|Ps zEs3@_XfKtcNyuVQY=mQta9j+QPLU{gU+BJg`vjfK{zKOYAF@$qB+6}fSVN7LvhAn1 zR94$h(4Cb}(Zk^zBu{WTtElp8^k!qKqOx{M=x%d$5A)LxTtEsJF^Vqa#7CXq@+U~r z!@bz&n?tDh4OiXXo_hNI-cm4-#t?fP#VUq5im<{QZexV?7jYkVIEu1bnlm!&zJgD1 z7h~kLk4}tZf`2WCi1ANpg4cW0(#sm&yUF0)B;VcVJ3)DhcL@&yrei+SR}FX{kZCjR zW~f)*hT2DT*V%SIkqi*VO=1`%fLpML21%L*P4v!9VpM388W=fF2~7mf(-AG z;UpPO;RP*VF?xjQ5X0kuVI^Q#3>ZEN7>)%D2Lgs-C1K1Lt}&;{&~h10pEKVV?@#RG z_dn1riMg%|6U&oWfj!NT%`Az{lh^`@EwZo2?5Id$OCNw(mizE-Vh`!^2p;_h7Z)fQ delta 461 zcmZusO-lk%6g_X851pCH)X7pSQ!7U+F>)0xqLt<{gqDL2H6aenJcELWf|e~}enH!I zL1Yy41Ns~NkLZpCZMutl-n;kQbMC!1KBdOT*XuigEo`VzkyVgWAz(g6X+gyz@)C8! z&{Zs|}5xL`R=wz_<1^%+<* z(1d#MAQWT`I)f2hF(acx!?KPQtSTt$Fi}xZ)v<>4z>U=R#d6c^kfhItJ$t}?8f%|e zr&evqoqlcC^Q^PBmhDh0L2KQp=QYyDvW`{0`(Y0X+V6=fwd4hg5 zLPjW6MqrQQ_9SI_T$C|I?~qCa#4%0Ckf4e%9=0JOLbdE0gu}Q#LZn@Ng7^$+Cj~io y^MdH%pJsyCpe0nY4>dBR5$flEG=B9}a!DdJ_KCs340)xA6>c<3$S_A)K;|20OGQ!u diff --git a/target/test-classes/io/zipcoder/StudentTest.class b/target/test-classes/io/zipcoder/StudentTest.class index dfa0c81cab56843ff14304443fedd35831c616bb..3f2e477757d7175ff1885879a60913143e3d7af9 100644 GIT binary patch literal 7456 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 Vc^Dx=9wOWb#6NFpd@Ex9`5&9+KBNEu From 73f020dec4e2285d7e56662bf93c74ec8c9ed222 Mon Sep 17 00:00:00 2001 From: MannyMonocle Date: Wed, 13 Nov 2019 20:31:05 -0500 Subject: [PATCH 11/11] submitting --- src/main/java/io/zipcoder/Classroom.java | 38 +++++++ src/test/java/io/zipcoder/ClassroomTest.java | 93 ++++++++++++++++++ target/classes/io/zipcoder/Classroom.class | Bin 1751 -> 2994 bytes .../io/zipcoder/ClassroomTest.class | Bin 2690 -> 5279 bytes 4 files changed, 131 insertions(+) diff --git a/src/main/java/io/zipcoder/Classroom.java b/src/main/java/io/zipcoder/Classroom.java index f87e480..270cfe0 100644 --- a/src/main/java/io/zipcoder/Classroom.java +++ b/src/main/java/io/zipcoder/Classroom.java @@ -22,6 +22,14 @@ public Classroom(){ //Get Methods public ArrayList getStudents(){ return this.students; } + public String[] getStudentFirstNames(){ + String[] names = new String[students.size()]; + for(int i = 0; i < students.size(); i++){ + names[i] = students.get(i).getFirstName(); + } + return names; + } + public Double getAverageExamScore(){ Double sumScores = 0.0; Double sumExams = 0.0; @@ -33,4 +41,34 @@ public Double getAverageExamScore(){ return sumScores/sumExams; } + public void addStudent(Student guy){ + students.add(guy); + } + + public void removeStudent(String firstName, String lastName){ + for (int i = 0; i < students.size(); i++){ + if (students.get(i).getFirstName().equals(firstName) && students.get(i).getLastName().equals(lastName)){ + students.remove(i); + } + } + } + + public Student[] getStudentsByScore(){ + Student[] rankings = students.toArray(new Student[students.size()]); + Student placeholder; + + for(int w = 1; w < students.size(); w++){ + for(int i = 0; i < students.size() - w; i++){ + if(rankings[i].getAverageExamScore() > rankings[i+1].getAverageExamScore()){ + placeholder = rankings[i+1]; + rankings[i+1] = rankings[i]; + rankings[i] = placeholder; + } + } + } + + return rankings; + } + + } diff --git a/src/test/java/io/zipcoder/ClassroomTest.java b/src/test/java/io/zipcoder/ClassroomTest.java index 7bad5d8..30b2f12 100644 --- a/src/test/java/io/zipcoder/ClassroomTest.java +++ b/src/test/java/io/zipcoder/ClassroomTest.java @@ -75,4 +75,97 @@ public void testGetNotAverageExamScore(){ Assert.assertNotEquals(unexpected, actual); } + + @Test + public void addStudentPositiveTest(){ + Classroom classroom = new Classroom(10); + Double[] examScores = { 100.0, 150.0, 250.0, 0.0 }; + Student s1 = new Student("Leon", "Hunter", examScores); + + Integer preEnrollmentsize = classroom.getStudents().size(); + classroom.addStudent(s1); + ArrayList postEnrollment = classroom.getStudents(); + + Integer[] expected = {0,1}; + Integer[] actual = {preEnrollmentsize, postEnrollment.size()}; + + Assert.assertEquals(expected,actual); + + } + + @Test + public void addStudentNegativeTest(){ + Classroom classroom = new Classroom(10); + Double[] examScores = { 100.0, 150.0, 250.0, 0.0 }; + Student s1 = new Student("Leon", "Hunter", examScores); + + Integer preEnrollmentsize = classroom.getStudents().size(); + classroom.addStudent(s1); + ArrayList postEnrollment = classroom.getStudents(); + + Integer[] expected = {0,0}; + Integer[] actual = {preEnrollmentsize, postEnrollment.size()}; + + Assert.assertNotEquals(expected,actual); + } + + @Test + public void removeStudentPositiveTest(){ + Double[] s1Scores = { 100.0, 150.0 }; + Double[] s2Scores = { 225.0, 25.0 }; + + Student s1 = new Student("one", "one", s1Scores); + Student s2 = new Student("two", "two", s2Scores); + + Student[] cohort = {s1,s2}; + Classroom testClass = new Classroom(cohort); + + testClass.removeStudent("one","one"); + + Assert.assertEquals(1,testClass.students.size()); + + } + + @Test + public void removeStudentNegativeTest(){ + Double[] s1Scores = { 100.0, 150.0 }; + Double[] s2Scores = { 225.0, 25.0 }; + + Student s1 = new Student("one", "one", s1Scores); + Student s2 = new Student("two", "two", s2Scores); + + Student[] cohort = {s1,s2}; + Classroom testClass = new Classroom(cohort); + + testClass.removeStudent("one","one"); + + Assert.assertNotEquals(2,testClass.students.size()); + } + + @Test + public void getStudentsByScoreTest(){ + Double[] scores1 = {1.0}; + Double[] scores2 = {2.0}; + Double[] scores3 = {3.0}; + Double[] scores4 = {4.0}; + Double[] scores5 = {5.0}; + Double[] scores6 = {6.0}; + + Student s1 = new Student("1","1",scores1); + Student s2 = new Student("2","2",scores2); + Student s3 = new Student("3","3",scores3); + Student s4 = new Student("4","4",scores4); + Student s5 = new Student("5","5",scores5); + Student s6 = new Student("6","6",scores6); + + Student[] cohort = {s4,s3,s2,s1,s6,s5}; + Student[] expected = {s1,s2,s3,s4,s5,s6}; + Classroom cohortSorted = new Classroom(cohort); + Student[] actual = cohortSorted.getStudentsByScore(); + + Assert.assertEquals(actual,expected); + + } + + } diff --git a/target/classes/io/zipcoder/Classroom.class b/target/classes/io/zipcoder/Classroom.class index 3a5ab1c780d9f34af3f198206bc0f3e77f51e144..84f6d7e4c3bb6ecdc84274743880f8f2011614a4 100644 GIT binary patch literal 2994 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 U!}M2FQ^!~!H|9;1Bz&0p54{pR;Q#;t delta 928 zcmb`^O-~a+7zgnGEZgpO7}Q3wZA@`nL|arAC;}Fgl{ZCEk#`g=3lbv|jU>Ka5cmWz z@n{TZPlkgD2jkhJU&Djn!1&DWW{MY2?qOb@nP>Jl&wMOy);r&S?|%i*fn|=9@GM-3 zdvg?^kHbL!wv!zjurX+3h(lo5##IZ~IFcB#aGm1@Mmdh+ri$F+xQ#K@+=+V?FFGWN z@witGCa^GJVRA3SvWDC;^CukS7>=y?FMW5_fBMKBeD-2-by;8v)AE~HsBthOf0_>U zv+__Z-83g~7xx4l%nRJd0}B;_1^5Dss#(HAhK%%CX75LAmsOBM1Kmn}F)+%?QJbfk zOFdK3<}YBMX<(p{+ISF5;1rETxB*Q#O*4iwlx(PER;I%e6niIkMM177Yvl}Ym8C?U zHOlFPyRNe5!yQp}3Xf4hkxpsBIGSl>pa(-Zi*u;K2)b~dMkZ!yR}0}{bdxMv(MF=@ zIE;3bsC2Jk(>s-@y+D6BPG^K`oqDa4*1C?-qPj>o^$Zt7woLOK;(g)=c^jIyqInaV zH>`Qxnpf1khKRRDyfTq3y!nf#$`?igRMo_3p(jGU7ah8OW?j9Vik?FLsy*m@tDQ^Q zIjWs~+S#U^dF@O^&L=?`d&#*LID1v8swzTV(hr