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

diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py
index bd1a16c..9d39fe8 100644
--- a/naja/tests/test_gameboard.py
+++ b/naja/tests/test_gameboard.py
@@ -7,19 +7,28 @@ 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': []}])
+        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': []}],
             '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'], [])
+            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()