From: Jeremy Thurgood <firxen@gmail.com>
Date: Tue, 13 May 2014 17:08:52 +0000 (+0200)
Subject: Fix tests.
X-Git-Tag: 0.1~335
X-Git-Url: https://git.ctpug.org.za/?p=naja.git;a=commitdiff_plain;h=4a3294f47ed3d17c69a2c5e99b94771b8c97a567

Fix tests.
---

diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py
index 9d39fe8..07c872c 100644
--- a/naja/tests/test_gameboard.py
+++ b/naja/tests/test_gameboard.py
@@ -7,7 +7,10 @@ from naja import actions
 
 class TestGameBoard(TestCase):
     def test_export_new_board(self):
-        board = GameBoard.new_game([{'actions': []}])
+        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, {
@@ -15,7 +18,10 @@ class TestGameBoard(TestCase):
             'health': 4,
             'wins_required': 4,
             'wins': 0,
-            'locations': [{'actions': []}],
+            'locations': [{'actions': [{
+                'action_class': 'LoseHealthOrMSB',
+                'required_bits': [],
+            }]}],
             'player': board.player.export(),
         })
         self.assertEqual(
@@ -24,7 +30,11 @@ class TestGameBoard(TestCase):
         for location_state in board_locations.values():
             self.assertEqual(
                 sorted(location_state.keys()), ['actions', 'bitwise_operand'])
-            self.assertEqual(location_state['actions'], [])
+            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):
@@ -61,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': [