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

diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py
index bd1a16c..07c872c 100644
--- a/naja/tests/test_gameboard.py
+++ b/naja/tests/test_gameboard.py
@@ -7,19 +7,38 @@ from naja import actions
 
 class TestGameBoard(TestCase):
     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()
 
@@ -52,7 +71,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': [