diff --git a/src/diana/tests/testSgfParser.py b/src/diana/tests/testSgfParser.py --- a/src/diana/tests/testSgfParser.py +++ b/src/diana/tests/testSgfParser.py @@ -4,7 +4,7 @@ import unittest from unittest import TestCase import os -from ..sgfParser import strRowCol +from ..sgfParser import str_row_col from ..sgfParser.collection import Collection from ..sgfParser.property import Property, DateProperty, DateException from ..sgfParser.propValues import text, compose @@ -25,7 +25,7 @@ class TestUtils(TestCase): ] res = chain((r+1, c) for (r, row) in enumerate(rc) for c in row) for (i, (r, c)) in zip(range(len(s)+1), res): - self.assertEqual(strRowCol(s, i), (r, c)) + self.assertEqual(str_row_col(s, i), (r, c)) class TestProperty(TestCase): @@ -57,15 +57,15 @@ ghi]""" class TestDateProperty(TestCase): def testSingle(self): - self.assertEqual(DateProperty.parseSingle("2019", "Y")[1], date(2019, 1, 1)) - self.assertEqual(DateProperty.parseSingle("2019-06", "YM")[1], date(2019, 6, 1)) - self.assertEqual(DateProperty.parseSingle("2019-06-22", "YMD")[1], date(2019, 6, 22)) + self.assertEqual(DateProperty.parse_single("2019", "Y")[1], date(2019, 1, 1)) + self.assertEqual(DateProperty.parse_single("2019-06", "YM")[1], date(2019, 6, 1)) + self.assertEqual(DateProperty.parse_single("2019-06-22", "YMD")[1], date(2019, 6, 22)) d = date(2019, 6, 21) - self.assertEqual(DateProperty.parseSingle("22", "D", d)[1], date(2019, 6, 22)) - self.assertEqual(DateProperty.parseSingle("07-22", "MD", d)[1], date(2019, 7, 22)) - self.assertEqual(DateProperty.parseSingle("2020-07-22", "YMD", d)[1], date(2020, 7, 22)) + self.assertEqual(DateProperty.parse_single("22", "D", d)[1], date(2019, 6, 22)) + self.assertEqual(DateProperty.parse_single("07-22", "MD", d)[1], date(2019, 7, 22)) + self.assertEqual(DateProperty.parse_single("2020-07-22", "YMD", d)[1], date(2020, 7, 22)) with self.assertRaises(ValueError): - DateProperty.parseSingle("2019-31", "YMD") + DateProperty.parse_single("2019-31", "YMD") def testParse(self): self.assertEqual(DateProperty("1996-05,06").value, [date(1996, 5, 1), date(1996, 6, 1)]) @@ -85,7 +85,7 @@ class TestCollection(TestCase): (;W[ab]PB[Some Black]PW[Some White];B[ac]) (;W[bb]PB[Other Black]PW[Other White]) )""") - games = list(c.listGames()) + games = list(c.list_games()) self.assertEqual(len(games), 2) self.assertRegex(games[0].export(), r"^\(;B\[aa]\n;(PB\[Some Black]|PW\[Some White]|W\[ab]){3}\n;B\[ac]\n\)\n$")