Step 14: Step through the game

game.py

@@ -30,21 +30,38 @@ def __init__(self, dandelion, wind):
             'we': False,
             'nw': False,
         }
+        self.stepI = 0
 
     def play(self):
-        for step in range(1, 7):
+        while (not self.done()):
+            self.step()
+        return self.winner()
+
+    def step(self):
+        if (self.done()):
+            raise RuntimeError('Game is already done')
+        if (self.stepI % 2 == 0):
             self.board = plant(
                 self.board,
                 self.dandelion.generateMove(self.board, self.compass)
             )
+        else:
             self.board, self.compass = blow(
                 self.board,
                 self.compass,
                 self.wind.generateMove(self.board, self.compass)
             )
-            if (boardIsFull(self.board)):
-                return self.dandelion
-        return self.wind
+        self.stepI += 1
+
+    def done(self):
+        return self.winner() != None
+
+    def winner(self):
+        if (boardIsFull(self.board)):
+            return self.dandelion
+        if (self.stepI == 14):
+            return self.wind
+        return None
 
     def toString(self):
         return board_to_string(self.board) + "\n" + compass_to_string(self.compass)

test.py

@@ -732,6 +732,26 @@ def it_stringifies_a_game():
     game = Game(dandelion, wind)
     assert(game.toString() == expected)
 
+def it_steps_through_a_game():
+    dandelion = DandelionFixedStrategy()
+    wind = WindFixedStrategy()
+    game = Game(dandelion, wind)
+    game.step()
+    assert(not game.done())
+    game.step()
+    # play() probably already proves that the rest works
+
+def it_gets_upset_if_you_keep_steppin_when_its_done():
+    dandelion = DandelionFixedStrategy()
+    wind = WindFixedStrategy()
+    game = Game(dandelion, wind)
+    game.stepI = 14 #hack!
+    try:
+        game.step()
+    except BaseException:
+        return # good, it got upset
+    assert(False)
+
 
 tested = [
     it_prints_a_blank_board(),
@@ -760,6 +780,8 @@ def it_stringifies_a_game():
     blow_rejects_used_directions(),
     it_plays_a_game(),
     it_stringifies_a_game(),
+    it_steps_through_a_game(),
+    it_gets_upset_if_you_keep_steppin_when_its_done(),
 ]
 
 print('Tested:', len(tested))