From 1cf0963de5fe3ca6da6dd00a6eb72cffb6a85bf6 Mon Sep 17 00:00:00 2001 From: emilybache Date: Wed, 21 Nov 2012 10:59:47 +0100 Subject: [PATCH] made the test code more realistic - have each player score a point in turn instead of all at once. --- Tennis/java/defactored1/TennisTest.java | 11 +++++++---- Tennis/java/defactored2/TennisTest.java | 11 +++++++---- Tennis/java/defactored3/TennisTest.java | 11 +++++++---- Tennis/java/factored1/TennisTest.java | 11 +++++++---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/Tennis/java/defactored1/TennisTest.java b/Tennis/java/defactored1/TennisTest.java index 48c247bc..5fb105ea 100644 --- a/Tennis/java/defactored1/TennisTest.java +++ b/Tennis/java/defactored1/TennisTest.java @@ -71,10 +71,13 @@ public class TennisTest { @Test public void checkAllScores() { TennisGame game = new TennisGame("player1", "player2"); - for (int i = 0; i < this.player1Score; i++) - game.wonPoint("player1"); - for (int i = 0; i < this.player2Score; i++) - game.wonPoint("player2"); + int highestScore = Math.max(this.player1Score, this.player2Score); + for (int i = 0; i < highestScore; i++) { + if (i < this.player1Score) + game.wonPoint("player1"); + if (i < this.player2Score) + game.wonPoint("player2"); + } assertEquals(this.expectedScore, game.getScore()); } diff --git a/Tennis/java/defactored2/TennisTest.java b/Tennis/java/defactored2/TennisTest.java index 92807971..bbdd4a5e 100644 --- a/Tennis/java/defactored2/TennisTest.java +++ b/Tennis/java/defactored2/TennisTest.java @@ -71,10 +71,13 @@ public class TennisTest { @Test public void checkAllScores() { TennisGame game = new TennisGame("player1", "player2"); - for (int i = 0; i < this.player1Score; i++) - game.wonPoint("player1"); - for (int i = 0; i < this.player2Score; i++) - game.wonPoint("player2"); + int highestScore = Math.max(this.player1Score, this.player2Score); + for (int i = 0; i < highestScore; i++) { + if (i < this.player1Score) + game.wonPoint("player1"); + if (i < this.player2Score) + game.wonPoint("player2"); + } assertEquals(this.expectedScore, game.getScore()); } diff --git a/Tennis/java/defactored3/TennisTest.java b/Tennis/java/defactored3/TennisTest.java index 0780329a..c6fe5abd 100644 --- a/Tennis/java/defactored3/TennisTest.java +++ b/Tennis/java/defactored3/TennisTest.java @@ -71,10 +71,13 @@ public class TennisTest { @Test public void checkAllScores() { TennisGame game = new TennisGame("player1", "player2"); - for (int i = 0; i < this.player1Score; i++) - game.wonPoint("player1"); - for (int i = 0; i < this.player2Score; i++) - game.wonPoint("player2"); + int highestScore = Math.max(this.player1Score, this.player2Score); + for (int i = 0; i < highestScore; i++) { + if (i < this.player1Score) + game.wonPoint("player1"); + if (i < this.player2Score) + game.wonPoint("player2"); + } assertEquals(this.expectedScore, game.getScore()); } diff --git a/Tennis/java/factored1/TennisTest.java b/Tennis/java/factored1/TennisTest.java index e6e8b26e..2300a761 100644 --- a/Tennis/java/factored1/TennisTest.java +++ b/Tennis/java/factored1/TennisTest.java @@ -70,10 +70,13 @@ public class TennisTest { @Test public void checkAllScores() { TennisGame game = new TennisGame("player1", "player2"); - for (int i = 0; i < this.player1Score; i++) - game.wonPoint("player1"); - for (int i = 0; i < this.player2Score; i++) - game.wonPoint("player2"); + int highestScore = Math.max(this.player1Score, this.player2Score); + for (int i = 0; i < highestScore; i++) { + if (i < this.player1Score) + game.wonPoint("player1"); + if (i < this.player2Score) + game.wonPoint("player2"); + } assertEquals(this.expectedScore, game.getScore()); }