diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..ca282c9 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,5 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class +/TennisGameTestTest2.class +/AllTests.class diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a..baaa974 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..e419814 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..0092b10 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -83,9 +83,11 @@ public String getScore() { if (player1Points >= 4 && player1Points - player2Points == 1) return "player1 has advantage"; - if (player2Points > 4 && player2Points - player1Points == 1) + //The comparison operator was > + if (player2Points >= 4 && player2Points - player1Points == 1) return "player2 has advantage"; - return player2Score + " - " + player1Score ; + //This return statement was reversed + return player1Score + " - " + player2Score ; } } \ No newline at end of file diff --git a/tests/TennisGameTest.java b/tests/TennisGameTest.java index 8674eba..067fb7f 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(); @@ -30,6 +30,230 @@ public void testTennisGame_Start() { assertEquals("Initial score incorrect", "love - love", score); } + @Test + public void testTennisGame_even1() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score deuce 1-1", "15 - 15", score); + } + + @Test + public void testTennisGame_even2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score even 2-2", "30 - 30", score); + } + + @Test + public void testTennisGame_1love() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 1-0", "15 - love", score); + } + + @Test + public void testTennisGame_love1() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 0-1", "love - 15", score); + } + + @Test + public void testTennisGame_2love() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 2-0", "30 - love", score); + } + + @Test + public void testTennisGame_love2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 0-2", "love - 30", score); + } + + @Test + public void testTennisGame_3love() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-0", "40 - love", score); + } + + @Test + public void testTennisGame_love3() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-0", "love - 40", score); + } + + @Test + public void testTennisGame_21() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 2-1", "30 - 15", score); + } + + @Test + public void testTennisGame_12() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 1-2", "15 - 30", score); + } + + @Test + public void testTennisGame_13() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 1-3", "15 - 40", score); + } + + @Test + public void testTennisGame_31() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 3-1, ", "40 - 15", score); + } + + @Test + public void testTennisGame_43() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 4-3", "player1 has advantage", score); + } + + @Test + public void testTennisGame_34() 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("Score 3-4", "player2 has advantage", score); + } + + @Test + public void testTennisGame_deuceAfterAdvantage2() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 4-4", "deuce", score); + } + + @Test + public void testTennisGame_deuceAfterAdvantage1() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + //Act + String score = game.getScore() ; + // Assert + assertEquals("Score 4-4", "deuce", score); + } + + @Test public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException { //Arrange @@ -62,6 +286,6 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr game.player1Scored(); //Act // This statement should cause an exception - game.player1Scored(); + game.player1Scored(); } }