From dde96bc6dc6e4a4258568e88737c447f34c1db11 Mon Sep 17 00:00:00 2001 From: robroooh Date: Thu, 20 Sep 2018 22:07:33 +0300 Subject: [PATCH] Assignment Finished --- bin/.gitignore | 3 + bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1393 -> 4232 bytes src/TennisGame.java | 6 +- tests/TennisGameTest.java | 180 +++++++++++++++++++++++++++++++++++++- 5 files changed, 183 insertions(+), 6 deletions(-) create mode 100644 bin/.gitignore diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..b02130c --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,3 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..9e474972ccff734f004527bbaa3084215132f3b5 100644 GIT binary patch delta 37 tcmbQwH=l2V0~;gTWJfkV#)Xp$*u;3XcQDv)XK)sB+s5FbGkG#w4*k5iO*AG(jT&R{K@=j!7=6&FQKK>XV$`V782t;3-`~t{XJ;?Hh&*&|`GtHtVKh35&jONF6L)%-N7}pA;>UdUTB*$|}H9Mvjbbc=$ zHd-0ogh0Gfb%4=o3+m;ki4jXJSc#EjuAn8dxzo;p(b9uO!_p_TG2PS=cE~VtmTKua z!;YFOq(di*01fe627DwlYAy$DrUlf*53PP`qs5G*v}V~7j23lu$IEGtSOwik4@k6> z(c)bQsH<7UeE;8cJq5-npim$NB-3O_Z|3hMAt0Qr?chD=i{SbkDyB_qFT-wmHC zs#ySU?5dUYJaN1qsC{BrAdQM4qQ^22F#v`yZrl!7&A#QK4`@owOqZr})isczuiZeV*20#BK6 zv?AecS~00fw1?4}vaehzs*IyIO(n$_c=OnYezzai)5#>ADCHc4u|nq{Z)aVr?ny?2 zlbUSWyhA4}t-#0Su#wVIiG!M1%vz@VJz%J4XY&{jT8dGt=j(J=pmRFvYYe4MtA?ef zVZ&k9?y%xMR`iNG9)&=ujv3Wd)Y9vd2}ImT65ZnpL?#tTxB?NSN}#KL25>uJ8{|QZaT(OYUw(ERz@=UT(>=Z#hEomiT zd&Aa9G#^*k)^POUE`&3~d3Mibk}lz*ftqpTKNA+r#nJC9zu-VXG+4+d@Tx$||}U zYV)XxR?`|NGU|l#EV>2nH{!0Vh9M&u+C2&3ZTw%aS&R)LCW3y#~M zKMb}Vw1{@n650*EI4Zfv!`SIE1_a{@5984PVC0;lx3MaD0i!-+#yh8BydY{FtW#@m zy+zIA^4?0;9(yKDfHeo!JXlYG)dZ`BDN@AudIr4b@b%p1VGg>r?-aFPH17Lp;><@wcVX!{}_D3;O9>e5$9Q;quK;l1KwxB z`<%_z<^*)vS_KDfbx1x^*$qLP;RO)B2!fYD_%aAz0pY74 zd<~Ai4oBahZn}gS`liQCUJJg5Nz@~VyFG3myMgSYlkb-At;de7mfiu&6|i3g`@3Mj z2KM*B{yx}00Q-kv|7gbS$ERWcuiY%XSF0zR)6JiN|5NaP2L8{%{{{HJ1pimy{~G+? zpqsx%H-Cq2{@#(M%9BxW!D^ppvbopjg+K#w>3p4N4KkX%bV}}gk zg6&j!?NnNdmuUQwj!qasOrnh;baG^#2`5u5Q)8u}@F1p}lR?8RqHk!@@Vw&Sr@K diff --git a/src/TennisGame.java b/src/TennisGame.java index 327f284..88b648e 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -77,15 +77,15 @@ public String getScore() { return "player2 wins"; } - if (player1Points >= 4 && player1Points == player2Points) + if (player1Points >= 3 && player1Points == player2Points) return "deuce"; 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..bfe5e3f 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -20,8 +20,8 @@ public class TennisGameTest { // "player2 has advantage" // "player1 wins" // "player2 wins" - @Ignore - public void testTennisGame_Start() { + @Test + public void testTennisGame_Start_Score_love_love() { //Arrange TennisGame game = new TennisGame(); //Act @@ -30,6 +30,98 @@ public void testTennisGame_Start() { assertEquals("Initial score incorrect", "love - love", score); } + @Test + public void testTennisGame_Player1Win1stBall_Score_15_love() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player1Scored(); + String score = game.getScore(); + + assertEquals("Player1 1st score incorrect","15 - love", score); + } + + @Test + public void testTennisGame_Player2Win1stBall_Score_love_15() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player2Scored(); + String score = game.getScore(); + + assertEquals("Player2 1st score incorrect","love - 15", score); + } + + @Test + public void testTennisGame_EachPlayerWin1Point_Score_15_15() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + + game.player2Scored(); + + String score = game.getScore(); + + assertEquals("Player1,2 both 1st score incorrect","15 - 15", score); + } + + @Test + public void testTennisGame_EachPlayerWin2Points_Score_30_30() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore(); + + assertEquals("Player1,2 both 1st score incorrect","30 - 30", score); + } + + @Test + public void testTennisGame_Player1Win4Points() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + String score = game.getScore(); + + assertEquals("Player1 win 4 points incorrect","player1 wins", score); + } + + @Test + public void testTennisGame_Player2Win4Points() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore(); + + assertEquals("Player2 win 4 points incorrect","player2 wins", score); + } + + @Test + public void testTennisGame_EachPlayerWin3Points_Score_Deuce() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore(); + + assertEquals("Player1,2 win 3 balls deuce incorrect","deuce", score); + } + + @Test public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { //Arrange @@ -63,5 +155,87 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr //Act // This statement should cause an exception game.player1Scored(); - } + } + + @Test + public void testTennisGame_Player1Advantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Player1 Advantage is incorrect", "player1 has advantage", score); + } + + @Test + public void testTennisGame_Player2Advantage() 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("Player2 Advantage is incorrect", "player2 has advantage", score); + } + + @Test + public void testTennisGame_Player1Win_AfterAdvantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Player1 win after advantage is incorrect", "player1 wins", score); + } + + @Test + public void testTennisGame_Player2Win_AfterAdvantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Player2 win after advantage is incorrect", "player2 wins", score); + } }