X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=tests%2Ftest_tokens.py;h=24866548cfa3b9abbbbd77d2ef35803badacb5b8;hb=bc473dfbbebeea2e2f4e0f368408632e047949ac;hp=83951c5cc3152d89ed965351804ff5076bd14924;hpb=4c93c3d89685aba33fc45082022373eb93b6583e;p=sqlconvert.git

diff --git a/tests/test_tokens.py b/tests/test_tokens.py
index 83951c5..2486654 100755
--- a/tests/test_tokens.py
+++ b/tests/test_tokens.py
@@ -4,28 +4,48 @@
 import unittest
 from sqlparse import parse
 
-from mysql2sql.process_tokens import requote_names
-from mysql2sql.print_tokens import tlist2str
+from sqlconvert.print_tokens import tlist2str
+from sqlconvert.process_mysql import remove_directive_tokens, requote_names, \
+        is_directive_statement, process_statement
 from tests import main
 
 
 class TestTokens(unittest.TestCase):
-    def test_requote(self):
-        parsed = parse("select * from `T`")[0]
-        requote_names(parsed)
-        query = tlist2str(parsed)
-        self.assertEqual(query, 'SELECT * FROM "T"')
-
     def test_encoding(self):
         parsed = parse("insert into test (1, 'тест')", 'utf-8')[0]
         query = tlist2str(parsed).encode('utf-8')
-        self.assertEqual(query, "INSERT INTO test (1, 'тест')")
+        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 = tlist2str(parsed)
+        self.assertEqual(query, 'SELECT * FROM "T"')
+
+    def test_directive(self):
+        parsed = parse("select /*! test */ * from /* test */ `T`")[0]
+        remove_directive_tokens(parsed)
+        query = tlist2str(parsed)
+        self.assertEqual(query, 'SELECT * FROM /* test */ `T`')
+
+    def test_directive_statement(self):
+        parsed = parse("/*! test */ test ;")[0]
+        self.assertFalse(is_directive_statement(parsed))
+        parsed = parse("/*! test */ ;")[0]
+        self.assertTrue(is_directive_statement(parsed))
+
+    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__":
     main()