Add a card_name parameter

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

diff --git a/naja/tests/test_actions.py b/naja/tests/test_actions.py
index 891936799d4ab0827bf9aeeb5c6a781e321a3a2b..0717f0cfd6899cf3b15eaba3dab3a28bf47e6bcf 100644 (file)
--- a/naja/tests/test_actions.py
+++ b/naja/tests/test_actions.py
@@ -2,11 +2,15 @@ from unittest import TestCase
 
 from naja.constants import BITS, MOVES
 from naja.gameboard import GameBoard, LocationCard
+from naja.options import parse_args
 from naja.player import Player
 from naja import actions
 
 
 class TestActions(TestCase):
+    def setUp(self):
+        parse_args([])
+
     def make_player(self, *bits):
         player_bits = 0
         for bit in bits:
@@ -15,8 +19,8 @@ class TestActions(TestCase):
 
     def make_board(self, player_bits=None, locations=None):
         if locations is None:
-            locations = [{'actions': []}]
-        board = GameBoard.new_game(locations)
+            locations = [{'card_name': 'card', 'actions': []}]
+        board = GameBoard.new_game({'cards': locations})
         if player_bits is not None:
             board.player.bits.bits = 0
             board.player.bits.set_bits(player_bits)
@@ -103,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(
@@ -113,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)
@@ -123,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)
@@ -135,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)
@@ -144,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)
@@ -166,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)
@@ -179,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)