From 12bbfdb6777d15f3f7765fc0ce2eece31411dca1 Mon Sep 17 00:00:00 2001 From: attet Date: Thu, 20 Sep 2018 16:04:34 +0300 Subject: [PATCH 1/3] Assigment finished --- bin/TennisGame.class | Bin 1823 -> 1823 bytes src/TennisGame.java | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 2da4e7a578a8ea5a5a076c2766b0eebecc4efc75..33758fa55e0cc8de7c0f405af1588ec7b7a9a3a5 100644 GIT binary patch delta 32 mcmbQwH=l0<2MZ(HWKI?tMz+mrEK*EBjw72M=4 && player1Points-player2Points>=2) + if (player1Points>=3 && player1Points-player2Points>=2) gameEnded = true; - else if (player2Points>=4 && player2Points-player1Points>=2) + else if (player2Points>=3 && player2Points-player1Points>=2) gameEnded = true; } @@ -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 ; From 66c6d8ab2b6896e9e749a683c625d92981756fd5 Mon Sep 17 00:00:00 2001 From: attet Date: Thu, 20 Sep 2018 16:10:05 +0300 Subject: [PATCH 2/3] Assigment finished. --- bin/.gitignore | 4 ++ tests/TennisGame_Testing2.java | 106 +++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 bin/.gitignore create mode 100644 tests/TennisGame_Testing2.java diff --git a/bin/.gitignore b/bin/.gitignore new file mode 100644 index 0000000..a3a3d19 --- /dev/null +++ b/bin/.gitignore @@ -0,0 +1,4 @@ +/TennisGame.class +/TennisGameException.class +/TennisGameTest.class +/TennisGame_Testing2.class diff --git a/tests/TennisGame_Testing2.java b/tests/TennisGame_Testing2.java new file mode 100644 index 0000000..d57928f --- /dev/null +++ b/tests/TennisGame_Testing2.java @@ -0,0 +1,106 @@ +import static org.junit.Assert.*; + +import org.junit.Test; + +public class TennisGame_Testing2 { + + + @Test + public void testLoveScoredWhenHave0Points() throws TennisGameException { + TennisGame game = new TennisGame(); + + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "love - love", score); + } + + @Test + public void test15ScoredWhenHave1Points() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "15 - 15", score); + } + + @Test + public void test30ScoredWhenHave2Points() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "30 - 30", score); + } + + @Test + public void testDeucheWhenBothHave3Points() throws TennisGameException { + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + + + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "deuce", score); + } + + @Test + public void testPlayer1HasAdvantageWhenBothHave3PointsAndPlayer1GetsOneMore() throws TennisGameException { + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "player1 has advantage", score); + } + + @Test + public void testPlayer2HasAdvantageWhenBothHave3PointsAndPlayer2GetsOneMore() throws TennisGameException { + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + + String score = game.getScore() ; + // Assert + assertEquals("Tie score incorrect", "player2 has advantage", score); + } + + @Test (expected = TennisGameException.class) + public void testGameEndsWhenBothHaveAtLeast3PointsAndPlayer1Has2More() throws TennisGameException { + //Arrange + TennisGame game = new TennisGame(); + //Act + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + } + +} From 6e342f7e8cc0ee128cf0d4bf10382375179b21d4 Mon Sep 17 00:00:00 2001 From: attet Date: Thu, 20 Sep 2018 18:47:04 +0300 Subject: [PATCH 3/3] Assignment finished --- bin/TennisGame.class | Bin 1823 -> 1823 bytes src/TennisGame.java | 6 +- tests/TennisGame_Testing2.java | 134 ++++++++++++++++++++++++--------- 3 files changed, 101 insertions(+), 39 deletions(-) diff --git a/bin/TennisGame.class b/bin/TennisGame.class index 33758fa55e0cc8de7c0f405af1588ec7b7a9a3a5..649d40a6f6f6df2b5df8ab7c8b6627e17ea1a440 100644 GIT binary patch delta 38 ucmbQwH=l0g-^!-Ok`F=3 && player1Points-player2Points>=2) + if (player1Points > 3 && player1Points-player2Points>=2) gameEnded = true; - else if (player2Points>=3 && player2Points-player1Points>=2) + else if (player2Points > 3 && player2Points-player1Points>=2) gameEnded = true; } @@ -86,6 +86,6 @@ public String getScore() { 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/TennisGame_Testing2.java b/tests/TennisGame_Testing2.java index d57928f..c15b546 100644 --- a/tests/TennisGame_Testing2.java +++ b/tests/TennisGame_Testing2.java @@ -6,57 +6,123 @@ public class TennisGame_Testing2 { @Test - public void testLoveScoredWhenHave0Points() throws TennisGameException { + public void testPlayer1Has0PointsAndPlayer2Has0To3Points() throws TennisGameException { TennisGame game = new TennisGame(); - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "love - love", score); + assertEquals("love - love", game.getScore()); + + game.player2Scored(); + + assertEquals("love - 15", game.getScore()); + + game.player2Scored(); + + assertEquals("love - 30", game.getScore()); + + game.player2Scored(); + + assertEquals("love - 40", game.getScore()); } @Test - public void test15ScoredWhenHave1Points() throws TennisGameException { + public void testPlayer2Has0PointsAndPlayer1Has0To3Points() throws TennisGameException { TennisGame game = new TennisGame(); + + assertEquals("love - love", game.getScore()); + + game.player1Scored(); + + assertEquals("15 - love", game.getScore()); + + game.player1Scored(); + + assertEquals("30 - love", game.getScore()); + + game.player1Scored(); + + assertEquals("40 - love", game.getScore()); + } + + @Test + public void testPlayersHaveSamePointsTo3Points() throws TennisGameException { + TennisGame game = new TennisGame(); + + assertEquals("love - love", game.getScore()); + + game.player1Scored(); + game.player2Scored(); + + assertEquals("15 - 15", game.getScore()); + + game.player1Scored(); + game.player2Scored(); + + assertEquals("30 - 30", game.getScore()); + game.player1Scored(); game.player2Scored(); - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "15 - 15", score); + + assertEquals("deuce", game.getScore()); } - + @Test - public void test30ScoredWhenHave2Points() throws TennisGameException { + public void testPlayer1HasAdvantage() throws TennisGameException { TennisGame game = new TennisGame(); + game.player1Scored(); game.player2Scored(); game.player1Scored(); game.player2Scored(); - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "30 - 30", score); + game.player1Scored(); + game.player2Scored(); + game.player1Scored(); + + assertEquals("player1 has advantage", game.getScore()); } @Test - public void testDeucheWhenBothHave3Points() throws TennisGameException { + public void testPlayer2HasAdvantage() throws TennisGameException { TennisGame game = new TennisGame(); - //Act + game.player1Scored(); game.player2Scored(); game.player1Scored(); game.player2Scored(); game.player1Scored(); game.player2Scored(); + game.player2Scored(); + assertEquals("player2 has advantage", game.getScore()); + } + + @Test + public void testPlayer1Wins() throws TennisGameException { + TennisGame game = new TennisGame(); + + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); + game.player1Scored(); - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "deuce", score); + assertEquals("player1 wins", game.getScore()); } @Test - public void testPlayer1HasAdvantageWhenBothHave3PointsAndPlayer1GetsOneMore() throws TennisGameException { + public void testPlayer2Wins() throws TennisGameException { TennisGame game = new TennisGame(); - //Act + + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + game.player2Scored(); + + assertEquals("player2 wins", game.getScore()); + } + + @Test + public void testPlayer1WinsAfterAdvantage() throws TennisGameException { + TennisGame game = new TennisGame(); + game.player1Scored(); game.player2Scored(); game.player1Scored(); @@ -64,16 +130,15 @@ public void testPlayer1HasAdvantageWhenBothHave3PointsAndPlayer1GetsOneMore() th game.player1Scored(); game.player2Scored(); game.player1Scored(); + game.player1Scored(); - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "player1 has advantage", score); + assertEquals("player1 wins", game.getScore()); } - + @Test - public void testPlayer2HasAdvantageWhenBothHave3PointsAndPlayer2GetsOneMore() throws TennisGameException { + public void testPlayer2WinsAfterAdvantage() throws TennisGameException { TennisGame game = new TennisGame(); - //Act + game.player1Scored(); game.player2Scored(); game.player1Scored(); @@ -81,26 +146,23 @@ public void testPlayer2HasAdvantageWhenBothHave3PointsAndPlayer2GetsOneMore() th game.player1Scored(); game.player2Scored(); game.player2Scored(); + game.player2Scored(); - String score = game.getScore() ; - // Assert - assertEquals("Tie score incorrect", "player2 has advantage", score); + assertEquals("player2 wins", game.getScore()); } @Test (expected = TennisGameException.class) - public void testGameEndsWhenBothHaveAtLeast3PointsAndPlayer1Has2More() throws TennisGameException { - //Arrange + public void testExceptionWhenScoredAfterGameHasEnded() throws TennisGameException { TennisGame game = new TennisGame(); - //Act - game.player1Scored(); + game.player1Scored(); + game.player2Scored(); game.player1Scored(); game.player2Scored(); + game.player1Scored(); game.player2Scored(); game.player2Scored(); game.player2Scored(); game.player2Scored(); - - } - + } }