From 85d2007d01ec4aa964ffce9cfc93af7632a057b9 Mon Sep 17 00:00:00 2001 From: nmarkuks18 <43221549+nmarkuks18@users.noreply.github.com> Date: Thu, 20 Sep 2018 15:54:26 +0300 Subject: [PATCH] assignment finished --- bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1393 -> 3093 bytes src/TennisGame.java | 4 +- tests/TennisGameTest.java | 137 +++++++++++++++++++++++++++++++++++++- 4 files changed, 138 insertions(+), 3 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..43217c9f9544d71d971db8972df7ae9e520c311f 100644 GIT binary patch literal 3093 zcma)->rWh27{=e>(jAt?(k+*Qg>KOzEU>c|K)IAkDQ&4sK|rc8x(>V3WpJ6rnOTZP z6Jxw4M*U)}CdPg;^_nyqt5)kRG3p;>e9qaK*|W=K{jhW9@}BqoJO z$!9b_)lx%%>gkX~hm*RYT`p{{Y37Q$meV8(Ci7`Ex2l>tdv;#d+3UK60?G2K6B4!9 zs9t)TTDDaabvu>{hOKXEtGcBl&9q_UZPnKE2C@t$H!{yEhH9|tdTdh2_FR|@|Ozu=?FEjOKX7Is9hpCtJ%wGgo357KUuP1**0|}J0VktMD25M zL05Aji$#WX1A_^JWV%YP?cBfEcgC#`L9>wVNO(b1BZ-WRsACAqAhCYZ&80UBaW(zL}Z#CYBe z`=SIWDtw6-zsMA4`E_l#&BM@@DFRJZNGRgRz;AK>>8of6*4MK}M$4p@G^>!aErC_m zcDAr~T1KK)!8$Jj9=2E1;C!)ERHku>8e${PYVQ*mXMv{?n1~)67)>Q)dKiID2MtH} z%@~(yMj{{2nAk6DIEAqD=m^K~&^4H{Ps(U&Sf)8IHhxfSg2g6bS21rqw60nqHM6Z6 zwwgtc>}l5so3!9fid9bXFXszpT05_^Q$y$~);QK3g8as4X!>sDHtV; z_2Jtj-@;7|`Eg~R2?33`vIz*l*n|#L@XFFA7ROzAnkiUr<=zcndiW2prVl6#@ z`E_{e^BBT-!x(Nj45I?W065%V1o!Tby<_)aj0F?rjB!v9s>-MsK)q(vYN0S4qXAG4 z;_!*!tAe*N?8*d<;IDu=Rn#!*X^1!)h6D{GduV8cnlOH&X?lcgDv9&sE5Q?Kn(50+ZWiUWc72=PIsP8eAG`UjE5` zE8hn1JJ_l33d|9Yxz}MnB`{y8!n~KSF0(sw){Et=MPJ_s>j$WR9jqUM^&_x;3|~J1 z=M91JU|%m)VZ8468W((ZePpA{>5iQDk#gP$r}-4TH^KWEcs~d47vTL8-hKsdzsBCZ zMg8;*&cbg6c6Npqdm`-k+b{S#Uxodq!#@5$*j+7b= 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..11cc36b 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -51,6 +51,7 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE assertEquals("Tie score incorrect", "deuce", score); } + @Test (expected = TennisGameException.class) public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException { //Arrange @@ -63,5 +64,139 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr //Act // This statement should cause an exception game.player1Scored(); - } + } + + @Test //1-0 + public void testTennisGame_Score1_0() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "15 - love", score); + } + + @Test //2-0 + public void testTennisGame_Score2_0() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "30 - love", score); + } + + @Test //0-3 + public void testTennisGame_Score0_3() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "love - 40", score); + } + + @Test //2-2 + public void testTennisGame_Score2_2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "30 - 30", score); + } + + @Test //4-2 + public void testTennisGame_Score4_2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "player1 wins", score); + } + + + @Test + public void testTennisGame_Score0_4() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "player2 wins", score); + } + + + @Test //3-4 + public void testTennisGame_Score3_4() 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("Tie score incorrect", "player2 has advantage", score); + } + + @Test //5-4 + public void testTennisGame_Score5_4() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "player1 has advantage", score); + } }