From a9773f9e43832ec1c09573aa4e323d6c24c61d20 Mon Sep 17 00:00:00 2001 From: Bagel Date: Thu, 20 Sep 2018 16:22:28 +0300 Subject: [PATCH] Assignment Finished --- bin/.gitignore | 5 + bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1393 -> 4779 bytes src/TennisGame.java | 6 +- tests/TennisGameTest.java | 228 +++++++++++++++++++++++++++++++++++++- 5 files changed, 235 insertions(+), 4 deletions(-) create mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..ca282c9 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,5 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class +/TennisGameTestTest2.class +/AllTests.class diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..baaa974cf9555d8b82fcdc1ed1719928b2becf73 100644 GIT binary patch delta 45 zcmbQwH=l1qJ{#l0$pvg;yxKb$Y_~Hw3%PA$@X(n&naz$foFSJXf}wyRdh#tcR{%9j B4Ez89 delta 45 zcmbQwH=l1qJ{#kb$pvg;ygEA=Y_~Hw3%PA$@X($-naz$fj3JjHoS}dra`G)UR{%Ap B4Eq28 diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..e419814befe6f9043cf4f612e83419e9dda9d969 100644 GIT binary patch literal 4779 zcmbW5S#T6Z7{|X3ft@4^Nrohlkc1^5CV|ank3=vSj1UkE0Z9m#8Ya8LX5wZx?9Rq; zsNuzF)3Q zegFRY>k02%c;P$|1?Z%MN*FB~mQ_`WZR>>QhrgBqg+ z8x&R1dKt}YZ5v@!x+xlx%V{2!IcYvEU{pDvsPbT9a!ig5OJfn4kvI?yN|6yMrtrS` zvQ!&a;&3pK?zM+ejRx2Q+AHsUiz1cLEO{kJP5CxWue>-GxdXXNm9K{9VwZX};T z-N-{@A!l^?+<3PR>-?Qq=kLs3=jHkf1O>{BbzXO;Kv$rvyW*qSi}+grU1=@qCy!_#~n4F)B#}9zR zI84Ug`Q6^NE`i3eLXR{TQ2-`yv^)gd=uR@KHB-|yF2!9^Xj)P=DU6-ZKy7lezD(Cdc}cE+9z4vKQd?Zo*;ICo(EvJx+=z!%M$39^9p$w7rTN z*cDY&Ek3FXG`g9eCV`Igv#Q9Mb%{}LhAG307k1*h9i5$5_p%`GageuKhRr)-lLom-B)V)a6`_Iwhfi-8T zW{0>`Y*_m|HKr_!REk**Bv2#lHB&7u*S)xm)utB#URr1+ye*_MT1A(@Bcs*uJdZBL z`cm{-vlymKhGrW>J2>11OQ+~dXK8>vf^`A*ov>a7o3+%An`4cQso7$xGnr~_Oo2R1 zvnJE(45lQP$<`%amd@4!Dxyw2z3}e?n;%;jprzCezI7m8Z)03-F*ciwO*Y2$c^Jn{ z#)b?=?BC_$hIFnvBo9$9xHiIPA1<6tR8O02EDaWmXtLm}1@VVNtR_})RA&El4H9wVQI!LtWEBiOTj$fpC?uY)$Gi|5nTMKE!F zOpUgQ*W_Y41SSbgV_*t_=`fhW1vBl)!!%>&PfJGraGgx82E|?JT+MpTUV7y9l2!XsAki1#{}R8x0{_?G{|5Zug8w`4e-Hj2@Ky68x#=hBqMvOs zbX)p&nEJbI`p*;*gI#lbJjwl-JBD8n!>{1^4Ke(V82&&EeVZB zx>!xYF`UQ|Lj}HmtMKpUATA~T6|dm)xCCv}90{cdmHGzP?_O39-eurz1aA{~o58yR Xye&Fgong?*kykqgMUDsBm}}`?i}Wv8NP?jA4PfpeSQT{#lcW{%jKFKv&)6vzj9o`ZQ)t2 z(0kl=xh{m`>7MO~K0j*<$F)XZDwB7CqWoj&E`!>1+&1qFgzfQ`)%O|-V#r01N04FZ zx~Jb*Zt23HMRV-%2#Rw~dFq5wW=OPbOY4u5nk}fgmf?j_WeAwoz_8>;;GX%V8T@1! z`5j$NXS0u(Re|)Z#{TIY%@j%Z@1EgF^qtWT{Rp f4PrSYmLp<0CYBRoIi>r+^7Nn_#uK6a$!7f@twCG^ diff --git a/src/TennisGame.java b/src/TennisGame.java index 327f284..0092b10 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -83,9 +83,11 @@ public String getScore() { if (player1Points >= 4 && player1Points - player2Points == 1) return "player1 has advantage"; - if (player2Points > 4 && player2Points - player1Points == 1) + //The comparison operator was > + if (player2Points >= 4 && player2Points - player1Points == 1) return "player2 has advantage"; - return player2Score + " - " + player1Score ; + //This return statement was reversed + return player1Score + " - " + player2Score ; } } \ No newline at end of file diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 8674eba..067fb7f 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -20,7 +20,7 @@ public class TennisGameTest { // "player2 has advantage" // "player1 wins" // "player2 wins" - @Ignore + @Test public void testTennisGame_Start() { //Arrange TennisGame game = new TennisGame(); @@ -30,6 +30,230 @@ public void testTennisGame_Start() { assertEquals("Initial score incorrect", "love - love", score); } + @Test + public void testTennisGame_even1() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score deuce 1-1", "15 - 15", score); + } + + @Test + public void testTennisGame_even2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score even 2-2", "30 - 30", score); + } + + @Test + public void testTennisGame_1love() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 1-0", "15 - love", score); + } + + @Test + public void testTennisGame_love1() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 0-1", "love - 15", score); + } + + @Test + public void testTennisGame_2love() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 2-0", "30 - love", score); + } + + @Test + public void testTennisGame_love2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 0-2", "love - 30", score); + } + + @Test + public void testTennisGame_3love() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-0", "40 - love", score); + } + + @Test + public void testTennisGame_love3() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-0", "love - 40", score); + } + + @Test + public void testTennisGame_21() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 2-1", "30 - 15", score); + } + + @Test + public void testTennisGame_12() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 1-2", "15 - 30", score); + } + + @Test + public void testTennisGame_13() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 1-3", "15 - 40", score); + } + + @Test + public void testTennisGame_31() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-1, ", "40 - 15", score); + } + + @Test + public void testTennisGame_43() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 4-3", "player1 has advantage", score); + } + + @Test + public void testTennisGame_34() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-4", "player2 has advantage", score); + } + + @Test + public void testTennisGame_deuceAfterAdvantage2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 4-4", "deuce", score); + } + + @Test + public void testTennisGame_deuceAfterAdvantage1() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 4-4", "deuce", score); + } + + @Test public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { //Arrange @@ -62,6 +286,6 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr game.player1Scored(); //Act // This statement should cause an exception - game.player1Scored(); + game.player1Scored(); } }