X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_tokens.py;h=3b0452a50cdcdc4c770b6ffbbfb653d29fc5286f;hb=86cace63e9bc60457f310bc77aba8fc54b748bbe;hp=c8e786f90d35e4aad0f9bc76669b360d470a68f3;hpb=88eedec9d5e7c7598c01a9316b49f90d7e62eee4;p=sqlconvert.git

diff --git a/tests/test_tokens.py b/tests/test_tokens.py
index c8e786f..3b0452a 100755
--- a/tests/test_tokens.py
+++ b/tests/test_tokens.py
@@ -1,20 +1,44 @@
 #! /usr/bin/env python
-
+# -*- coding: utf-8 -*-
 
 import unittest
 from sqlparse import parse
 
-from mysql2sql.process_tokens import requote_names
-from mysql2sql.print_tokens import get_tokens_str
+from sqlconvert.print_tokens import tlist2str
+from sqlconvert.process_mysql import requote_names, remove_directives, \
+        process_statement
 from tests import main
 
 
 class TestTokens(unittest.TestCase):
+    def test_encoding(self):
+        parsed = parse("insert into test (1, 'тест')", 'utf-8')[0]
+        query = tlist2str(parsed).encode('utf-8')
+        self.assertEqual(query,
+                         u"INSERT INTO test (1, 'тест')".encode('utf-8'))
+
+    def test_unicode(self):
+        parsed = parse(u"insert into test (1, 'тест')")[0]
+        query = tlist2str(parsed)
+        self.assertEqual(query, u"INSERT INTO test (1, 'тест')")
+
     def test_requote(self):
         parsed = parse("select * from `T`")[0]
         requote_names(parsed)
-        query = get_tokens_str(parsed)
-        self.assertEqual(query, 'SELECT * FROM "T";\n')
+        query = tlist2str(parsed)
+        self.assertEqual(query, 'SELECT * FROM "T"')
+
+    def test_directives(self):
+        parsed = parse("select /*! test */ * from /* test */ `T`")[0]
+        remove_directives(parsed)
+        query = tlist2str(parsed)
+        self.assertEqual(query, 'SELECT * FROM /* test */ `T`')
+
+    def test_process(self):
+        parsed = parse("select /*! test */ * from /* test */ `T`")[0]
+        process_statement(parsed)
+        query = tlist2str(parsed)
+        self.assertEqual(query, 'SELECT * FROM /* test */ "T"')
 
 
 if __name__ == "__main__":