Fix tests.

[naja.git] / naja / tests / test_gameboard.py

diff --git a/naja/tests/test_gameboard.py b/naja/tests/test_gameboard.py
index f8672b45d149aad1bd8a719f1d8f2d61229808c7..cccd9aae88be92758b1ab658292423fdf2a532b9 100644 (file)
--- a/naja/tests/test_gameboard.py
+++ b/naja/tests/test_gameboard.py
@@ -43,6 +43,7 @@ class TestGameBoard(TestCase):
         exported_state = board.export()
         board_locations = exported_state.pop('board_locations')
         self.assertEqual(exported_state, {
+            'clock_count': 0,
             'max_health': 4,
             'health': 4,
             'wins_required': 4,
@@ -60,7 +61,6 @@ class TestGameBoard(TestCase):
             'puzzle': False,
             'player_mode': EXAMINE,
             'replacement_params': None,
-            'clock_count': 0,
         })
         positions = []
         for position, location_state in board_locations:
@@ -357,14 +357,3 @@ class TestLocationCard(TestCase):
         self.assertEqual(type(action), actions.DoNothing)
         self.assertEqual(action.required_bits, set())
         self.assertEqual(location.replacement_time, None)
-
-    def test_parse_bits(self):
-        self.assertEqual(
-            LocationCard.parse_bits([]), frozenset([]))
-        self.assertEqual(
-            LocationCard.parse_bits(['RED']), frozenset([BITS.RED]))
-        self.assertEqual(
-            LocationCard.parse_bits([BITS.BLUE]), frozenset([BITS.BLUE]))
-        self.assertEqual(
-            LocationCard.parse_bits([BITS.NORTH, 'MSB']),
-            frozenset([BITS.NORTH, BITS.MSB]))