This commit is contained in:
Lukas Wölfer
2019-07-15 02:47:14 +02:00
parent ff5ea31742
commit c87d93866f
3 changed files with 17 additions and 17 deletions

View File

@@ -1,8 +1,8 @@
"""Contains an example board to run tests on""" """Contains an example board to run tests on"""
from shenzhen_solitaire.board import NumberCard, SpecialCard, Board from shenzhen_solitaire.board import NumberCard, SpecialCard, Board
my_board: Board = Board() TEST_BOARD = Board()
my_board.field[0] = [ TEST_BOARD.field[0] = [
SpecialCard.Fa, SpecialCard.Fa,
NumberCard(NumberCard.Suit.Black, 8), NumberCard(NumberCard.Suit.Black, 8),
SpecialCard.Bai, SpecialCard.Bai,
@@ -10,7 +10,7 @@ my_board.field[0] = [
SpecialCard.Zhong, SpecialCard.Zhong,
] ]
my_board.field[1] = [ TEST_BOARD.field[1] = [
NumberCard(NumberCard.Suit.Red, 9), NumberCard(NumberCard.Suit.Red, 9),
SpecialCard.Zhong, SpecialCard.Zhong,
SpecialCard.Zhong, SpecialCard.Zhong,
@@ -18,7 +18,7 @@ my_board.field[1] = [
NumberCard(NumberCard.Suit.Black, 3), NumberCard(NumberCard.Suit.Black, 3),
] ]
my_board.field[2] = [ TEST_BOARD.field[2] = [
SpecialCard.Hua, SpecialCard.Hua,
NumberCard(NumberCard.Suit.Red, 1), NumberCard(NumberCard.Suit.Red, 1),
NumberCard(NumberCard.Suit.Red, 4), NumberCard(NumberCard.Suit.Red, 4),
@@ -26,7 +26,7 @@ my_board.field[2] = [
NumberCard(NumberCard.Suit.Red, 6), NumberCard(NumberCard.Suit.Red, 6),
] ]
my_board.field[3] = [ TEST_BOARD.field[3] = [
SpecialCard.Bai, SpecialCard.Bai,
SpecialCard.Zhong, SpecialCard.Zhong,
NumberCard(NumberCard.Suit.Red, 3), NumberCard(NumberCard.Suit.Red, 3),
@@ -34,7 +34,7 @@ my_board.field[3] = [
NumberCard(NumberCard.Suit.Green, 6), NumberCard(NumberCard.Suit.Green, 6),
] ]
my_board.field[4] = [ TEST_BOARD.field[4] = [
NumberCard(NumberCard.Suit.Green, 7), NumberCard(NumberCard.Suit.Green, 7),
NumberCard(NumberCard.Suit.Green, 4), NumberCard(NumberCard.Suit.Green, 4),
NumberCard(NumberCard.Suit.Red, 5), NumberCard(NumberCard.Suit.Red, 5),
@@ -42,7 +42,7 @@ my_board.field[4] = [
NumberCard(NumberCard.Suit.Black, 6), NumberCard(NumberCard.Suit.Black, 6),
] ]
my_board.field[5] = [ TEST_BOARD.field[5] = [
NumberCard(NumberCard.Suit.Green, 3), NumberCard(NumberCard.Suit.Green, 3),
SpecialCard.Bai, SpecialCard.Bai,
SpecialCard.Fa, SpecialCard.Fa,
@@ -50,7 +50,7 @@ my_board.field[5] = [
NumberCard(NumberCard.Suit.Black, 5), NumberCard(NumberCard.Suit.Black, 5),
] ]
my_board.field[6] = [ TEST_BOARD.field[6] = [
SpecialCard.Fa, SpecialCard.Fa,
NumberCard(NumberCard.Suit.Green, 9), NumberCard(NumberCard.Suit.Green, 9),
NumberCard(NumberCard.Suit.Green, 2), NumberCard(NumberCard.Suit.Green, 2),
@@ -58,7 +58,7 @@ my_board.field[6] = [
NumberCard(NumberCard.Suit.Red, 8), NumberCard(NumberCard.Suit.Red, 8),
] ]
my_board.field[7] = [ TEST_BOARD.field[7] = [
SpecialCard.Bai, SpecialCard.Bai,
NumberCard(NumberCard.Suit.Red, 2), NumberCard(NumberCard.Suit.Red, 2),
SpecialCard.Fa, SpecialCard.Fa,

View File

@@ -4,7 +4,7 @@ import unittest
from shenzhen_solitaire.board import NumberCard, Position from shenzhen_solitaire.board import NumberCard, Position
from shenzhen_solitaire.board_actions import MoveAction, BunkerizeAction, GoalAction, HuaKillAction from shenzhen_solitaire.board_actions import MoveAction, BunkerizeAction, GoalAction, HuaKillAction
from shenzhen_solitaire import board_possibilities from shenzhen_solitaire import board_possibilities
from .boards import my_board from .boards import TEST_BOARD
class ChainTestClass(unittest.TestCase): class ChainTestClass(unittest.TestCase):
@@ -13,7 +13,7 @@ class ChainTestClass(unittest.TestCase):
def test_sequence(self) -> None: def test_sequence(self) -> None:
"""Tests a given sequence. Might break if I change the iterators""" """Tests a given sequence. Might break if I change the iterators"""
self.assertTrue(my_board.check_correct()) self.assertTrue(TEST_BOARD.check_correct())
sequence = [ sequence = [
MoveAction( MoveAction(
cards=[ cards=[
@@ -66,6 +66,6 @@ class ChainTestClass(unittest.TestCase):
source_position=Position.Field) source_position=Position.Field)
] ]
for action in sequence: for action in sequence:
step = list(board_possibilities.possible_actions(my_board)) step = list(board_possibilities.possible_actions(TEST_BOARD))
self.assertIn(action, step) self.assertIn(action, step)
action.apply(my_board) action.apply(TEST_BOARD)

View File

@@ -4,7 +4,7 @@ import copy
from shenzhen_solitaire import solver from shenzhen_solitaire import solver
from .boards import my_board from .boards import TEST_BOARD
class SolverTest(unittest.TestCase): class SolverTest(unittest.TestCase):
@@ -12,9 +12,9 @@ class SolverTest(unittest.TestCase):
def test_solver(self) -> None: def test_solver(self) -> None:
"""Tests solver""" """Tests solver"""
board_copy = copy.deepcopy(my_board) board_copy = copy.deepcopy(TEST_BOARD)
board_id = my_board.state_identifier board_id = TEST_BOARD.state_identifier
board_solution_iterator = solver.solve(my_board) board_solution_iterator = solver.solve(TEST_BOARD)
for _, current_solution in zip(range(1), board_solution_iterator): for _, current_solution in zip(range(1), board_solution_iterator):
self.assertEqual(board_id, board_copy.state_identifier) self.assertEqual(board_id, board_copy.state_identifier)
for action in current_solution: for action in current_solution: