Skip to content

assignment finished #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nmarkuks18 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

assignment finished #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Binary file not shown.
Binary file modified bin/TennisGameTest.class
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/TennisGame.java
View file
Open in desktop
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 ;
}
}
137 changes: 136 additions & 1 deletion tests/TennisGameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE
assertEquals("Tie score incorrect", "deuce", score);
}


@Test (expected = TennisGameException.class)
public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException {
//Arrange
Expand All @@ -63,5 +64,139 @@ public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() thr
//Act
// This statement should cause an exception
game.player1Scored();
}
}

@Test //1-0
public void testTennisGame_Score1_0() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

game.player1Scored();

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "15 - love", score);
}

@Test //2-0
public void testTennisGame_Score2_0() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "30 - love", score);
}

@Test //0-3
public void testTennisGame_Score0_3() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "love - 40", score);
}

@Test //2-2
public void testTennisGame_Score2_2() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "30 - 30", score);
}

@Test //4-2
public void testTennisGame_Score4_2() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "player1 wins", score);
}


@Test
public void testTennisGame_Score0_4() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "player2 wins", score);
}


@Test //3-4
public void testTennisGame_Score3_4() 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("Tie score incorrect", "player2 has advantage", score);
}

@Test //5-4
public void testTennisGame_Score5_4() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

//Act
String score = game.getScore() ;
// Assert
assertEquals("Tie score incorrect", "player1 has advantage", score);
}
}