White space churn to RegressionTester
This commit is contained in:
parent
977e954574
commit
edd3d3ec07
|
@ -35,72 +35,72 @@ import unittest
|
||||||
|
|
||||||
class TestSequenceFunctions(unittest.TestCase):
|
class TestSequenceFunctions(unittest.TestCase):
|
||||||
|
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
"""Configure MySQL settings/database and establish connection"""
|
"""Configure MySQL settings/database and establish connection"""
|
||||||
self.c = Configuration.Config()
|
self.c = Configuration.Config()
|
||||||
self.mysql_settings={ 'db-host':"localhost",
|
self.mysql_settings={ 'db-host':"localhost",
|
||||||
'db-backend':2,
|
'db-backend':2,
|
||||||
'db-databaseName':"fpdbtest",
|
'db-databaseName':"fpdbtest",
|
||||||
'db-user':"fpdb",
|
'db-user':"fpdb",
|
||||||
'db-password':"fpdb"}
|
'db-password':"fpdb"}
|
||||||
self.mysql_db = fpdb_db.fpdb_db()
|
self.mysql_db = fpdb_db.fpdb_db()
|
||||||
self.mysql_db.connect(self.mysql_settings['db-backend'], self.mysql_settings['db-host'],
|
self.mysql_db.connect(self.mysql_settings['db-backend'], self.mysql_settings['db-host'],
|
||||||
self.mysql_settings['db-databaseName'], self.mysql_settings['db-user'],
|
self.mysql_settings['db-databaseName'], self.mysql_settings['db-user'],
|
||||||
self.mysql_settings['db-password'])
|
self.mysql_settings['db-password'])
|
||||||
self.mysqldict = FpdbSQLQueries.FpdbSQLQueries('MySQL InnoDB')
|
self.mysqldict = FpdbSQLQueries.FpdbSQLQueries('MySQL InnoDB')
|
||||||
self.mysqlimporter = fpdb_import.Importer(self, self.mysql_settings, self.c)
|
self.mysqlimporter = fpdb_import.Importer(self, self.mysql_settings, self.c)
|
||||||
self.mysqlimporter.setCallHud(False)
|
self.mysqlimporter.setCallHud(False)
|
||||||
|
|
||||||
# """Configure Postgres settings/database and establish connection"""
|
# """Configure Postgres settings/database and establish connection"""
|
||||||
# self.pg_settings={ 'db-host':"localhost", 'db-backend':3, 'db-databaseName':"fpdbtest", 'db-user':"fpdb", 'db-password':"fpdb"}
|
# self.pg_settings={ 'db-host':"localhost", 'db-backend':3, 'db-databaseName':"fpdbtest", 'db-user':"fpdb", 'db-password':"fpdb"}
|
||||||
# self.pg_db = fpdb_db.fpdb_db()
|
# self.pg_db = fpdb_db.fpdb_db()
|
||||||
# self.pg_db.connect(self.pg_settings['db-backend'], self.pg_settings['db-host'],
|
# self.pg_db.connect(self.pg_settings['db-backend'], self.pg_settings['db-host'],
|
||||||
# self.pg_settings['db-databaseName'], self.pg_settings['db-user'],
|
# self.pg_settings['db-databaseName'], self.pg_settings['db-user'],
|
||||||
# self.pg_settings['db-password'])
|
# self.pg_settings['db-password'])
|
||||||
# self.pgdict = FpdbSQLQueries.FpdbSQLQueries('PostgreSQL')
|
# self.pgdict = FpdbSQLQueries.FpdbSQLQueries('PostgreSQL')
|
||||||
|
|
||||||
|
|
||||||
def testDatabaseConnection(self):
|
def testDatabaseConnection(self):
|
||||||
"""Test all supported DBs"""
|
"""Test all supported DBs"""
|
||||||
self.result = self.mysql_db.cursor.execute(self.mysqldict.query['list_tables'])
|
self.result = self.mysql_db.cursor.execute(self.mysqldict.query['list_tables'])
|
||||||
self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
||||||
|
|
||||||
# self.result = self.pg_db.cursor.execute(self.pgdict.query['list_tables'])
|
# self.result = self.pg_db.cursor.execute(self.pgdict.query['list_tables'])
|
||||||
# self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
# self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
||||||
|
|
||||||
def testMySQLRecreateTables(self):
|
def testMySQLRecreateTables(self):
|
||||||
"""Test droping then recreating fpdb table schema"""
|
"""Test droping then recreating fpdb table schema"""
|
||||||
self.mysql_db.recreate_tables()
|
self.mysql_db.recreate_tables()
|
||||||
self.result = self.mysql_db.cursor.execute("SHOW TABLES")
|
self.result = self.mysql_db.cursor.execute("SHOW TABLES")
|
||||||
self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
||||||
|
|
||||||
def testPokerStarsHHDate(self):
|
def testPokerStarsHHDate(self):
|
||||||
latest = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]"
|
latest = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/11/12 10:00:48 CET [2008/11/12 4:00:48 ET]"
|
||||||
previous = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)"
|
previous = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/08/17 - 01:14:43 (ET)"
|
||||||
older1 = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET"
|
older1 = "PokerStars Game #21969660557: Hold'em No Limit ($0.50/$1.00) - 2008/09/07 06:23:14 ET"
|
||||||
|
|
||||||
result = fpdb_simple.parseHandStartTime(older1, "ps")
|
result = fpdb_simple.parseHandStartTime(older1, "ps")
|
||||||
self.failUnless(result==datetime.datetime(2008,9,7,11,23,14),
|
self.failUnless(result==datetime.datetime(2008,9,7,11,23,14),
|
||||||
"Date incorrect, expected: 2008-09-07 11:23:14 got: " + str(result))
|
"Date incorrect, expected: 2008-09-07 11:23:14 got: " + str(result))
|
||||||
result = fpdb_simple.parseHandStartTime(latest, "ps")
|
result = fpdb_simple.parseHandStartTime(latest, "ps")
|
||||||
self.failUnless(result==datetime.datetime(2008,11,12,15,00,48),
|
self.failUnless(result==datetime.datetime(2008,11,12,15,00,48),
|
||||||
"Date incorrect, expected: 2008-11-12 15:00:48 got: " + str(result))
|
"Date incorrect, expected: 2008-11-12 15:00:48 got: " + str(result))
|
||||||
result = fpdb_simple.parseHandStartTime(previous, "ps")
|
result = fpdb_simple.parseHandStartTime(previous, "ps")
|
||||||
self.failUnless(result==datetime.datetime(2008,8,17,6,14,43),
|
self.failUnless(result==datetime.datetime(2008,8,17,6,14,43),
|
||||||
"Date incorrect, expected: 2008-08-17 01:14:43 got: " + str(result))
|
"Date incorrect, expected: 2008-08-17 01:14:43 got: " + str(result))
|
||||||
|
|
||||||
def testImportHandHistoryFiles(self):
|
def testImportHandHistoryFiles(self):
|
||||||
"""Test import of single HH file"""
|
"""Test import of single HH file"""
|
||||||
self.mysqlimporter.addImportFile("regression-test-files/hand-histories/ps-lhe-ring-3hands.txt")
|
self.mysqlimporter.addImportFile("regression-test-files/hand-histories/ps-lhe-ring-3hands.txt")
|
||||||
self.mysqlimporter.runImport()
|
self.mysqlimporter.runImport()
|
||||||
self.mysqlimporter.addImportDirectory("regression-test-files/hand-histories")
|
self.mysqlimporter.addImportDirectory("regression-test-files/hand-histories")
|
||||||
self.mysqlimporter.runImport()
|
self.mysqlimporter.runImport()
|
||||||
|
|
||||||
# def testPostgresSQLRecreateTables(self):
|
# def testPostgresSQLRecreateTables(self):
|
||||||
# """Test droping then recreating fpdb table schema"""
|
# """Test droping then recreating fpdb table schema"""
|
||||||
# self.pg_db.recreate_tables()
|
# self.pg_db.recreate_tables()
|
||||||
# self.result = self.pg_db.cursor.execute(self.pgdict.query['list_tables'])
|
# self.result = self.pg_db.cursor.execute(self.pgdict.query['list_tables'])
|
||||||
# self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
# self.failUnless(self.result==13, "Number of tables in database incorrect. Expected 13 got " + str(self.result))
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user