diff options
author | Marianne Chevrot <blackmoor+git@devys.org> | 2020-05-09 23:16:40 +0200 |
---|---|---|
committer | Marianne Chevrot <blackmoor+git@devys.org> | 2020-05-09 23:16:40 +0200 |
commit | caf7494e8412336b74ca143dac1356870c39fe13 (patch) | |
tree | 3c91865ae497c8f80f7928dd40cff2eea352b8cb /tests_solver/test_solver.py | |
parent | 478683385ace632366bc4541cdd6e1a84c4aa54e (diff) | |
download | kana_quest_solver-caf7494e8412336b74ca143dac1356870c39fe13.tar.gz kana_quest_solver-caf7494e8412336b74ca143dac1356870c39fe13.tar.bz2 kana_quest_solver-caf7494e8412336b74ca143dac1356870c39fe13.zip |
Add support for empty arrows
- remove empt, fblk types, there are merged to their base type (norm and
froz)
- ar_*, norm and froz support having None for their kana property
Diffstat (limited to 'tests_solver/test_solver.py')
-rw-r--r-- | tests_solver/test_solver.py | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/tests_solver/test_solver.py b/tests_solver/test_solver.py index 82aca73..03d68ed 100644 --- a/tests_solver/test_solver.py +++ b/tests_solver/test_solver.py @@ -13,8 +13,9 @@ def test_is_swappable(): swappable_grids = [ [Kana("norm", "su"), Kana("norm", "su")], [Kana("froz", "su"), Kana("norm", "su")], - [Kana("norm", "su"), Kana("empt" )], - [Kana("empt" ), Kana("froz", "su")], + [Kana("norm", "su"), Kana("norm" )], + [Kana("norm" ), Kana("froz", "su")], + [Kana("norm" ), Kana("norm" )], ] for swappable_grid in swappable_grids: @@ -25,7 +26,6 @@ def test_is_swappable(): not_swappable_grids = [ [Kana("norm", "su"), Kana("rock", "su")], [Kana("froz", "su"), Kana("froz", "su")], - [Kana("empt" ), Kana("empt" )], ] for not_swappable_grid in not_swappable_grids: @@ -38,8 +38,8 @@ def test_kana_grid(): initial_grid = [ kana_void , Kana("myst", "su"), kana_void , Kana("myst", "ko"), kana_void , - Kana("froz", "se"), Kana("empt" ), Kana("empt" ), Kana("empt" ), Kana("froz", "so"), - Kana("froz", "ku"), Kana("empt" ), Kana("empt" ), Kana("empt" ), Kana("froz", "no"), + Kana("froz", "se"), Kana("norm" ), Kana("norm" ), Kana("norm" ), Kana("froz", "so"), + Kana("froz", "ku"), Kana("norm" ), Kana("norm" ), Kana("norm" ), Kana("froz", "no"), kana_void , kana_void , Kana("rock", "ka"), kana_void , kana_void , ] initial_grid_size = 5, 4 @@ -47,8 +47,8 @@ def test_kana_grid(): expected_grid = [ kana_void , Kana("myst", "su"), kana_void , Kana("myst", "ko"), kana_void , - Kana("empt" ), Kana("empt" ), Kana("empt" ), Kana("froz", "se"), Kana("froz", "so"), - Kana("froz", "ku"), Kana("empt" ), Kana("empt" ), Kana("empt" ), Kana("froz", "no"), + Kana("norm" ), Kana("norm" ), Kana("norm" ), Kana("froz", "se"), Kana("froz", "so"), + Kana("froz", "ku"), Kana("norm" ), Kana("norm" ), Kana("norm" ), Kana("froz", "no"), kana_void , kana_void , Kana("rock", "ka"), kana_void , kana_void , ] @@ -66,9 +66,9 @@ def test_kana_grid(): def test_kana_arrow_swap(): - kanagrid_orig = KanaGrid((2, 1), [Kana("ar_r", "su"), Kana("empt",)]) + kanagrid_orig = KanaGrid((2, 1), [Kana("ar_r", "su"), Kana("norm",)]) kanagrid_new = kanagrid_orig.action(pos=(0, 0), action_type="right") - expected_grid = KanaGrid((2, 1), [Kana("empt",), Kana("ar_r", "su")]) + expected_grid = KanaGrid((2, 1), [Kana("norm",), Kana("ar_r", "su")]) print("kanagrid_orig") print(kanagrid_orig) @@ -86,14 +86,14 @@ def test_kana_arrow_swap(): 'other_move_ok': 'down', 'dest_pos': (1, 0), 'orig': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("ar_u", "ko"), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("norm" ), Kana("ar_u", "ko"), Kana("norm" ), + Kana("void" ), Kana("norm" ), Kana("void" ), ]), 'moved': KanaGrid((3, 3), [ - Kana("empt" ), Kana("ar_u", "ko"), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("ar_u", "ko"), Kana("void" ), + Kana("norm" ), Kana("norm" ), Kana("norm" ), + Kana("void" ), Kana("norm" ), Kana("void" ), ], action_count=1), }, { @@ -101,14 +101,14 @@ def test_kana_arrow_swap(): 'other_move_ok': 'left', 'dest_pos': (2, 1), 'orig': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("ar_r", "ko"), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("norm" ), Kana("ar_r", "ko"), Kana("norm" ), + Kana("void" ), Kana("norm" ), Kana("void" ), ]), 'moved': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("ar_r", "ko"), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("norm" ), Kana("norm" ), Kana("ar_r", "ko"), + Kana("void" ), Kana("norm" ), Kana("void" ), ], action_count=1), }, { @@ -116,14 +116,14 @@ def test_kana_arrow_swap(): 'other_move_ok': 'up', 'dest_pos': (1, 2), 'orig': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("ar_d", "ko"), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("norm" ), Kana("ar_d", "ko"), Kana("norm" ), + Kana("void" ), Kana("norm" ), Kana("void" ), ]), 'moved': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("ar_d", "ko"), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("norm" ), Kana("norm" ), Kana("norm" ), + Kana("void" ), Kana("ar_d", "ko"), Kana("void" ), ], action_count=1), }, { @@ -131,14 +131,14 @@ def test_kana_arrow_swap(): 'other_move_ok': 'right', 'dest_pos': (0, 1), 'orig': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("ar_l", "ko"), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("norm" ), Kana("ar_l", "ko"), Kana("norm" ), + Kana("void" ), Kana("norm" ), Kana("void" ), ]), 'moved': KanaGrid((3, 3), [ - Kana("empt" ), Kana("empt" ), Kana("empt" ), - Kana("ar_l", "ko"), Kana("empt" ), Kana("empt" ), - Kana("empt" ), Kana("empt" ), Kana("empt" ), + Kana("void" ), Kana("norm" ), Kana("void" ), + Kana("ar_l", "ko"), Kana("norm" ), Kana("norm" ), + Kana("void" ), Kana("norm" ), Kana("void" ), ], action_count=1), }, ] |