Move regression tests.

4 files changed, 22 insertions, 37 deletions

diff --git a/tests/regressiontests/__init__.py b/tests/regressiontests/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/tests/regressiontests/__init__.py
+++ /dev/null
diff --git a/tests/regressiontests/issue13.py b/tests/regressiontests/issue13.py
deleted file mode 100644
index d3940e1..0000000
--- a/tests/regressiontests/issue13.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import unittest
-
-import sqlparse
-
-
-TEST_SQL = """select 'one';
-select 'two\\'';
-select 'three';"""
-
-
-class TestIssue13(unittest.TestCase):
-
-    def test_quoted(self):
-        parsed = sqlparse.parse(TEST_SQL)
-        self.assertEqual(len(parsed), 3)
-        self.assertEqual(str(parsed[1]).strip(), "select 'two\\'';")
diff --git a/tests/regressiontests/issue9.py b/tests/regressiontests/issue9.py
deleted file mode 100644
index 075e849..0000000
--- a/tests/regressiontests/issue9.py
+++ /dev/null
@@ -1,18 +0,0 @@
-import unittest
-
-import sqlparse
-from sqlparse.sql import Statement, Parenthesis
-from sqlparse import tokens as T
-
-
-class TestIssue9(unittest.TestCase):
-
-    def test_where_doesnt_consume_parenthesis(self):
-        p = sqlparse.parse('(where 1)')[0]
-        self.assert_(isinstance(p, Statement))
-        self.assertEqual(len(p.tokens), 1)
-        self.assert_(isinstance(p.tokens[0], Parenthesis))
-        prt = p.tokens[0]
-        self.assertEqual(len(prt.tokens), 3)
-        self.assertEqual(prt.tokens[0].ttype, T.Punctuation)
-        self.assertEqual(prt.tokens[-1].ttype, T.Punctuation)
diff --git a/tests/test_regressions.py b/tests/test_regressions.py
index 0d65ef7..3046b97 100644
--- a/tests/test_regressions.py
+++ b/tests/test_regressions.py
@@ -3,12 +3,31 @@
 import unittest
 
 import sqlparse
-from sqlparse import tokens
+from sqlparse import sql
+from sqlparse import tokens as T
 
 
 class RegressionTests(unittest.TestCase):
 
+    def test_issue9(self):
+        # make sure where doesn't consume parenthesis
+        p = sqlparse.parse('(where 1)')[0]
+        self.assert_(isinstance(p, sql.Statement))
+        self.assertEqual(len(p.tokens), 1)
+        self.assert_(isinstance(p.tokens[0], sql.Parenthesis))
+        prt = p.tokens[0]
+        self.assertEqual(len(prt.tokens), 3)
+        self.assertEqual(prt.tokens[0].ttype, T.Punctuation)
+        self.assertEqual(prt.tokens[-1].ttype, T.Punctuation)
+
+    def test_issue13(self):
+        parsed = sqlparse.parse(("select 'one';\n"
+                                 "select 'two\\'';\n"
+                                 "select 'three';"))
+        self.assertEqual(len(parsed), 3)
+        self.assertEqual(str(parsed[1]).strip(), "select 'two\\'';")
+
     def test_issue34(self):
         t = sqlparse.parse("create")[0].token_first()
-        self.assertEqual(t.match(tokens.Keyword.DDL, "create"), True)
-        self.assertEqual(t.match(tokens.Keyword.DDL, "CREATE"), True)
+        self.assertEqual(t.match(T.Keyword.DDL, "create"), True)
+        self.assertEqual(t.match(T.Keyword.DDL, "CREATE"), True)