OpenSource/GildedRose-Refactoring-Kata
1
0
Fork 0
mirror of https://github.com/emilybache/GildedRose-Refactoring-Kata.git synced 2025-12-12 04:12:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

made the test code more realistic - have each player score a point in turn instead of all at once.

Browse Source
This commit is contained in:
emilybache 2012-11-21 10:59:47 +01:00
parent 52fb51eede
commit 1cf0963de5
4 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Tennis/java/defactored1/TennisTest.java
View File

@ -71,10 +71,13 @@ public class TennisTest {
@Test @Test
public void checkAllScores() { public void checkAllScores() {
TennisGame game = new TennisGame("player1", "player2"); TennisGame game = new TennisGame("player1", "player2");
for (int i = 0; i < this.player1Score; i++) int highestScore = Math.max(this.player1Score, this.player2Score);
game.wonPoint("player1"); for (int i = 0; i < highestScore; i++) {
for (int i = 0; i < this.player2Score; i++) if (i < this.player1Score)
game.wonPoint("player2"); game.wonPoint("player1");
if (i < this.player2Score)
game.wonPoint("player2");
}
assertEquals(this.expectedScore, game.getScore()); assertEquals(this.expectedScore, game.getScore());
} }

11
Tennis/java/defactored2/TennisTest.java
View File

@ -71,10 +71,13 @@ public class TennisTest {
@Test @Test
public void checkAllScores() { public void checkAllScores() {
TennisGame game = new TennisGame("player1", "player2"); TennisGame game = new TennisGame("player1", "player2");
for (int i = 0; i < this.player1Score; i++) int highestScore = Math.max(this.player1Score, this.player2Score);
game.wonPoint("player1"); for (int i = 0; i < highestScore; i++) {
for (int i = 0; i < this.player2Score; i++) if (i < this.player1Score)
game.wonPoint("player2"); game.wonPoint("player1");
if (i < this.player2Score)
game.wonPoint("player2");
}
assertEquals(this.expectedScore, game.getScore()); assertEquals(this.expectedScore, game.getScore());
} }

11
Tennis/java/defactored3/TennisTest.java
View File

@ -71,10 +71,13 @@ public class TennisTest {
@Test @Test
public void checkAllScores() { public void checkAllScores() {
TennisGame game = new TennisGame("player1", "player2"); TennisGame game = new TennisGame("player1", "player2");
for (int i = 0; i < this.player1Score; i++) int highestScore = Math.max(this.player1Score, this.player2Score);
game.wonPoint("player1"); for (int i = 0; i < highestScore; i++) {
for (int i = 0; i < this.player2Score; i++) if (i < this.player1Score)
game.wonPoint("player2"); game.wonPoint("player1");
if (i < this.player2Score)
game.wonPoint("player2");
}
assertEquals(this.expectedScore, game.getScore()); assertEquals(this.expectedScore, game.getScore());
} }

11
Tennis/java/factored1/TennisTest.java
View File

@ -70,10 +70,13 @@ public class TennisTest {
@Test @Test
public void checkAllScores() { public void checkAllScores() {
TennisGame game = new TennisGame("player1", "player2"); TennisGame game = new TennisGame("player1", "player2");
for (int i = 0; i < this.player1Score; i++) int highestScore = Math.max(this.player1Score, this.player2Score);
game.wonPoint("player1"); for (int i = 0; i < highestScore; i++) {
for (int i = 0; i < this.player2Score; i++) if (i < this.player1Score)
game.wonPoint("player2"); game.wonPoint("player1");
if (i < this.player2Score)
game.wonPoint("player2");
}
assertEquals(this.expectedScore, game.getScore()); assertEquals(this.expectedScore, game.getScore());
} }