anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Convert to an exception object.

Browse source 
To avoid getting wedged.
This commit is contained in:
Shlomi Fish 2018-05-11 13:40:13 +03:00
parent 93f88ba514
commit 05f3e3027f
3 changed files with 35 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pysollib/hint.py
View file

@ -893,9 +893,14 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
put(target, SUITS_S.index(str_[-1]), put(target, SUITS_S.index(str_[-1]),
(RANKS_S.index(str_[0]) if len(str_) == 2 else 9)) (RANKS_S.index(str_[0]) if len(str_) == 2 else 9))
def my_find_re(RE, m): def my_find_re(RE, m, msg):
s = m.group(1) s = m.group(1)
assert re.match(r'^\s*(?:' + RE + r')?(?:\s+' + RE + r')*\s*$', s) if not re.match(r'^\s*(?:' + RE + r')?(?:\s+' + RE + r')*\s*$', s):
raise PySolHintLayoutImportError(
msg,
[],
line_num
)
return re.findall(r'\b' + RE + r'\b', s) return re.findall(r'\b' + RE + r'\b', s)
# Based on https://stackoverflow.com/questions/8898294 - thanks! # Based on https://stackoverflow.com/questions/8898294 - thanks!
@ -916,7 +921,8 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
m = re.match(r'^(?:Foundations:|Founds?:)\s*(.*)', line) m = re.match(r'^(?:Foundations:|Founds?:)\s*(.*)', line)
if m: if m:
for gm in my_find_re( for gm in my_find_re(
r'(' + SUITS_RE + r')-([' + RANKS0_S + r'])', m): r'(' + SUITS_RE + r')-([' + RANKS0_S + r'])', m,
"Invalid Foundations line"):
for foundat in game.foundations: for foundat in game.foundations:
suit = foundat.cap.suit suit = foundat.cap.suit
if SUITS_S[suit] == gm[0]: if SUITS_S[suit] == gm[0]:
@ -931,7 +937,8 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
continue continue
m = re.match(r'^(?:FC:|Freecells:)\s*(.*)', line) m = re.match(r'^(?:FC:|Freecells:)\s*(.*)', line)
if m: if m:
g = my_find_re(r'(' + CARD_RE + r'|\-)', m) g = my_find_re(r'(' + CARD_RE + r'|\-)', m,
"Invalid Freecells line")
while len(g) < len(game.reserves): while len(g) < len(game.reserves):
g.append('-') g.append('-')
for i, gm in enumerate(g): for i, gm in enumerate(g):
@ -941,7 +948,8 @@ class FreeCellSolver_Hint(Base_Solver_Hint):
continue continue
m = re.match(r'^:?\s*(.*)', line) m = re.match(r'^:?\s*(.*)', line)
assert m assert m
for str_ in my_find_re(r'(' + CARD_RE + r')', m): for str_ in my_find_re(r'(' + CARD_RE + r')', m,
"Invalid column text"):
put_str(game.rows[stack_idx], str_) put_str(game.rows[stack_idx], str_)
stack_idx += 1 stack_idx += 1

13
tests/lib/pysol_tests/import_file1.py
View file

@ -146,6 +146,19 @@ KD QC 5C QH 6S 3D
return return
self.fail("No exception thrown.") self.fail("No exception thrown.")
def test_throw_error_on_invalid_foundations_line(self):
s_game = Mock_S_Game()
h = FreeCellSolver_Hint(s_game, None)
fh = open('tests/unit/data/624-invalid-foundations-line.board', 'r+b')
try:
h.importFileHelper(fh, s_game)
except PySolHintLayoutImportError as err:
self.assertEqual(err.msg, "Invalid Foundations line")
self.assertEqual(err.cards, [])
self.assertEqual(err.line_num, 1)
return
self.fail("No exception thrown.")
def mymain(): def mymain():
from pycotap import TAPTestRunner from pycotap import TAPTestRunner

9
tests/unit/data/624-invalid-foundations-line.board Normal file
View file

@ -0,0 +1,9 @@
Foundations: zzz
: KC 6H 4C QS 2D 4S AS
: 4H TH 2S JH 2H 9S AH
: 3S 6C 9H AD KH QD 7C
: 3C JS 5H KS TC 9C 8C
: 4D 9D 7S JC 5D TS
: KD QC 5C QH 6S 3D
: 5S JD 8D 6D TD 8H
: 8S 7H 3H 2C AC 7D