From 926f8a26860586d6f44b797a75219ded08690612 Mon Sep 17 00:00:00 2001
From: Emily Bache <emily.bache@gmail.com>
Date: Wed, 4 Jan 2012 19:52:03 +0100
Subject: [PATCH] On closer examination of the rules I notice Forty-All should
 in fact be Deuce

---
 Tennis/cpp/defactored1/Tennis.cc | 6 +++---
 Tennis/cpp/defactored2/Tennis.cc | 6 +++---
 Tennis/cpp/defactored3/Tennis.cc | 6 +++---
 Tennis/cpp/generate_tests.py     | 2 +-
 Tennis/cpp/starting/Tennis.cc    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Tennis/cpp/defactored1/Tennis.cc b/Tennis/cpp/defactored1/Tennis.cc
index b2737310..eeac646d 100644
--- a/Tennis/cpp/defactored1/Tennis.cc
+++ b/Tennis/cpp/defactored1/Tennis.cc
@@ -17,7 +17,7 @@ const std::string tennis_score(int p1Score, int p2Score) {
 					score = "Thirty-All";
 				break;
 			case 3:
-					score = "Forty-All";
+					score = "Deuce";
 				break;
 			default:
 					score = "Deuce";
@@ -75,8 +75,8 @@ TEST(TennisTest, ThirtyAll_2_2) {
 }
 
 
-TEST(TennisTest, FortyAll_3_3) {
-  EXPECT_EQ("Forty-All", tennis_score(3, 3));
+TEST(TennisTest, Deuce_3_3) {
+  EXPECT_EQ("Deuce", tennis_score(3, 3));
 }
 
 
diff --git a/Tennis/cpp/defactored2/Tennis.cc b/Tennis/cpp/defactored2/Tennis.cc
index fe7e480f..5f193038 100644
--- a/Tennis/cpp/defactored2/Tennis.cc
+++ b/Tennis/cpp/defactored2/Tennis.cc
@@ -16,7 +16,7 @@ const std::string tennis_score(int p1Score, int p2Score) {
 			score = "Forty";
 		score += "-All";
 	}
-	if (p1Score==p2Score && p1Score>3)
+	if (p1Score==p2Score && p1Score>2)
 		score = "Deuce";
 	
 	if (p1Score > 0 && p2Score==0)
@@ -106,8 +106,8 @@ TEST(TennisTest, ThirtyAll_2_2) {
 }
 
 
-TEST(TennisTest, FortyAll_3_3) {
-  EXPECT_EQ("Forty-All", tennis_score(3, 3));
+TEST(TennisTest, Deuce_3_3) {
+  EXPECT_EQ("Deuce", tennis_score(3, 3));
 }
 
 
diff --git a/Tennis/cpp/defactored3/Tennis.cc b/Tennis/cpp/defactored3/Tennis.cc
index 15da13ac..cb2fae89 100644
--- a/Tennis/cpp/defactored3/Tennis.cc
+++ b/Tennis/cpp/defactored3/Tennis.cc
@@ -4,7 +4,7 @@ const std::string tennis_score(int p1, int p2) {
 	std::string s;
     std::string p1N = "player1";
     std::string p2N = "player2";
-	if (p1 < 4 && p2 < 4) {
+	if (p1 < 4 && p2 < 4 && !(p1 == 3 && p2 == 3)) {
 		std::string p[4] = {"Love", "Fifteen", "Thirty", "Forty"}; 
 		s = p[p1];
 		return (p1 == p2) ? s + "-All" : s + "-" + p[p2];
@@ -31,8 +31,8 @@ TEST(TennisTest, ThirtyAll_2_2) {
 }
 
 
-TEST(TennisTest, FortyAll_3_3) {
-  EXPECT_EQ("Forty-All", tennis_score(3, 3));
+TEST(TennisTest, Deuce_3_3) {
+  EXPECT_EQ("Deuce", tennis_score(3, 3));
 }
 
 
diff --git a/Tennis/cpp/generate_tests.py b/Tennis/cpp/generate_tests.py
index 2e645fde..78dcb928 100644
--- a/Tennis/cpp/generate_tests.py
+++ b/Tennis/cpp/generate_tests.py
@@ -8,7 +8,7 @@ TEST(TennisTest, %(testcase_name)s) {
 test_cases = [dict(p1Points=0, p2Points=0, score="Love-All"),
          dict(p1Points=1, p2Points=1, score="Fifteen-All"),
          dict(p1Points=2, p2Points=2, score="Thirty-All"),
-         dict(p1Points=3, p2Points=3, score="Forty-All"),
+         dict(p1Points=3, p2Points=3, score="Deuce"),
          dict(p1Points=4, p2Points=4, score="Deuce"),
 
          dict(p1Points=1, p2Points=0, score="Fifteen-Love"),
diff --git a/Tennis/cpp/starting/Tennis.cc b/Tennis/cpp/starting/Tennis.cc
index 90fac43c..87ce94ac 100644
--- a/Tennis/cpp/starting/Tennis.cc
+++ b/Tennis/cpp/starting/Tennis.cc
@@ -19,8 +19,8 @@ TEST(TennisTest, ThirtyAll_2_2) {
 }
 
 
-TEST(TennisTest, FortyAll_3_3) {
-  EXPECT_EQ("Forty-All", tennis_score(3, 3));
+TEST(TennisTest, Deuce_3_3) {
+  EXPECT_EQ("Deuce", tennis_score(3, 3));
 }