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/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a..c279e27 100644 Binary files a/bin/TennisGame.class and b/bin/TennisGame.class differ diff --git a/bin/TennisGameTest.class b/bin/TennisGameTest.class index b202db2..40cb5e6 100644 Binary files a/bin/TennisGameTest.class and b/bin/TennisGameTest.class differ 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 new file mode 100644 index 0000000..b71f328 --- /dev/null +++ b/tests/TennisGameTest2.java @@ -0,0 +1,25 @@ +import static org.junit.Assert.*; + +import org.junit.Test; + +public class TennisGameTest2 { + + @Test + 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"); + } + +}