From cfbc303d44686792e07dbb8ef557723b534f13c6 Mon Sep 17 00:00:00 2001 From: cshaji18 Date: Wed, 19 Sep 2018 18:07:11 +0300 Subject: [PATCH] Assignment Finished --- bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1393 -> 3035 bytes src/TennisGame.java | 4 +- tests/TennisGameTest.java | 102 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 104 insertions(+), 2 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..72450977ece520910a5bc96d3befd388de29f454 100644 GIT binary patch delta 31 ncmbQwH=l1qJ{#l0$pvg;yxKb$Y_~Hw3%PA$@X(n&nXLx^oInYp delta 31 ncmbQwH=l1qJ{#kb$pvg;ygEA=Y_~Hw3%PA$@X($-nXLx^oRJBo diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..b7ec74555cde3aca41ca07c6174036c61fbdcf8b 100644 GIT binary patch literal 3035 zcmb7`ZBrXn6vxl<&@3TXx&>OWz!tUgyh%t<3`Ns6rL>_SL9jlhOL7TI!-no|DD`Pt zUpVUMIOC{O#~G*U==jz**3lV1fFH{7e|I;@<^gD5WbfX4&z|!;|8wqzfB*aIA0mp- zx{sO!dTN#Fx@OL+J8YGimXBHl>fBcMR3)$KIb~^Mn`JD4j?HSiX3YuIJUp@{P|L+a zmieif+5*%{#{@c_)O2>exU<2GRdplJ1d@`4jGA9l4UNy;#TIKzGZ7$J9W^FUmxbt+ z)pW{I4aDtTDe9KC!`3uYgPXXn7cAA%3Oc-uC%3b=6kRp93Wly|y2T7#%`2Lrs1-A1 zA*UA%7W0uLkiQbZPba92Ke_|dL#G51bIeL*U<#Jukz_@Jlx1joE+$g1K&KXQ5A}|+Kjvqb-4(n)X1Gsw=&Cl^)55kH9fLifSP97 zmLq+M6*KVePwZ#dt}VTfMg%%p(Xzb5D_cpI_fw2ZJRYD4-XtBnc7%}aH_LaF00lie zVP{9AF!!&qdYL20E9(Hw)uiCyhrn;z{P9gR1n=vFo@Lqe3Nwp&%k;2{Y=0NEV_AW^ zJ<^pepy6QS7;1J;)h#v0M0!b}o_J|0Zx#&MNm34pGz-UW%JPTBpYduo~ObR;O!Dr`bg*hGS8%~YXiWY}em z-#ebZTtx#;^5&_U~CNN3=0fVyeW zjv_l>yHP|$8KP$pt%KU=S$Yl;1v-bw&GbCJZ^3N1%rNRQJaieRJq%;uDE%h!Ui$Gh z{tm{FG*!(Q1_dFih=>8i>qM+B8l}@T2I_HKUz6BXuo}X-o}wuJm~f?>9Hz@TOu9Kt zcyfp~$bpw+6u;>VyiAZPDhM*)I5I#`#~Mih`rPq;GdITspfY&Vht4Q;CUVVH^Bb} z_}>KoTi|~i{O_P6ZlWVpbi{@yhr>JK!Vx(!+yB_^GC2hiT-v|J16prbhVn_(SHy8cfh|7{=49R7yR#m|9$X( z0R9i5|2^n`ANqgf$>DJQlSkyR@Am&tP5*m%7p28&Ugt!94Bk(``zd%o1Mlb5OJCqB z{?fxXgng&K``rHS_4M}=*qS^y9>1~=<8kZ1EG;+U`3gK=Bi=XQ`4&76!1En=zJF|< zl?FWbTz$^f=ulWMRWl8NhUf=8AA;#eF#QCkpHb6a@W11)xbuJWaPgbi(P_Zd Oso$g1Yw*-WYySiOIzD#* delta 35 rcmcaD{*jC8)W2Q(7#J8#7_2sODKk&L%%a1{vWZoQiIstYiNO*8+ItBt diff --git a/src/TennisGame.java b/src/TennisGame.java index 327f284..bb112d9 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -83,9 +83,9 @@ public String getScore() { if (player1Points >= 4 && player1Points - player2Points == 1) return "player1 has advantage"; - if (player2Points > 4 && player2Points - player1Points == 1) + 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 8674eba..4249653 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -64,4 +64,106 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr // This statement should cause an exception game.player1Scored(); } + @Test + public void testTennisGame_Player1advantage() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + + String score = game.getScore(); + assertEquals("Advantage for player 1", "player1 has advantage", score); + + } + + @Test + public void testTennisGame_Player2wins() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore(); + assertEquals("Player 2 wins", "player2 wins", score); + } + + @Test + public void testTennisGame_Player2advantage() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore(); + assertEquals("Advantage for player 2", "player2 has advantage", score); + } + + @Test + public void testTennisGame_Player1wins() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + + String score = game.getScore(); + assertEquals("Player 1 wins", "player1 wins", score); + } + + @Test + public void testTennisGame_40_love() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + String score = game.getScore(); + assertEquals("40 - love", "40 - love", score); + + } + + public void testTennisGame_30_15() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + + String score = game.getScore(); + assertEquals("30 - 15", "30 - 15", score); + + } + + public void testTennisGame_15_40() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore(); + assertEquals("15 - 40", "15 - 40", score); + + } }