summaryrefslogtreecommitdiff
path: root/tests/test_functions.py
diff options
context:
space:
mode:
authorJesús Leganés Combarro "Piranna <jesus.lc@vaelsys.com>2012-05-23 18:49:46 +0200
committerJesús Leganés Combarro "Piranna <jesus.lc@vaelsys.com>2012-05-23 18:49:46 +0200
commit482d6164a5d0e8f01dbf5b6c6d059763bf6d1eec (patch)
tree848ac6954ff7ce40e1cb5eebbdaa5f060e1ecf96 /tests/test_functions.py
parent4caa5c1412fef9c4bddb792cb59063ae9d0321da (diff)
downloadsqlparse-482d6164a5d0e8f01dbf5b6c6d059763bf6d1eec.tar.gz
Fixed some tests
Diffstat (limited to 'tests/test_functions.py')
-rw-r--r--tests/test_functions.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/tests/test_functions.py b/tests/test_functions.py
index d5d8f91..5ab1586 100644
--- a/tests/test_functions.py
+++ b/tests/test_functions.py
@@ -63,17 +63,29 @@ LIMIT 1"""
class Test_Compact(Test_SQL):
def test_compact1(self):
- self.assertEqual(Tokens2Unicode(compact(self.sql, 'tests/files')),
+ stream = compact(tokenize(self.sql), 'tests/files')
+
+ result = Tokens2Unicode(stream)
+
+ self.assertEqual(result,
'INSERT INTO dir_entries(type)VALUES(:type);INSERT INTO '
'directories(inode)VALUES(:inode)LIMIT 1')
def test_compact2(self):
- self.assertEqual(Tokens2Unicode(compact(self.sql2)),
+ stream = tokenize(self.sql2)
+
+ result = compact(stream)
+
+ self.assertEqual(Tokens2Unicode(result),
'SELECT child_entry,asdf AS inode,creation FROM links WHERE '
'parent_dir==:parent_dir AND name==:name LIMIT 1')
def test_compact3(self):
- self.assertEqual(Tokens2Unicode(compact(self.sql3)),
+ stream = tokenize(self.sql3)
+
+ result = compact(stream)
+
+ self.assertEqual(Tokens2Unicode(result),
'SELECT 0 AS st_dev,0 AS st_uid,0 AS st_gid,dir_entries.type AS '
'st_mode,dir_entries.inode AS st_ino,COUNT(links.child_entry)AS '
'st_nlink,:creation AS st_ctime,dir_entries.access AS st_atime,'