Skip to content

Assingment finished #90

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

Assingment finished #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e63e601
Assignment finished
Sep 23, 2018
483d399
Add files via upload
CalebVuorinen Sep 23, 2018
5a79782
Merge branch 'master' of https://github.com/CalebVuorinen/TennisGame_…
Sep 23, 2018
af89af2
Removed wrong file position
Sep 23, 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
3 changes: 3 additions & 0 deletions bin/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/TennisGame.class
/TennisGameException.class
/TennisGameTest.class
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.
6 changes: 3 additions & 3 deletions src/TennisGame.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,15 @@ 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 ;
return player1Score + " - " + player2Score ;
}
}
236 changes: 208 additions & 28 deletions tests/TennisGameTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,21 @@

public class TennisGameTest {

// Here is the format of the scores: "player1Score - player2Score"
// "love - love"
// "15 - 15"
// "30 - 30"
// "deuce"
// "15 - love", "love - 15"
// "30 - love", "love - 30"
// "40 - love", "love - 40"
// "30 - 15", "15 - 30"
// "40 - 15", "15 - 40"
// "player1 has advantage"
// "player2 has advantage"
// "player1 wins"
// "player2 wins"
// Here is the format of the scores: "player1Score - player2Score"
// "love - love"
// "15 - 15"
// "30 - 30"
// "deuce"
// "15 - love", "love - 15"
// "30 - love", "love - 30"
// "40 - love", "love - 40"
// "30 - 15", "15 - 30"
// "40 - 15", "15 - 40"
// "player1 has advantage"
// "player2 has advantage"
// "player1 wins"
// "player2 wins"

@Ignore
public void testTennisGame_Start() {
//Arrange
Expand All @@ -30,6 +31,199 @@ public void testTennisGame_Start() {
assertEquals("Initial score incorrect", "love - love", score);
}

@Test
public void testScoreDeuce() throws TennisGameException {
// "deuce" = 40 - 40
// Arrange
TennisGame game1 = new TennisGame();

// Act
game1.player1Scored();
game1.player1Scored();
game1.player1Scored();

game1.player2Scored();
game1.player2Scored();
game1.player2Scored();
// Assert
assertEquals("deuce",game1.getScore());
}

@Test
public void testScoreTies() throws TennisGameException {
// 15 - 15 & 30 - 30
// Arrange
TennisGame game1 = new TennisGame();
TennisGame game2 = new TennisGame();

// Act
game1.player1Scored();
game1.player2Scored();

game2.player1Scored();
game2.player1Scored();
game2.player2Scored();
game2.player2Scored();
// Assert
assertEquals("15 - 15",game1.getScore());
assertEquals("30 - 30",game2.getScore());
}

@Test
public void testScoreAdvantages() throws TennisGameException {
// game1 "player1 has advantage"
// game2 "player2 has advantage"
// Arrange
TennisGame game1 = new TennisGame();
TennisGame game2 = new TennisGame();

// Act
game1.player1Scored();
game1.player1Scored();
game1.player1Scored();
game1.player2Scored();
game1.player2Scored();
game1.player2Scored();
game1.player1Scored();

game2.player2Scored();
game2.player2Scored();
game2.player2Scored();
game2.player1Scored();
game2.player1Scored();
game2.player1Scored();
game2.player2Scored();

// Assert
assertEquals("player1 has advantage",game1.getScore());
assertEquals("player2 has advantage",game2.getScore());
}

@Test
public void testScoreWinsLove() throws TennisGameException {
// game1 "player1 wins"
// game2 "player2 wins"
// Arrange
TennisGame game1 = new TennisGame();
TennisGame game2 = new TennisGame();

// Act
game1.player1Scored();
game1.player1Scored();
game1.player1Scored();
game1.player1Scored();

game2.player2Scored();
game2.player2Scored();
game2.player2Scored();
game2.player2Scored();

// Assert
assertEquals("player1 wins",game1.getScore());
assertEquals("player2 wins",game2.getScore());
}

@Test
public void testScoreWinsAdvantage() throws TennisGameException {
// game1 "player1 wins"
// game2 "player2 wins"
// Arrange
TennisGame game1 = new TennisGame();
TennisGame game2 = new TennisGame();

// Act
game1.player1Scored();
game1.player1Scored();
game1.player1Scored();
game1.player2Scored();
game1.player2Scored();
game1.player2Scored();
game1.player1Scored();
game1.player1Scored();

game2.player2Scored();
game2.player2Scored();
game2.player2Scored();
game2.player1Scored();
game2.player1Scored();
game2.player1Scored();
game2.player2Scored();
game2.player2Scored();

// Assert
assertEquals("player1 wins",game1.getScore());
assertEquals("player2 wins",game2.getScore());
}

@Test
public void testScoreLoves() throws TennisGameException {
// 1 "15 - love", 2 "love - 15"
// 3 "30 - love", 4 "love - 30"
// 5 "40 - love", 6 "love - 40"
// Arrange
TennisGame game1 = new TennisGame();
TennisGame game2 = new TennisGame();
TennisGame game3 = new TennisGame();
TennisGame game4 = new TennisGame();
TennisGame game5 = new TennisGame();
TennisGame game6 = new TennisGame();

// Act
game1.player1Scored();

game2.player2Scored();

game3.player1Scored();
game3.player1Scored();

game4.player2Scored();
game4.player2Scored();

game5.player1Scored();
game5.player1Scored();
game5.player1Scored();

game6.player2Scored();
game6.player2Scored();
game6.player2Scored();

// Assert
assertEquals("15 - love",game1.getScore());
assertEquals("love - 15",game2.getScore());
assertEquals("30 - love",game3.getScore());
assertEquals("love - 30",game4.getScore());
assertEquals("40 - love",game5.getScore());
assertEquals("love - 40",game6.getScore());
}

@Test (expected = TennisGameException.class)
public void testTennisGameExceptionPlayer1() throws TennisGameException {
// Arrange
TennisGame game = new TennisGame();
// Act
game.player1Scored();
game.player1Scored();
game.player1Scored();
game.player1Scored();
// Act
// This statement should cause an exception
game.player1Scored();
}

@Test (expected = TennisGameException.class)
public void testTennisGameExceptionPlayer2() throws TennisGameException {
// Arrange
TennisGame game = new TennisGame();
// Act
game.player2Scored();
game.player2Scored();
game.player2Scored();
game.player2Scored();
// Act
// This statement should cause an exception
game.player2Scored();
}

@Test
public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameException {
//Arrange
Expand All @@ -50,18 +244,4 @@ public void testTennisGame_EahcPlayerWin4Points_Score_Deuce() throws TennisGameE
// Assert
assertEquals("Tie score incorrect", "deuce", score);
}

@Test (expected = TennisGameException.class)
public void testTennisGame_Player1WinsPointAfterGameEnded_ResultsException() throws TennisGameException {
//Arrange
TennisGame game = new TennisGame();
//Act
game.player1Scored();
game.player1Scored();
game.player1Scored();
game.player1Scored();
//Act
// This statement should cause an exception
game.player1Scored();
}
}