X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_stgrouper.py;h=299ea6cd1ec87224f1a9f51510285f6e9c650f0a;hb=dbc9220a2b29725f94637607f8d8b00c762deb67;hp=0e72ced759e47ecad9130d1012c05d84a53ba1e4;hpb=031cc0d6a41717d4c5d7c4659290e05810202eb9;p=sqlconvert.git

diff --git a/tests/test_stgrouper.py b/tests/test_stgrouper.py
index 0e72ced..299ea6c 100755
--- a/tests/test_stgrouper.py
+++ b/tests/test_stgrouper.py
@@ -2,36 +2,32 @@
 
 
 import unittest
-from sqlparse import parse
 
-from mysql2sql.print_tokens import tlist2str
-from mysql2sql.process_tokens import requote_names, StatementGrouper
+from sqlconvert.print_tokens import tlist2str
+from sqlconvert.process_mysql import requote_names
+from sqlconvert.process_tokens import StatementGrouper
 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.assertIsNone(grouper.close())
+        self.assertEqual(grouper.close(), None)
 
 if __name__ == "__main__":
     main()