summaryrefslogtreecommitdiff
path: root/tests/test_format.py
diff options
context:
space:
mode:
authorJesús Leganés Combarro "Piranna" <piranna@gmail.com>2012-05-15 16:39:48 +0200
committerJesús Leganés Combarro "Piranna" <piranna@gmail.com>2012-05-15 16:39:48 +0200
commit8ff6da8da005c73077335f0e2c7f3cfe62c062e4 (patch)
tree7c4c01fb5084aa1af2390a3a80f0b5ab7d85d5f4 /tests/test_format.py
parentf35ec7364c0e85f6be7ef41bc2dc8114b40d1904 (diff)
downloadsqlparse-8ff6da8da005c73077335f0e2c7f3cfe62c062e4.tar.gz
Converted StripCommentsFilter to a function
Diffstat (limited to 'tests/test_format.py')
-rw-r--r--tests/test_format.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/tests/test_format.py b/tests/test_format.py
index 0ec2192..0421297 100644
--- a/tests/test_format.py
+++ b/tests/test_format.py
@@ -4,6 +4,8 @@ from tests.utils import TestCaseBase
import sqlparse
+from sqlparse.formatter import SQLParseError
+
class TestFormat(TestCaseBase):
@@ -15,7 +17,7 @@ class TestFormat(TestCaseBase):
self.ndiffAssertEqual(res, 'Select * From bar; -- select foo\n')
res = sqlparse.format(sql.upper(), keyword_case='lower')
self.ndiffAssertEqual(res, 'select * from BAR; -- SELECT FOO\n')
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, sql,
+ self.assertRaises(SQLParseError, sqlparse.format, sql,
keyword_case='foo')
def test_identifiercase(self):
@@ -26,7 +28,7 @@ class TestFormat(TestCaseBase):
self.ndiffAssertEqual(res, 'select * from Bar; -- select foo\n')
res = sqlparse.format(sql.upper(), identifier_case='lower')
self.ndiffAssertEqual(res, 'SELECT * FROM bar; -- SELECT FOO\n')
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, sql,
+ self.assertRaises(SQLParseError, sqlparse.format, sql,
identifier_case='foo')
sql = 'select * from "foo"."bar"'
res = sqlparse.format(sql, identifier_case="upper")
@@ -42,7 +44,7 @@ class TestFormat(TestCaseBase):
sql = 'select-- foo\nfrom -- bar\nwhere'
res = sqlparse.format(sql, strip_comments=True)
self.ndiffAssertEqual(res, 'select from where')
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, sql,
+ self.assertRaises(SQLParseError, sqlparse.format, sql,
strip_comments=None)
def test_strip_comments_multi(self):
@@ -65,7 +67,7 @@ class TestFormat(TestCaseBase):
self.ndiffAssertEqual(f(s), 'select * from foo where (1 = 2)')
s = 'select -- foo\nfrom bar\n'
self.ndiffAssertEqual(f(s), 'select -- foo\nfrom bar')
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, s,
+ self.assertRaises(SQLParseError, sqlparse.format, s,
strip_whitespace=None)
def test_preserve_ws(self):
@@ -76,20 +78,20 @@ class TestFormat(TestCaseBase):
def test_outputformat(self):
sql = 'select * from foo;'
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, sql,
+ self.assertRaises(SQLParseError, sqlparse.format, sql,
output_format='foo')
class TestFormatReindent(TestCaseBase):
def test_option(self):
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, 'foo',
+ self.assertRaises(SQLParseError, sqlparse.format, 'foo',
reindent=2)
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, 'foo',
+ self.assertRaises(SQLParseError, sqlparse.format, 'foo',
indent_tabs=2)
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, 'foo',
+ self.assertRaises(SQLParseError, sqlparse.format, 'foo',
reindent=True, indent_width='foo')
- self.assertRaises(sqlparse.SQLParseError, sqlparse.format, 'foo',
+ self.assertRaises(SQLParseError, sqlparse.format, 'foo',
reindent=True, indent_width= -12)
def test_stmts(self):