X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_stgrouper.py;h=7bdca569c75a741bfd343b1fa85c15d10b5d1e9d;hb=3305d4aebb3ff106a573db216cdc8276d37e3d49;hp=36a14c2c6350b7ff76b86e63716ac7e76ed7e711;hpb=3151032d036f9a66bad633dc1018395a14f46bac;p=sqlconvert.git

diff --git a/tests/test_stgrouper.py b/tests/test_stgrouper.py
old mode 100755
new mode 100644
index 36a14c2..7bdca56
--- a/tests/test_stgrouper.py
+++ b/tests/test_stgrouper.py
@@ -1,37 +1,24 @@
-#! /usr/bin/env python
 
+from pytest import raises
+from sqlconvert.print_tokens import tlist2str
+from sqlconvert.process_tokens import StatementGrouper
 
-import unittest
-from sqlparse import parse
 
-from mysql2sql.print_tokens import tlist2str
-from mysql2sql.process_tokens import requote_names, StatementGrouper
-from tests import main
-
-
-class TestStGrouper(unittest.TestCase):
+class TestStGrouper(object):
     def test_incomplete(self):
         grouper = StatementGrouper()
-        parsed = parse("select * from `T`")[0]
-        grouper.process(parsed)
-        self.assertFalse(grouper.statements)
-        self.assertEqual(len(grouper.statements), 0)
-        self.assertRaises(ValueError, grouper.close)
+        grouper.process_line("select * from `T`")
+        assert not grouper.statements
+        assert len(grouper.statements) == 0
+        raises(ValueError, grouper.close)
 
     def test_statements(self):
         grouper = StatementGrouper()
-        parsed = parse("select * from `T`;")[0]
-        grouper.process(parsed)
-        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)
-        self.assertEqual(len(grouper.statements), 0)
-        self.assertEqual(grouper.close(), [])
-
-if __name__ == "__main__":
-    main()
+        grouper.process_line("select * from T;")
+        assert grouper.statements
+        assert len(grouper.statements) == 1
+        for statement in grouper.get_statements():
+            query = tlist2str(statement)
+            assert query == 'SELECT * FROM T;'
+        assert len(grouper.statements) == 0
+        assert grouper.close() is None