X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Ftests%2Ftest_actions.py;h=69ed8819ed54c80be1d87e89fe6eef8f931f931b;hb=67e79ba3fbe96590efa50a73fe983c2810efdd0f;hp=3d3a58ea63346c936ebfb2b1c8a619640dbb5d87;hpb=e50c357dc15f5c24d3c0b8a4dd57c9f19590419b;p=naja.git

diff --git a/naja/tests/test_actions.py b/naja/tests/test_actions.py
index 3d3a58e..69ed881 100644
--- a/naja/tests/test_actions.py
+++ b/naja/tests/test_actions.py
@@ -8,7 +8,18 @@ from naja import actions
 
 class TestActions(TestCase):
     def make_player(self, *bits):
-        return Player(sum(1 << bit for bit in bits), None)
+        player_bits = 0
+        for bit in bits:
+            player_bits |= bit
+        return Player(player_bits, None)
+
+    def make_board(self, player_bits=None, locations=None):
+        if locations is None:
+            locations = [{'actions': []}]
+        board = GameBoard.new_game(locations)
+        if player_bits is not None:
+            board.player.bits.set_bits(player_bits)
+        return board
 
     def test_check_available(self):
         def check_available(action_bits, player_bits, expected_result):
@@ -22,14 +33,14 @@ class TestActions(TestCase):
         check_available(set([BITS.MSB]), [BITS.MSB], True)
 
     def test_DoNothing(self):
-        board = GameBoard.new_game([])
+        board = self.make_board()
         state_before = board.export()
         actions.DoNothing(set()).perform_action(board, None)
         state_after = board.export()
         self.assertEqual(state_before, state_after)
 
     def test_LoseHealthOrMSB_MSB_clear(self):
-        board = GameBoard.new_game([])
+        board = self.make_board()
         state_before = board.export()
         actions.LoseHeathOrMSB(set()).perform_action(board, None)
         state_after = board.export()
@@ -40,8 +51,7 @@ class TestActions(TestCase):
         self.assertEqual(state_before, state_after)
 
     def test_LoseHealthOrMSB_MSB_set(self):
-        board = GameBoard.new_game([])
-        board.player.bits.set_bit(BITS.MSB)
+        board = self.make_board(player_bits=[BITS.MSB])
         state_before = board.export()
         actions.LoseHeathOrMSB(set()).perform_action(board, None)
         state_after = board.export()
@@ -52,7 +62,7 @@ class TestActions(TestCase):
         self.assertEqual(state_before, state_after)
 
     def test_SetBits(self):
-        board = GameBoard.new_game([])
+        board = self.make_board()
         state_before = board.export()
         location = LocationCard(set([BITS.MSB, BITS.NORTH]), [])
         actions.SetBits(set()).perform_action(board, location)
@@ -65,8 +75,7 @@ class TestActions(TestCase):
         self.assertEqual(state_before, state_after)
 
     def test_ToggleBits(self):
-        board = GameBoard.new_game([])
-        board.player.bits.set_bit(BITS.NORTH)
+        board = self.make_board(player_bits=[BITS.NORTH])
         state_before = board.export()
         location = LocationCard(set([BITS.MSB, BITS.NORTH]), [])
         actions.ToggleBits(set()).perform_action(board, location)