Skip to content

Assignment Finished #76

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
DelErr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Assignment Finished #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
240c7ee
Testing
DelErr Sep 20, 2018
0b99a51
Assignment Finished
DelErr Sep 20, 2018
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
5 changes: 5 additions & 0 deletions bin/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/TennisGame.class
/TennisGameException.class
/TennisGameTest.class
/TennisGameTest2.class
/TennisGameActualTest.class
Binary file modified bin/TennisGame.class
View file
Open in desktop
Binary file not shown.
Binary file modified bin/TennisGameException.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 @@ -77,13 +77,13 @@ public String getScore() {
return "player2 wins";
}

if (player1Points >= 4 && player1Points == player2Points)
if (player1Points >= 3 && player1Points == player2Points)
return "deuce";

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 ;
Expand Down
74 changes: 69 additions & 5 deletions tests/TennisGameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import org.junit.Test;

import jdk.nashorn.internal.ir.annotations.Ignore;
import org.junit.Ignore;

public class TennisGameTest {

Expand All @@ -20,8 +20,9 @@ public class TennisGameTest {
// "player2 has advantage"
// "player1 wins"
// "player2 wins"
@Ignore
public void testTennisGame_Start() {

@Test
public void testTennisGame_Start_LoveLove() {
//Arrange
TennisGame game = new TennisGame();
//Act
Expand All @@ -31,7 +32,47 @@ public void testTennisGame_Start() {
}

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

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

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

//win
game.player1Scored();

//Act
String score = game.getScore() ;
// Assert
assertEquals("Win not happened", "player1 wins", score);
}

@Ignore
public void testFirstDeuce() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();

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

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

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

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

Expand All @@ -45,12 +86,34 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE

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

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

@Test
public void testPlayerAdvantage() 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("Advantage is incorrect", "player2 has advantage", score);
}

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

}