diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a..7245097 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..cf29c7e 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..bb112d9 100644 --- a/src/TennisGame.java +++ b/src/TennisGame.java @@ -83,9 +83,9 @@ public String getScore() { 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..855e57f 100644 --- a/tests/TennisGameTest.java +++ b/tests/TennisGameTest.java @@ -63,5 +63,53 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr //Act // This statement should cause an exception game.player1Scored(); - } + } + @Test + public void testTennisGame_Player1LeadsBy15Points() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + //Act + String score = game.getScore(); + // Assert + assertEquals("Player score incorrect", "15 - love", score); + + } + @Test + public void testTennisGame_Player1HasAdvantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + //Act + String score = game.getScore(); + // Assert + assertEquals("Player advantage incorrect", "player1 has advantage", score); + } + + @Test + public void testTennisGame_Player2HasAdvantage() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + //Act + String score = game.getScore(); + // Assert + assertEquals("Player advantage incorrect", "player2 has advantage", score); + } + }