X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Ftests%2Ftest_gameboard.py;h=bbc51284cfcb9847b6cfe8e8e194d482f126c802;hb=0cef06f581d48315a59a19ac06ca1d2be14cbb4c;hp=bd1a16c1c080c3ea95b5a075ed8f1cc2f6345ef2;hpb=b3db4400695249420f5f941744c2a2692a1bad98;p=naja.git

diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py
index bd1a16c..bbc5128 100644
--- a/naja/tests/test_gameboard.py
+++ b/naja/tests/test_gameboard.py
@@ -6,20 +6,53 @@ from naja import actions
 
 
 class TestGameBoard(TestCase):
+    def assert_state(self, state1, state2, exclude=(), player_exclude=()):
+        def filter_dict(source, exclude_keys):
+            return dict((k, v) for k, v in source.items()
+                        if k not in exclude_keys)
+
+        state1 = filter_dict(state1, exclude)
+        if 'player' in state1:
+            state1['player'] = filter_dict(state1['player'], player_exclude)
+        state2 = filter_dict(state2, exclude)
+        if 'player' in state2:
+            state2['player'] = filter_dict(state2['player'], player_exclude)
+
+        self.assertEqual(state1, state2)
+
     def test_export_new_board(self):
-        board = GameBoard.new_game(4, 4, [])
-        self.assertEqual(board.export(), {
+        board = GameBoard.new_game([{'actions': [{
+                'action_class': 'LoseHealthOrMSB',
+                'required_bits': [],
+        }]}])
+        exported_state = board.export()
+        board_locations = exported_state.pop('board_locations')
+        self.assertEqual(exported_state, {
             'max_health': 4,
             'health': 4,
             'wins_required': 4,
             'wins': 0,
-            'locations': [],
-            'board_locations': {},
+            'locations': [{'actions': [{
+                'action_class': 'LoseHealthOrMSB',
+                'required_bits': [],
+            }]}],
             'player': board.player.export(),
         })
+        self.assertEqual(
+            set(board_locations.keys()),
+            set((x, y) for x in range(5) for y in range(5)))
+        for location_state in board_locations.values():
+            self.assertEqual(
+                sorted(location_state.keys()), ['actions', 'bitwise_operand'])
+            self.assertEqual(location_state['actions'], [{
+                'action_class': 'LoseHealthOrMSB',
+                'required_bits': [],
+                'data': {},
+            }])
+            self.assertTrue(2 <= len(location_state['bitwise_operand']) <= 3)
 
     def test_lose_health(self):
-        board = GameBoard.new_game(4, 4, [])
+        board = GameBoard.new_game([{'actions': []}])
         self.assertEqual(board.health, 4)
         state_1 = board.export()
 
@@ -27,10 +60,30 @@ class TestGameBoard(TestCase):
         self.assertEqual(board.health, 3)
         state_2 = board.export()
 
-        # Make sure nothing else has changed.
-        state_1.pop('health')
-        state_2.pop('health')
-        self.assertEqual(state_1, state_2)
+        self.assert_state(state_1, state_2, exclude=['health'])
+
+    def test_gain_health(self):
+        board = GameBoard.new_game([{'actions': []}])
+        board.health = 2
+        self.assertEqual(board.health, 2)
+        state_1 = board.export()
+
+        board.gain_health()
+        self.assertEqual(board.health, 3)
+        state_2 = board.export()
+
+        self.assert_state(state_1, state_2, exclude=['health'])
+
+    def test_gain_health_at_max(self):
+        board = GameBoard.new_game([{'actions': []}])
+        self.assertEqual(board.health, 4)
+        state_1 = board.export()
+
+        board.gain_health()
+        self.assertEqual(board.health, 4)
+        state_2 = board.export()
+
+        self.assert_state(state_1, state_2)
 
 
 class TestLocationCard(TestCase):
@@ -52,7 +105,9 @@ class TestLocationCard(TestCase):
 
     def test_new_location_no_actions(self):
         location = LocationCard.new_location({'actions': []})
-        self.assertEqual(location.actions, [])
+        [action] = location.actions
+        self.assertEqual(type(action), actions.DoNothing)
+        self.assertEqual(action.required_bits, set())
 
     def test_new_location_one_action(self):
         location = LocationCard.new_location({'actions': [