First version.

1 files changed, 41 insertions, 27 deletions

diff --git a/tests/test_parseHelpers.py b/tests/test_parseHelpers.py
index cf1fa9f..7bbf152 100644
--- a/tests/test_parseHelpers.py
+++ b/tests/test_parseHelpers.py
@@ -13,15 +13,19 @@ class TestParseHelpers(unittest.TestCase):
     def testParseMove(self):
         """Test parsing of GtpMove"""
 
-        self.assertEqual(parseHelpers.parseMove(["B"], TEST_BOARD_SIZE),
-            parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.parseMove(["A1"], TEST_BOARD_SIZE),
-            parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.parseMove(["B", "A1", "W"], TEST_BOARD_SIZE),
-            parseHelpers.ParseCodes.ERROR)
+        wrongMoves = [
+                ["B"],
+                ["A1"],
+                ["B", "A1", "W"]
+                ]
+        for move in wrongMoves:
+            self.assertRaises(
+                RuntimeError,
+                parseHelpers.parseMove,
+                move, TEST_BOARD_SIZE
+            )
 
         parsedMove = parseHelpers.parseMove(["B", "t1"], TEST_BOARD_SIZE)
-
         targetMove = parseHelpers.GtpMove(Player.BLACK, [18, 18])
         self.assertEqual(parsedMove.color, targetMove.color)
         self.assertEqual(parsedMove.vertex, targetMove.vertex)
@@ -32,15 +36,19 @@ class TestParseHelpers(unittest.TestCase):
         self.assertEqual(parseHelpers.parseColor("B"), Player.BLACK)
         self.assertEqual(parseHelpers.parseColor("w"), Player.WHITE)
         self.assertEqual(parseHelpers.parseColor("W"), Player.WHITE)
-        self.assertEqual(parseHelpers.parseColor("bw"), parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.parseColor("wb"), parseHelpers.ParseCodes.ERROR)
+
+        self.assertRaises(RuntimeError, parseHelpers.parseColor, "bw")
+        self.assertRaises(RuntimeError, parseHelpers.parseColor, "wb")
 
     def testParseVertexWrongInputs(self):
         """Test wrong inputs for parseVertex."""
         inputs = ( "a", "1", "1a", "aa1", "a0", "u1", "a"+str(TEST_BOARD_SIZE+1) )
         for text in inputs:
-            self.assertEqual(parseHelpers.parseVertex(text, TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
+            self.assertRaises(
+                RuntimeError,
+                parseHelpers.parseVertex,
+                text, TEST_BOARD_SIZE
+            )
 
     def testParseVertexCorrectInputs(self):
         """Test correct inputs and their resulting coordinates for parseVertex."""
@@ -67,6 +75,10 @@ class TestParseHelpers(unittest.TestCase):
             "A19", TEST_BOARD_SIZE),
             [0,0])
 
+        self.assertEqual(parseHelpers.parseVertex(
+            "pass", TEST_BOARD_SIZE),
+            "pass")
+
     def testVertexToString(self):
         """Test converting vertices to strings."""
         self.assertEqual(parseHelpers.vertexToString([0,0], TEST_BOARD_SIZE), "A19")
@@ -78,22 +90,24 @@ class TestParseHelpers(unittest.TestCase):
         self.assertEqual(parseHelpers.vertexToString([18,0], TEST_BOARD_SIZE), "A1")
         self.assertEqual(parseHelpers.vertexToString([18,18], TEST_BOARD_SIZE), "T1")
 
-        self.assertEqual(parseHelpers.vertexToString([-1,0], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([0,-1], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([-1,-1], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([19,0], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([0,19], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([19,19], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([0], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
-        self.assertEqual(parseHelpers.vertexToString([0,0,0], TEST_BOARD_SIZE),
-                parseHelpers.ParseCodes.ERROR)
+        self.assertEqual(parseHelpers.vertexToString("pass", TEST_BOARD_SIZE), "pass")
+
+        wrongVertices = [
+            [-1,0],
+            [0,-1],
+            [-1,-1],
+            [19,0],
+            [0,19],
+            [19,19],
+            [0],
+            [0,0,0]
+        ]
+        for vertex in wrongVertices:
+            self.assertRaises(
+                RuntimeError,
+                parseHelpers.vertexToString,
+                vertex, TEST_BOARD_SIZE
+            )
 
 if __name__ == '__main__':
     unittest.main()