X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_stgrouper.py;h=994ef4ef8eea3a600861d51d13f4e8da4b142b5f;hb=00f0aef5739a19921ed06f0397b44ba336184424;hp=cb4f88f0aa30194d3cac8d7d351adb34c9459044;hpb=196c2e0ff729c9cf772bb0e9b521ce4f4fdf84cb;p=sqlconvert.git

diff --git a/tests/test_stgrouper.py b/tests/test_stgrouper.py
old mode 100755
new mode 100644
index cb4f88f..994ef4e
--- a/tests/test_stgrouper.py
+++ b/tests/test_stgrouper.py
@@ -1,35 +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
+def test_incomplete():
+    grouper = StatementGrouper()
+    grouper.process_line("select * from `T`")
+    assert not grouper.statements
+    assert len(grouper.statements) == 0
+    raises(ValueError, grouper.close)
 
 
-class TestStGrouper(unittest.TestCase):
-    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)
-
-    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)
-        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(), [])
-
-if __name__ == "__main__":
-    main()
+def test_statements():
+    grouper = StatementGrouper()
+    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