From 671e8e8d27acd0f0b5dcc35f11e323c4a09b9250 Mon Sep 17 00:00:00 2001 From: vvalanne Date: Thu, 20 Sep 2018 15:08:16 +0300 Subject: [PATCH 1/2] test --- bin/.gitignore | 4 ++++ tests/TennisGameTest2.java | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 bin/.gitignore create mode 100644 tests/TennisGameTest2.java diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..972093e --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,4 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class +/TennisGameTest2.class diff --git a/tests/TennisGameTest2.java b/tests/TennisGameTest2.java new file mode 100644 index 0000000..cb6d447 --- /dev/null +++ b/tests/TennisGameTest2.java @@ -0,0 +1,12 @@ +import static org.junit.Assert.*; + +import org.junit.Test; + +public class TennisGameTest2 { + + @Test + public void test() { + fail("Not yet implemented"); + } + +} From f5228ccd21ce60539186e572830829ac7be759c6 Mon Sep 17 00:00:00 2001 From: vvalanne Date: Thu, 20 Sep 2018 16:59:28 +0300 Subject: [PATCH 2/2] Assignment 2 task 1 Finished --- bin/TennisGame.class | Bin 1823 -> 1823 bytes bin/TennisGameTest.class | Bin 1393 -> 1669 bytes src/TennisGame.java | 2 +- tests/TennisGameTest.java | 32 +++++++++++++++++++++++--------- tests/TennisGameTest2.java | 17 +++++++++++++++-- 5 files changed, 39 insertions(+), 12 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..c279e27ff7e46fb1c3a1ecaeba0700456cdc8a4c 100644 GIT binary patch delta 25 hcmbQwH=l1q8ym0o4hGxp49-Gs+Za4_CQoMT0RU)`2lxO0 delta 25 hcmbQwH=l1q8ym0A4hGxp49-Gs+Za5wCr@VU0RU*72lxO0 diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2907805d8b5bb4b6f773ec5588f796fb7a..40cb5e6e3203605fa09f11481fe2179cffb13ee6 100644 GIT binary patch delta 691 zcmajb$x0(p6b9h`Rvcnkp<`00NTfrIrp%}@&TXPLjRSFjWTP7iNud#ql8T5MUAb54 zFo$`8Y zbFWma#Im|kIsfGoQhvkikfwbyS`bnYMuUK3cPn?Gm-{pMow8oAcA^Sm=BcE*`vqXf zfIxjg-^=R)qG;Yrg@_%a0?KQgcfVLNWOQO&!8c3@$T`E%%au%Sn-KxcJQG@5vO+;t zFO`bM4F9h!S8K-2XGwF}G5MA)Ud?8PY*A5fuG*fCoV-vY+X-y^fanccRxaUAhb|C& zZ4r)Ev)0zAF1Y$!@$eNq=Zugbvkz8#Kd;jR1pzprK}9dxx#K|yUPRE182dgn^St*@ zwN@T>aA}44&;`LmO-PuJbzeyn7|LU~>N{i|%jf^ZS97WhVb{nN#{Q~&ObiUNA7-Hu zsz#|AqbkV*#Rz5@#HA-iKl{A)@;{pd{&m2c#W#t2ydjWj} z8a0|2V`*vWTlfOR0sNpbo7tV6ng7gh_saJv%Ws3nX8;B4Udu0vQf<}ST&UfqX$fu! zTepPT;fBRkAxvAf4O4XaaYLAv-v5X*si`>wR%tW%tESc9t)4J!UemjFSw;Yg7aN#n z@SS(m3*E||YNV?VGu(^KiA-*s@gT<#su_B$JFJWuf(}d9Y!3=D*JVI2_G5n)wE1PkMazXbE&1PnVg INRm+c0sv-U_5c6? diff --git a/src/TennisGame.java b/src/TennisGame.java index 327f284..8e6e2d6 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -86,6 +86,6 @@ public String getScore() { 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..ca8b549 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(); @@ -31,24 +31,20 @@ public void testTennisGame_Start() { } @Test - public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { + public void testTennisGame_EachPlayerWin4Points_Score_Deuce() throws TennisGameException { //Arrange TennisGame game = new TennisGame(); game.player1Scored(); game.player1Scored(); - game.player1Scored(); - game.player2Scored(); game.player2Scored(); - game.player2Scored(); - game.player1Scored(); game.player2Scored(); //Act - String score = game.getScore() ; + String i = game.getScore(); // Assert - assertEquals("Tie score incorrect", "deuce", score); + assertEquals("", "deuce",i); } @Test (expected = TennisGameException.class) @@ -62,6 +58,24 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr game.player1Scored(); //Act // This statement should cause an exception - game.player1Scored(); + //game.player1Scored(); + String i = game.getScore(); + assertSame(i, "player1 wins"); + } + @Test (expected = TennisGameException.class) + public void testTennisGame_Player2WinsPointAfterGameEnded_ResultsException() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + // This statement should cause an exception + //game.player1Scored(); + String i = game.getScore(); + assertSame(i, "player2 wins"); + } } diff --git a/tests/TennisGameTest2.java b/tests/TennisGameTest2.java index cb6d447..b71f328 100644 --- a/tests/TennisGameTest2.java +++ b/tests/TennisGameTest2.java @@ -5,8 +5,21 @@ public class TennisGameTest2 { @Test - public void test() { - fail("Not yet implemented"); + public void testPlayer2wins()throws TennisGameException { + // Arrange + TennisGame game = new TennisGame(); + //Act + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + //fail("Not yet implemented"); + String i = game.getScore(); + assertSame(i, "player2 wins"); } }