40 40 advantage server passes and advantage to win test

resgroup · Sep 29, 2020 · 2824806 · 2824806
1 parent 360acb4
commit 2824806
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 10 deletions.
diff --git a/.gitignore b/.gitignore
@@ -127,3 +127,8 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+.idea/inspectionProfiles/profiles_settings.xml
+.idea/kata-sep-2020-marine-cedd.iml
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
diff --git a/src/kata.py b/src/kata.py
@@ -8,6 +8,8 @@ class PlayerScore(IntEnum):
     Fourty = 3
     Wins = 6
     Loses = 7
+    Advantage = 8
+    # Duece = 9
 
 
 class GameScore(object):    
@@ -31,11 +33,11 @@ def server_wins_point(self):
             return GameScore(
                 server_score=PlayerScore.Fourty,
                 receiver_score=self.receiver_score)
-        elif self.server_score == PlayerScore.Fourty:
+        elif self.server_score == PlayerScore.Fourty and self.receiver_score != PlayerScore.Fourty:
             return GameScore(
                 server_score=PlayerScore.Wins,
-                receiver_score=PlayerScore.Loses)
-
-
-#
-# class Player(object):
+                receiver_score=self.receiver_score)
+        elif self.server_score == PlayerScore.Fourty and self.server_score == PlayerScore.Fourty:
+            return GameScore(
+                server_score=PlayerScore.Advantage,
+                receiver_score=PlayerScore.Fourty)
diff --git a/tests/test_kata.py b/tests/test_kata.py
@@ -32,23 +32,31 @@
             PlayerScore.Zero),
         GameScore(
             server_score=PlayerScore.Wins,
-            receiver_score=PlayerScore.Loses)
+            receiver_score=PlayerScore.Zero)
         # GameScore(winner=Players.server)
         # ServerWins()
         # GameResult(winner=Players.server)
     ),
     (
         GameScore(
-            PlayerScore.Duece,
-            PlayerScore.Duece),
+            PlayerScore.Fourty,
+            PlayerScore.Fourty),
         #duece_game_Score(),
         #GameScore(duece=True),
         GameScore(server_score=PlayerScore.Advantage, receiver_score=PlayerScore.Fourty)
+    ),
+    (
+        GameScore(
+            PlayerScore.Advantage,
+            PlayerScore.Fourty),
+        #duece_game_Score(),
+        #GameScore(duece=True),
+        GameScore(server_score=PlayerScore.Wins, receiver_score=PlayerScore.Loses)
     )
 ]
 
 
-@pytest.mark.parametrize("current_score,expected_score", server_wins)
+@pytest.mark.parametrize("current_score, expected_score", server_wins)
 def test_server_wins(current_score, expected_score):
     new_score = current_score.server_wins_point()