X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_stgrouper.py;h=bd60168c020300a0969de0a142c9f9c3fb405f17;hb=96d6304e4c08ef94bb7dfac3e3069fcb8c982747;hp=36a14c2c6350b7ff76b86e63716ac7e76ed7e711;hpb=3151032d036f9a66bad633dc1018395a14f46bac;p=sqlconvert.git diff --git a/tests/test_stgrouper.py b/tests/test_stgrouper.py index 36a14c2..bd60168 100755 --- a/tests/test_stgrouper.py +++ b/tests/test_stgrouper.py @@ -2,7 +2,6 @@ import unittest -from sqlparse import parse from mysql2sql.print_tokens import tlist2str from mysql2sql.process_tokens import requote_names, StatementGrouper @@ -12,24 +11,20 @@ from tests import main class TestStGrouper(unittest.TestCase): def test_incomplete(self): grouper = StatementGrouper() - parsed = parse("select * from `T`")[0] - grouper.process(parsed) + grouper.process_line("select * from `T`") self.assertFalse(grouper.statements) self.assertEqual(len(grouper.statements), 0) self.assertRaises(ValueError, grouper.close) def test_statements(self): grouper = StatementGrouper() - parsed = parse("select * from `T`;")[0] - grouper.process(parsed) + grouper.process_line("select * from `T`;") self.assertTrue(grouper.statements) self.assertEqual(len(grouper.statements), 1) - g = grouper.get_statements() - statement = next(g) - requote_names(statement) - query = tlist2str(parsed) - self.assertEqual(query, 'SELECT * FROM "T";') - self.assertRaises(StopIteration, next, g) + for statement in grouper.get_statements(): + requote_names(statement) + query = tlist2str(statement) + self.assertEqual(query, 'SELECT * FROM "T";') self.assertEqual(len(grouper.statements), 0) self.assertEqual(grouper.close(), [])