From a9d389391a8f0ce5f155cf9b13e6b30ebc92aeba Mon Sep 17 00:00:00 2001 From: HeikkiMustonen Date: Thu, 20 Sep 2018 15:07:23 +0300 Subject: [PATCH 1/2] First test push --- bin/TennisGameTest.class | Bin 1393 -> 1697 bytes tests/TennisGameTest.java | 15 +++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..5a2aff2ca76f92fe07285e2d99319a93c34a738f 100644 GIT binary patch literal 1697 zcmZ`(T~`xF7=9*1b_t1M5=Ot#6M`lpP9;-*;Rm+z}WnFCPe`AA2p8!5Aj8xPWniOLfOp-}Fw8 zl;4y`9VL*jd$#NxNZ--xIG7HPoqz!K^QcvUiIC{~w&(Ne)n`37bWYWQ6F9uP>$+Yj zL&tNYtDfJsPI_cxX~ImU&(fyDa+SLp`M%lnknlTi#8wAP^vslJ0fvk*HwV!*kL*X~ei6s59R7WFGaoQ{< z?6{R|dzP?^^Uh`L66(j&I3f ziL9q>msPBqxFaz8ly!1srxfVQmK>Lp&xSIwDKOdbUML!;CvC@FE&Nk~?WEG!u2H3< z5v~0~1f;uf#Bl-ZJy|t*Z0|+Q@x9}2?0Hla97fG>_(b(=8kQNj6qsQ57n+V5)$)+I zt^S3b_aOS|E6g86`FDS!Y5K9%+?Hw`K2t%j69xkm_KkYkr9rAi@O`i6+v;;iKc_@b z>b76g@~{LxNIqup5t0MOIT~D9oQ00wdIR$nf25G%sJFoblN_`C1DtbQ@qd83DO`$A zO-1K`Um4Q?*Z;)jAKsu)zx^6TezU*BY^=P-T>b;Dmfqr{SIl8z3I)vbhDKYAsLU~X zjVKG;TSO5hT;T&*!i|VUsh>S&VPX!qvBFG6q_K)MqFc;VKD^Z4}Efu zawVqxBU5V1GYQH|jr@9kW92QjhGygm0XCdT$Q;3@38#(eQ<@o2x)@W+VFKH@M@j-! zB9GxdPir3YBewk(bJ$97(6*g@v)aP=i|o`UHu4YhpPlEpP8Pr&a@^#vEn0Y&)@;+l zdo;C5t`BJB4$62)1&?^@aYDn^K*L(BVKt#)_dhgDQq2^fsSjpR^niu1z%2#Ev@ oJ?)qLOY;4S*k3bOoqQYQyGOp?Mciik2?yM!V{U@nb)!Cc2Rj&FcK`qY delta 672 zcmZvYO=}ZT6o%hBlP@O|ZPR?&rs=ePH$#?4C$qe#-z?n1Xuk9 zBH{i4yLIPAMZq87%AGqE|ABiE-)W3SadAHGIrpCP+;>0q%`o2oc=HZG0~kF`y=hdl*YN2BPB-j^hMh3!FrZw@$Gi;psGvFpDu;R(GOvJLU3AjBSPa*uq+v zlcttl{hOxFec=2AXPcZn#i Date: Thu, 20 Sep 2018 15:41:36 +0300 Subject: [PATCH 2/2] Final --- bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1697 -> 2170 bytes src/TennisGame.java | 4 +-- tests/TennisGameTest.java | 60 +++++++++++++++++++++++++++++++------- 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..fe829ab218027825d7f7dacfd8eb1e9ed78118c9 100644 GIT binary patch delta 31 ncmbQwH=l2V0~;gTWJfkvUhN$Ww%Zw;h1|9=c<4-?%+><{i7yD) delta 31 ncmbQwH=l2V0~;gzWJfkvUY#8bw%Zw;h1|9=cxX?a%+><{iBbsJ diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index 5a2aff2ca76f92fe07285e2d99319a93c34a738f..365974722f68f08c9c15009561ac329f82e49126 100644 GIT binary patch literal 2170 zcmai!VOQH!9LE2*z#2+%Gb^x7*fLZo9W+vb4U1^U3UaJESFFe5(RxYm+H~axlN8w- zU-~)x3chhWdX68!59RT>Nt$MKJG^LalHPlt-~ahPH~;?k*FQwGK?i9{F?#DrNNIZq z{6riH&rj1hqibD$#?2m=ZS$++uCRPYS9WY^`@4+B@+%ES<9kj^WN3^gvot|h7+tN| zQheDzITr2_Kkf-edd;zTufbhgJx4Fc{f_NHp!TY2nbD*V^}6M_SemJxTjJEW9qFa% zZARCJv*Ujl-F(uQzI`GZwr4}3BBkT=V387V+_u^6gV|JNmD4nXeTVyGC`Xg(awAJO zRRPndJ^oy{>j6Sbqj!L`zGJZP_ko=q|mR zrbR#u87iJ9Tt7?i(ff?DJb0@9+~+-*v7AqA68c>peG|CeMwhTY;U1jJDd!%C^p(~b zmp*R?#Dy%~OO#d`l(xobCaTuxaL?d_MQG!2uhO@+^fdYadg0`f@eAHWoq8ntmeA-! zMiVV{8(|C$Zq|M7A~>tHZtIyTxz}-AY1+~kuH-$_c1=EPn0eTi=zLkD`;6ue(KVa* z3{R!Ouq6f;A=GG_(UfXO+?BgjR-W!K+D@7nbz;=S(KpK0i9kptcBGk%Oyx+TtSawV zq1o_f6WhY!&rP`5f$1c?xsXL9EJ_Xf>Y*uix{%MB+7Z zehMQ*3k^(UAfACRWa>`ewZy)yj$q>49HEM$Di7(zA;t%QNW&ctFRp1knHU+yiNXug z{=iL&GPtV02@|Gp&4v>&PU8vR4*WYtS8+d%r)#9+PR+lLQEl149x05oe^c(e7c^VD z_b1Kiw{V?*Nybn^$9kf904-qeJ2XQ^pf?+?j`TF>EzvUeXOzE0`L{^9m{eBk(QgIg z;5VnQjt~`s+Lu7I4D~!}TfrxwKsRur=4lmtYsg&@S2ICcj7gVb(&8ngG9q0}kPgU# zQ8!2EZU^pef^G|n_d)jnbladSqrE!`qQ#i#R!p>h3DK_+QQ-|l0}to)(g@iSO`?-~ zAbSMmD#-Rhb^x-^;M*a5`y5Wz5`=}Aa4{y_0AVUl(=Ot#6M`lpP9;-*;Rm+z}WnFCPe`AA2p8!5Aj8xPWniOLfOp-}Fw8 zl;4y`9VL*jd$#NxNZ--xIG7HPoqz!K^QcvUiIC{~w&(Ne)n`37bWYWQ6F9uP>$+Yj zL&tNYtDfJsPI_cxX~ImU&(fyDa+SLp`M%lnknlTi#8wAP^vslJ0fvk*HwV!*kL*X~ei6s59R7WFGaoQ{< z?6{R|dzP?^^Uh`L66(j&I3f ziL9q>msPBqxFaz8ly!1srxfVQmK>Lp&xSIwDKOdbUML!;CvC@FE&Nk~?WEG!u2H3< z5v~0~1f;uf#Bl-ZJy|t*Z0|+Q@x9}2?0Hla97fG>_(b(=8kQNj6qsQ57n+V5)$)+I zt^S3b_aOS|E6g86`FDS!Y5K9%+?Hw`K2t%j69xkm_KkYkr9rAi@O`i6+v;;iKc_@b z>b76g@~{LxNIqup5t0MOIT~D9oQ00wdIR$nf25G%sJFoblN_`C1DtbQ@qd83DO`$A zO-1K`Um4Q?*Z;)jAKsu)zx^6TezU*BY^=P-T>b;Dmfqr{SIl8z3I)vbhDKYAsLU~X zjVKG;TSO5hT;T&*!i|VUsh>S&VPX!qvBFG6q_K)MqFc;VKD^Z4}Efu zawVqxBU5V1GYQH|jr@9kW92QjhGygm0XCdT$Q;3@38#(eQ<@o2x)@W+VFKH@M@j-! zB9GxdPir3YBewk(bJ$97(6*g@v)aP=i|o`UHu4YhpPlEpP8Pr&a@^#vEn0Y&)@;+l zdo;C5t`BJB4$62)1&?^@aYDn^K*L(BVKt#)_dhgDQq2^fsSjpR^niu1z%2#Ev@ oJ?)qLOY;4S*k3bOoqQYQyGOp?Mciik2?yM!V{U@nb)!Cc2Rj&FcK`qY diff --git a/src/TennisGame.java b/src/TennisGame.java index 327f284..a959531 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -77,7 +77,7 @@ public String getScore() { return "player2 wins"; } - if (player1Points >= 4 && player1Points == player2Points) + if (player1Points >= 3 && player1Points == player2Points) return "deuce"; if (player1Points >= 4 && player1Points - player2Points == 1) @@ -86,6 +86,6 @@ public String getScore() { if (player2Points > 4 && player2Points - player1Points == 1) return "player2 has advantage"; - return player2Score + " - " + player1Score ; + return player1Score + " - " + player2Score ; } } \ No newline at end of file diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 24260d2..c195272 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -22,17 +22,57 @@ public class TennisGameTest { // "player2 wins" @Test - public void testScore() { - TennisGame game = new TennisGame(); - try { - game.player1Scored(); - game.player2Scored(); - } catch (TennisGameException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } + public void testScore() throws TennisGameException { + + + TennisGame game = new TennisGame() ; + game.player1Scored(); + + assertEquals("15 - love" ,game.getScore()); + } + + @Test + public void testPlayer1Advantage() throws TennisGameException { + + + TennisGame game = new TennisGame() ; + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + assertEquals("player1 has advantage" ,game.getScore()); + } + + @Test + public void testPlayer2Wins() throws TennisGameException { + + + TennisGame game = new TennisGame() ; + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + assertEquals("player2 wins" ,game.getScore()); + } + + + @Test + public void testDeuce() throws TennisGameException { + + + TennisGame game = new TennisGame() ; + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); - assertEquals("15 - 15",game.getScore()); + assertEquals("deuce" ,game.getScore()); } @Ignore