From 1ec82a56ebe5122d1bd685dbbbe384dcbcbb4b7e Mon Sep 17 00:00:00 2001
From: Stefan van den Oord <stefan.van.den.oord@philips.com>
Date: Fri, 31 May 2013 19:21:32 +0200
Subject: [PATCH] Successfully ported TennisGame1

---
 Tennis/objc/.idea/workspace.xml       | 73 ++++++++++++++-------------
 Tennis/objc/Tennis/TennisGame.h       | 11 ++--
 Tennis/objc/Tennis/TennisGame.m       |  5 +-
 Tennis/objc/Tennis/TennisGame1.m      | 68 ++++++++++++++++++++++++-
 Tennis/objc/TennisTests/TennisTests.m | 46 ++++++++++-------
 5 files changed, 144 insertions(+), 59 deletions(-)

diff --git a/Tennis/objc/.idea/workspace.xml b/Tennis/objc/.idea/workspace.xml
index 748a7d90..6619f3c3 100644
--- a/Tennis/objc/.idea/workspace.xml
+++ b/Tennis/objc/.idea/workspace.xml
@@ -4,10 +4,8 @@
     <list default="true" id="3432493f-5b19-44ab-868c-f539ff9f9548" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame.h" afterPath="$PROJECT_DIR$/Tennis/TennisGame.h" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame.m" afterPath="$PROJECT_DIR$/Tennis/TennisGame.m" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame3.m" afterPath="$PROJECT_DIR$/Tennis/TennisGame3.m" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Tennis/TennisGame1.m" afterPath="$PROJECT_DIR$/Tennis/TennisGame1.m" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/TennisTests/TennisTests.m" afterPath="$PROJECT_DIR$/TennisTests/TennisTests.m" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
     </list>
     <ignored path="Tennis.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -20,7 +18,9 @@
     <file path="/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk/usr/include/string.h" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370014093686" ignored="false" />
     <file path="/Dummy.txt" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018279112" ignored="false" />
     <file path="/TennisGame3.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018390956" ignored="false" />
-    <file path="/TennisGame.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370018510872" ignored="false" />
+    <file path="/TennisGame.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370020624289" ignored="false" />
+    <file path="/TennisGame1.m" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370020207784" ignored="false" />
+    <file path="/TennisGame.h" changelist="3432493f-5b19-44ab-868c-f539ff9f9548" time="1370019947680" ignored="false" />
     <option name="TRACKING_ENABLED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -61,9 +61,9 @@
       <file leaf-file-name="TennisTests.m" pinned="false" current="true" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/TennisTests/TennisTests.m">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="110" column="91" selection-start="3060" selection-end="3060" vertical-scroll-proportion="0.8125">
+            <state line="85" column="30" selection-start="2316" selection-end="2316" vertical-scroll-proportion="0.3321859">
               <folding>
-                <element signature="e#144#167#0" expanded="true" />
+                <element signature="e#144#183#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -99,7 +99,7 @@
       <file leaf-file-name="TennisGame1.m" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.m">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+            <state line="11" column="27" selection-start="231" selection-end="231" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -108,7 +108,7 @@
       <file leaf-file-name="TennisGame1.h" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="12" column="35" selection-start="272" selection-end="272" vertical-scroll-proportion="0.0">
+            <state line="12" column="28" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -117,7 +117,7 @@
       <file leaf-file-name="TennisGame.m" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.m">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="19" column="8" selection-start="409" selection-end="409" vertical-scroll-proportion="0.0">
+            <state line="21" column="19" selection-start="472" selection-end="472" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -126,7 +126,7 @@
       <file leaf-file-name="TennisGame.h" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.h">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="13" column="0" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
+            <state line="15" column="0" selection-start="283" selection-end="283" vertical-scroll-proportion="0.0">
               <folding />
             </state>
           </provider>
@@ -154,10 +154,11 @@
         <option value="$PROJECT_DIR$/Tennis/TennisGame2.h" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame3.h" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame.mm" />
-        <option value="$PROJECT_DIR$/TennisTests/TennisTests.m" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame3.m" />
-        <option value="$PROJECT_DIR$/Tennis/TennisGame.m" />
+        <option value="$PROJECT_DIR$/Tennis/TennisGame1.m" />
         <option value="$PROJECT_DIR$/Tennis/TennisGame.h" />
+        <option value="$PROJECT_DIR$/Tennis/TennisGame.m" />
+        <option value="$PROJECT_DIR$/TennisTests/TennisTests.m" />
       </list>
     </option>
   </component>
@@ -309,20 +310,20 @@
     <frame x="60" y="22" width="1620" height="1028" extended-state="6" />
     <editor active="true" />
     <layout>
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32929516" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24984346" sideWeight="0.67070484" order="0" side_tool="false" content_ui="combo" />
-      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39977974" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32929516" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32929516" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32929516" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@@ -386,7 +387,9 @@
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
   </component>
   <component name="XDebuggerManager">
-    <breakpoint-manager />
+    <breakpoint-manager>
+      <option name="time" value="1" />
+    </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.h">
@@ -403,13 +406,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.h">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="12" column="35" selection-start="272" selection-end="272" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame2.m">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
@@ -424,13 +420,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.m">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame3.m">
       <provider selected="true" editor-type-id="text-editor">
         <state line="13" column="0" selection-start="233" selection-end="233" vertical-scroll-proportion="0.0">
@@ -438,25 +427,39 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.m">
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="19" column="8" selection-start="409" selection-end="409" vertical-scroll-proportion="0.0">
+        <state line="12" column="28" selection-start="265" selection-end="265" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.h">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="13" column="0" selection-start="293" selection-end="293" vertical-scroll-proportion="0.0">
+        <state line="15" column="0" selection-start="283" selection-end="283" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame1.m">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="11" column="27" selection-start="231" selection-end="231" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Tennis/TennisGame.m">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="19" selection-start="472" selection-end="472" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/TennisTests/TennisTests.m">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="110" column="91" selection-start="3060" selection-end="3060" vertical-scroll-proportion="0.8125">
+        <state line="85" column="30" selection-start="2316" selection-end="2316" vertical-scroll-proportion="0.3321859">
           <folding>
-            <element signature="e#144#167#0" expanded="true" />
+            <element signature="e#144#183#0" expanded="true" />
           </folding>
         </state>
       </provider>
diff --git a/Tennis/objc/Tennis/TennisGame.h b/Tennis/objc/Tennis/TennisGame.h
index 4634840d..38a5ceed 100644
--- a/Tennis/objc/Tennis/TennisGame.h
+++ b/Tennis/objc/Tennis/TennisGame.h
@@ -9,13 +9,16 @@
 #import <Foundation/Foundation.h>
 
 
-@interface TennisGame : NSObject
+@interface TennisGame : NSObject {
+    int score1;
+    int score2;
+}
+
 @property(nonatomic, copy) NSString *player1;
 @property(nonatomic, copy) NSString *player2;
 
 - (id)initWithPlayer1:(NSString *)player1 player2:(NSString *)player2;
-
-- (void)wonPoint:(NSString *)player;
-
+- (void)wonPoint:(NSString *)playerName;
 - (NSString *)score;
+
 @end
\ No newline at end of file
diff --git a/Tennis/objc/Tennis/TennisGame.m b/Tennis/objc/Tennis/TennisGame.m
index e4fc9664..64d1e82a 100644
--- a/Tennis/objc/Tennis/TennisGame.m
+++ b/Tennis/objc/Tennis/TennisGame.m
@@ -18,11 +18,14 @@
     if (self) {
         self.player1 = player1;
         self.player2 = player2;
+        score1 = 0;
+        score2 = 0;
     }
 
     return self;
 }
 
-- (void)wonPoint:(NSString *)player {}
+- (void)wonPoint:(NSString *)playerName {}
 - (NSString *)score { return nil; }
+
 @end
\ No newline at end of file
diff --git a/Tennis/objc/Tennis/TennisGame1.m b/Tennis/objc/Tennis/TennisGame1.m
index b08fda8a..5f53e117 100644
--- a/Tennis/objc/Tennis/TennisGame1.m
+++ b/Tennis/objc/Tennis/TennisGame1.m
@@ -9,7 +9,73 @@
 #import "TennisGame1.h"
 
 
-@implementation TennisGame1 {
+@implementation TennisGame1
 
+- (void)wonPoint:(NSString *)playerName {
+    if ([playerName isEqualToString:@"player1"])
+        score1 += 1;
+    else
+        score2 += 1;
 }
+
+- (NSString *)score {
+    NSString *score = @"";
+    int tempScore=0;
+    if (score1 == score2)
+    {
+        switch (score1)
+        {
+            case 0:
+                score = @"Love-All";
+                break;
+            case 1:
+                score = @"Fifteen-All";
+                break;
+            case 2:
+                score = @"Thirty-All";
+                break;
+            case 3:
+                score = @"Forty-All";
+                break;
+            default:
+                score = @"Deuce";
+                break;
+
+        }
+    }
+    else if (score1>=4 || score2>=4)
+    {
+        int minusResult = score1-score2;
+        if (minusResult==1) score = @"Advantage player1";
+        else if (minusResult ==-1) score = @"Advantage player2";
+        else if (minusResult>=2) score = @"Win for player1";
+        else score = @"Win for player2";
+    }
+    else
+    {
+        for (int i=1; i<3; i++)
+        {
+            if (i==1) tempScore = score1;
+            else { score = [NSString stringWithFormat:@"%@-", score]; tempScore = score2; }
+            switch(tempScore)
+            {
+                case 0:
+                    score = [NSString stringWithFormat:@"%@Love", score];
+                    break;
+                case 1:
+                    score = [NSString stringWithFormat:@"%@Fifteen", score];
+                    break;
+                case 2:
+                    score = [NSString stringWithFormat:@"%@Thirty", score];
+                    break;
+                case 3:
+                    score = [NSString stringWithFormat:@"%@Forty", score];
+                    break;
+            }
+        }
+    }
+    return score;
+}
+
+
 @end
\ No newline at end of file
diff --git a/Tennis/objc/TennisTests/TennisTests.m b/Tennis/objc/TennisTests/TennisTests.m
index 8a21ca6e..0f616d5b 100644
--- a/Tennis/objc/TennisTests/TennisTests.m
+++ b/Tennis/objc/TennisTests/TennisTests.m
@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 Stefan van den Oord. All rights reserved.
 //
 
+#import <SenTestingKit/SenTestingKit.h>
 #import "TennisTests.h"
 #import "TennisGame1.h"
 #import "TennisGame2.h"
@@ -75,18 +76,6 @@
 }
 
 - (void)checkAllScoresForGame:(TennisGame *)game {
-
-    for (NSArray * score in [TennisTests allScores]) {
-
-        player1Score = [score[0] intValue];
-        player2Score = [score[1] intValue];
-        expectedScore = score[2];
-        
-        [self checkScoreForGame:game];
-    }
-}
-
-- (void)checkScoreForGame:(TennisGame *)game {
     int highestScore = MAX(player1Score, player2Score);
     for (int i = 0; i < highestScore; i++) {
         if (i < player1Score)
@@ -98,18 +87,39 @@
 }
 
 - (void)testAllScoresTennisGame1 {
-    TennisGame1 * game = [[TennisGame1 alloc] initWithPlayer1:@"player1" player2:@"player2"];
-    [self checkAllScoresForGame:game];
+    for (NSArray * score in [TennisTests allScores]) {
+
+        player1Score = [score[0] intValue];
+        player2Score = [score[1] intValue];
+        expectedScore = score[2];
+
+        TennisGame1 * game = [[TennisGame1 alloc] initWithPlayer1:@"player1" player2:@"player2"];
+        [self checkAllScoresForGame:game];
+    }
 }
 
 - (void)testAllScoresTennisGame2 {
-    TennisGame2 * game = [[TennisGame2 alloc] initWithPlayer1:@"player1" player2:@"player2"];
-    [self checkAllScoresForGame:game];
+    for (NSArray * score in [TennisTests allScores]) {
+
+        player1Score = [score[0] intValue];
+        player2Score = [score[1] intValue];
+        expectedScore = score[2];
+
+        TennisGame2 * game = [[TennisGame2 alloc] initWithPlayer1:@"player1" player2:@"player2"];
+        [self checkAllScoresForGame:game];
+    }
 }
 
 - (void)testAllScoresTennisGame3 {
-    TennisGame3 * game = [[TennisGame3 alloc] initWithPlayer1:@"player1" player2:@"player2"];
-    [self checkAllScoresForGame:game];
+    for (NSArray * score in [TennisTests allScores]) {
+
+        player1Score = [score[0] intValue];
+        player2Score = [score[1] intValue];
+        expectedScore = score[2];
+
+        TennisGame3 * game = [[TennisGame3 alloc] initWithPlayer1:@"player1" player2:@"player2"];
+        [self checkAllScoresForGame:game];
+    }
 }
 
 @end