X-Git-Url: https://git.ctpug.org.za/?a=blobdiff_plain;f=naja%2Ftests%2Ftest_actions.py;fp=naja%2Ftests%2Ftest_actions.py;h=0717f0cfd6899cf3b15eaba3dab3a28bf47e6bcf;hb=cccf26b59edcba80bcc68b58f0d1faa487576213;hp=d770f12397f04ffec487192ba299a8445f51a3a1;hpb=c898dde791f095d5e2c5f0e4ad82785547935383;p=naja.git

diff --git a/naja/tests/test_actions.py b/naja/tests/test_actions.py
index d770f12..0717f0c 100644
--- a/naja/tests/test_actions.py
+++ b/naja/tests/test_actions.py
@@ -19,7 +19,7 @@ class TestActions(TestCase):
 
     def make_board(self, player_bits=None, locations=None):
         if locations is None:
-            locations = [{'actions': []}]
+            locations = [{'card_name': 'card', 'actions': []}]
         board = GameBoard.new_game({'cards': locations})
         if player_bits is not None:
             board.player.bits.bits = 0
@@ -107,7 +107,7 @@ class TestActions(TestCase):
     def test_SetBits(self):
         board = self.make_board()
         state_before = board.export()
-        card = LocationCard(set([BITS.MSB, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.MSB, BITS.NORTH]), [])
         actions.SetBits(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(
@@ -117,7 +117,7 @@ class TestActions(TestCase):
     def test_ToggleBits(self):
         board = self.make_board(player_bits=[BITS.NORTH])
         state_before = board.export()
-        card = LocationCard(set([BITS.MSB, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.MSB, BITS.NORTH]), [])
         actions.ToggleBits(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(board.player.bits.check_bit(BITS.MSB), True)
@@ -127,7 +127,7 @@ class TestActions(TestCase):
     def test_LoseHealthOrMSBAndSetBits_MSB_clear(self):
         board = self.make_board(player_bits=[])
         state_before = board.export()
-        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.BLUE, BITS.NORTH]), [])
         actions.LoseHealthOrMSBAndSetBits(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(state_after['health'], state_before['health'] - 1)
@@ -139,7 +139,7 @@ class TestActions(TestCase):
     def test_LoseHealthOrMSBAndSetBits_MSB_set(self):
         board = self.make_board(player_bits=[BITS.MSB])
         state_before = board.export()
-        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.BLUE, BITS.NORTH]), [])
         actions.LoseHealthOrMSBAndSetBits(set()).perform_action(board, card)
         state_after = board.export()
         self.assert_player_bits(board, BITS.BLUE, BITS.NORTH)
@@ -148,7 +148,7 @@ class TestActions(TestCase):
     def test_LoseHealthOrMSBAndSetBits_MSB_set_and_on_card(self):
         board = self.make_board(player_bits=[BITS.MSB])
         state_before = board.export()
-        card = LocationCard(set([BITS.MSB, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.MSB, BITS.NORTH]), [])
         actions.LoseHealthOrMSBAndSetBits(set()).perform_action(board, card)
         state_after = board.export()
         self.assert_player_bits(board, BITS.MSB, BITS.NORTH)
@@ -170,7 +170,7 @@ class TestActions(TestCase):
         board = self.make_board(player_bits=[BITS.NORTH])
         board.lose_health()
         state_before = board.export()
-        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.BLUE, BITS.NORTH]), [])
         actions.GainHealthAndClearBitsOrMSB(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(state_after['health'], state_before['health'] + 1)
@@ -183,7 +183,7 @@ class TestActions(TestCase):
         board = self.make_board(player_bits=[BITS.MSB, BITS.NORTH])
         board.lose_health()
         state_before = board.export()
-        card = LocationCard(set([BITS.BLUE, BITS.NORTH]), [])
+        card = LocationCard('card', set([BITS.BLUE, BITS.NORTH]), [])
         actions.GainHealthAndClearBitsOrMSB(set()).perform_action(board, card)
         state_after = board.export()
         self.assertEqual(state_after['health'], state_before['health'] + 1)