diff --git a/src/tests/testEngine.py b/src/tests/testEngine.py --- a/src/tests/testEngine.py +++ b/src/tests/testEngine.py @@ -1,13 +1,12 @@ -import re import os.path import logging as log from unittest import TestCase import config as cfg from util import BLACK as B,WHITE as W,EMPTY as _ -from go.core import Go from go.engine import SpecGo,Engine from statebag import BoardState +from .util import simpleLoadSgf,listStates _log=log.getLogger(__name__) @@ -19,22 +18,6 @@ handler.setFormatter(formatter) _log.addHandler(handler) -def simpleLoadSgf(filename): - with open(filename) as f: - contents=f.read() - g=lambda m: tuple(ord(c)-ord('a') for c in reversed(m.group(1))) - return [g(m) for m in re.finditer(r"\b[BW]\[([a-z]{2})\]",contents)] - - -def listStates(moves): - g=Go() - res=[BoardState(g.board)] - for m in moves: - g.doMove(g.toMove,*m) - res.append(BoardState(g.board)) - return res - - class TestTransitions(TestCase): def testBasic(self): s1=BoardState([ @@ -116,8 +99,7 @@ class TestTransitions(TestCase): def testReal(self): files=["O-Takao-20110106.sgf","Sakai-Iyama-20110110.sgf"] - g=SpecGo() - eng=Engine(g) + eng=Engine() for f in files: moves=simpleLoadSgf(os.path.join(cfg.srcDir,"tests/data",f))