Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified bin/TennisGame.class
Binary file not shown.
Binary file modified bin/TennisGameTest.class
Binary file not shown.
4 changes: 2 additions & 2 deletions src/TennisGame.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 ;
}
}
102 changes: 102 additions & 0 deletions tests/TennisGameTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,106 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr
// This statement should cause an exception
game.player1Scored();
}
@Test
public void testTennisGame_Player1advantage() throws TennisGameException {
TennisGame game = new TennisGame();

game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player1Scored();

String score = game.getScore();
assertEquals("Advantage for player 1", "player1 has advantage", score);

}

@Test
public void testTennisGame_Player2wins() throws TennisGameException {
TennisGame game = new TennisGame();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player2Scored();
game.player2Scored();

String score = game.getScore();
assertEquals("Player 2 wins", "player2 wins", score);
}

@Test
public void testTennisGame_Player2advantage() throws TennisGameException {
TennisGame game = new TennisGame();

game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player2Scored();

String score = game.getScore();
assertEquals("Advantage for player 2", "player2 has advantage", score);
}

@Test
public void testTennisGame_Player1wins() throws TennisGameException {
TennisGame game = new TennisGame();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player2Scored();
game.player1Scored();
game.player1Scored();

String score = game.getScore();
assertEquals("Player 1 wins", "player1 wins", score);
}

@Test
public void testTennisGame_40_love() throws TennisGameException {
TennisGame game = new TennisGame();

game.player1Scored();
game.player1Scored();
game.player1Scored();

String score = game.getScore();
assertEquals("40 - love", "40 - love", score);

}

public void testTennisGame_30_15() throws TennisGameException {
TennisGame game = new TennisGame();

game.player1Scored();
game.player1Scored();
game.player2Scored();

String score = game.getScore();
assertEquals("30 - 15", "30 - 15", score);

}

public void testTennisGame_15_40() throws TennisGameException {
TennisGame game = new TennisGame();

game.player1Scored();
game.player2Scored();
game.player2Scored();
game.player2Scored();

String score = game.getScore();
assertEquals("15 - 40", "15 - 40", score);

}
}