From da907684976132c0341f239c099300dc2d155821 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sakari=20J=C3=A4rvel=C3=A4?= Date: Thu, 20 Sep 2018 16:41:02 +0300 Subject: [PATCH 1/2] TennisGame_Testing First commit. --- bin/TennisGame.class | Bin 1823 -> 1745 bytes bin/TennisGameException.class | Bin 285 -> 285 bytes bin/TennisGameTest.class | Bin 1393 -> 3694 bytes src/TennisGame.java | 2 +- src/TennisGameException.java | 1 - tests/TennisGameTest.java | 147 +++++++++++++++++++++++++++++++++- 6 files changed, 146 insertions(+), 4 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..238bb2c1a8e818df42a3f883b667db535107f7ce 100644 GIT binary patch delta 644 zcmb7AU279T6g_u#lP>ADakq-v*0@?V%{Fn9#CT2P4N$i zPlC*oFMfbOV1?R<1&a^9_#pT%#2?_3hG%~b{pttUJ8U}U~M6O_957&Iwz=$kUhDK#TJB%dyV<3#l$CRylCI&HNAV)Co zwfqN-cFtLv4;BpM|1jg5Oo0%oH}2nL|4G8O-|e^k1;?*<{9w^NA-Q*1a|`M0fBPuatvod|6wwD+pTw2&Y4 z$(enKavNbkdLeLtd7V$m^^4b`F$NOuG6tTacNNK67pXP3wv4!b;|=0&7w+qIuS&$5 zBBcM*#ZoTTUzd*&?<#Th48N??aka7hT`{j)?}-yvXjk$T$$$6eN}KvG43iqijy3kqED5AM0kdh!=8f($`v zGUlTjWV+{>NlgX1u;xS%q@dLAa;MORvf4pAve| zvxbnFqCl8^+iMhE@!UbDmAI2gKHE?y$uK8`hhVI Rrs+t-;V>m!r|u<`e*q}-kLmyb diff --git a/bin/TennisGameException.class b/bin/TennisGameException.class index d3bcf94f181696416666f8c5713c89dbe0555f1b..fb5ee94761f460b3c7527d971796de6557e307e4 100644 GIT binary patch delta 17 ZcmbQsG?$6v)W2Q(7#J7~H*$zF0suOt1&06t delta 17 ZcmbQsG?$6v)W2Q(7#J8#HgbqE0suO+1&ROw diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..fa0a3323418becd00088094c69a6590e3b0dad2e 100644 GIT binary patch literal 3694 zcmbVO`ES!^7=GLq;)ZaAmYWjBHrf)JrUx6e>nKpp&=yk4xpi*xk-DUIiJj8!zKCtm>3Y29YB?WMWfn;7RzczCe}ARDpIzBxt+S9+g%DO>l+3YRP8X+B8W;< zhcE|o6)a5XhUm?Y4U61>Hk=g-!U;2_We2sKF2~->Dtkn?7$8v|wL?LT&FH1KLrGi9 zG46^(dBfJn#Gr2JJf_<)Ok1;c)8Hx5#Ay0-%+Rb6GiStf!xlM1%f|FvOe-ym?adfw zPILqiRuC)&2x2j+<)t=+rC6pw%?LZ0;! zbc44X1yZp}!MvlB1EXVh~huVqPQ zOa1JSzBjH99kbs!Ze-{lPxPruMdvser4h5ZD2UCFyGI*I^=GvykvpOrZT%+Iw1ylx zhIWd4il+yACR1YEkv@P11xrd=7H6chCAu=7I;6zW5H`sqnLqACh&$(|i?C&fX6(@> zM0a{ZGi)s*RBYpBSDTi|h-O8!!jufRJ%kOPu9>rv^sEZm+7h29d;3*{zPvaLTLihC#XFL2)D^m=D71=k1$DF4@YYE$wyMbSB(HbH+f`8b!mzbj#YAb?*32|a zn)zHx?9yeE_ceh5CU}$NhjpNT{KNqB_{7fxuK|u?yequVX}k#aJRd3$}T^4x@@YRzk&U zo>zxjtaYM9+}&Ojl~L}(dPbX%YTS)`7*WB!j9iHg++W2}eGx;Whv5?s!)70bjl@y- zHSxLdlkem+F~-BKXre$D#cO9Hb?U{B2I*KF1ZEbSns9&3_Pa2$eLgb2e=u-VVm@B;E&zw~KhYiFdn$ zZK-=;5nHW?O~L&)KqUPysCtq+W$J`|U}_Ffu`MM8uB*F1i4b-}Tyyq6kKk|^b-6nE3AEV)2W$4{(93py+XoiVCMf7Q+ z7es%G=rcq=!fe!;jib!R(>?}mMF!DgHkKIdxj6%6fyW?wn+ysb+{v9e6>cqKKFU4; zm}Gv2EOKOSk-1Igc`~0M^Rr|=N#;|m%18OPJ5RCB|DjkRgQWud$`shj zJ_x)@1zsbn*Qvl8RNzf2@D>$#n+m)`1K8=T`p+&=|E@7nDUZdgB@?o}oSf1=% zPE-Gwgg+(d&)7&lX9NC%iTx#;?N`{0uW9W!wDw!{;Cr^2^XS6`+WG^IW7= 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 ; diff --git a/src/TennisGameException.java b/src/TennisGameException.java index 23fa24f..98e6149 100644 --- a/src/TennisGameException.java +++ b/src/TennisGameException.java @@ -1,4 +1,3 @@ public class TennisGameException extends Exception { - } diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 8674eba..7bb515e 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -62,6 +62,149 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr game.player1Scored(); //Act // This statement should cause an exception - game.player1Scored(); - } + game.player1Scored(); + } + @Test + public void testNoNullPoints() throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + String i = game.getScore(); + //Assert + assertNotNull(i); + } + @Test + public void testPlayer2CanHaveAdvantage()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + String i = game.getScore(); + assertSame(i,"player2 has advantage"); + //This test caused failure. Fixes done into the code. + } + @Test + public void testPlayer2CanWin53()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + String i = game.getScore(); + assertSame(i,"player2 wins"); + } + @Test + public void testPlayersCanPlayLongDeuces()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + String i = game.getScore(); + assertSame(i,"deuce"); + } + @Test + public void testPlayer1WinsWithCorrectAdvantage()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + String i = game.getScore(); + assertSame(i,"player1 wins"); + } + @Test + public void testPlayer1StaysLove()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + String i = game.getScore(); + System.out.println("PrintOfTheGetScore:"+i); + //Assert + assertEquals(i,"15 - love"); + //Act + game.player2Scored(); + i = game.getScore(); + //Assert + assertEquals(i,"30 - love"); + //Act + game.player2Scored(); + i = game.getScore(); + //Assert + assertEquals(i,"40 - love"); + //Act + game.player2Scored(); + i = game.getScore(); + //Assert + assertSame(i,"player2 wins"); + + } + @Test + public void testPlayer2StaysLove()throws TennisGameException{ + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + String i = game.getScore(); + System.out.println("PrintOfTheGetScorePlayer2Love:"+i); + //Assert + assertEquals(i,"love - 15"); + //Act + game.player1Scored(); + i = game.getScore(); + //Assert + assertEquals(i,"love - 30"); + //Act + game.player1Scored(); + i = game.getScore(); + //Assert + assertEquals(i,"love - 40"); + //Act + game.player1Scored(); + i = game.getScore(); + //Assert + assertSame(i,"player1 wins"); + + } } From 4ab779636174a24496d295ff065de8fb96ca241a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sakari=20J=C3=A4rvel=C3=A4?= Date: Fri, 21 Sep 2018 21:45:30 +0300 Subject: [PATCH 2/2] Assignment finished. --- tests/TennisGameTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 7bb515e..9136fa6 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -208,3 +208,4 @@ public void testPlayer2StaysLove()throws TennisGameException{ } } +/*It was tricky to find anything and I believe I need more detailed knowledge about that, how the unit testing should work.*/ \ No newline at end of file