uncomment other tests, pass error type as parameter

Author: simeonreusch

src/queryparser/testing/test_postgresql.py

@@ -14,26 +14,26 @@
     tests = yaml.load(f, Loader=yaml.FullLoader)
 
 
-# @pytest.mark.parametrize("t", tests['common_tests'])
-# def test_postgresql_parsing_common(t):
-#     _test_parsing(PostgreSQLQueryProcessor, t)
+@pytest.mark.parametrize('t', tests['common_tests'])
+def test_postgresql_parsing_common(t):
+    _test_parsing(PostgreSQLQueryProcessor, t)
 
 
-# @pytest.mark.parametrize('t', tests['postgresql_tests'])
-# def test_postgresql_parsing(t):
-#     _test_parsing(PostgreSQLQueryProcessor, t)
+@pytest.mark.parametrize('t', tests['postgresql_tests'])
+def test_postgresql_parsing(t):
+    _test_parsing(PostgreSQLQueryProcessor, t)
 
 
-# @pytest.mark.parametrize("t", tests['common_syntax_tests'])
-# def test_postgresql_syntax(t):
-#     with pytest.raises(QuerySyntaxError):
-#         PostgreSQLQueryProcessor(t)
+@pytest.mark.parametrize('t', tests['common_syntax_tests'])
+def test_postgresql_syntax(t):
+    with pytest.raises(QuerySyntaxError):
+        PostgreSQLQueryProcessor(t)
 
 
-# @pytest.mark.parametrize("t", tests['common_query_tests'])
-# def test_postrgresql_query(t):
-#     with pytest.raises(QueryError):
-#         PostgreSQLQueryProcessor(t)
+@pytest.mark.parametrize('t', tests['common_query_tests'])
+def test_postrgresql_query(t):
+    with pytest.raises(QueryError):
+        PostgreSQLQueryProcessor(t)
 
 
 @pytest.mark.parametrize('t', tests['postgresql_failure_tests'])

src/queryparser/testing/tests.yaml

@@ -829,31 +829,40 @@ postgresql_tests:
         - 
 
     -
-        - "SELECT specuid, ra, dec FROM dr1.spectrum WHERE QMOST_SPEC_IS_IN_SURVEY(specuid, '04');"
+        - SELECT specuid, ra, dec FROM dr1.spectrum WHERE QMOST_SPEC_IS_IN_SURVEY(specuid, '04');
         - ['dr1.spectrum.specuid', 'dr1.spectrum.ra', 'dr1.spectrum.dec']
-        - ["where"]
-        - ["QMOST_SPEC_IS_IN_SURVEY"]
-        - ["specuid: dr1.spectrum.specuid", "ra: dr1.spectrum.ra", "dec: dr1.spectrum.dec"]
-        - ["dr1.spectrum"]
+        - [where]
+        - [QMOST_SPEC_IS_IN_SURVEY]
+        - ['specuid: dr1.spectrum.specuid', 'ra: dr1.spectrum.ra', 'dec: dr1.spectrum.dec']
+        - [dr1.spectrum]
         - 
-        - ["QMOST_SPEC_IS_IN_SURVEY"]
+        - [QMOST_SPEC_IS_IN_SURVEY]
 
 postgresql_failure_tests:
     -
         - SELECT specuid, ra, dec FROM dr1.spectrum WHERE QMOST_SPEC_IS_IN_SURVEY(specuid, '04');
+        - syntax
         - 
         - []
 
     -
         - SELECT specuid, ra, dec FROM dr1.spectrum WHERE BLA(specuid, '04');
+        - syntax
         - 
         - [QMOST_SPEC_IS_IN_SURVEY]
 
     -
         - SELECT specuid, ra, dec FROM dr1.spectrum WHERE QMOST_SPEC_IS_IN_SURVEY[specuid, '04'];
+        - syntax
         - 
         - [QMOST_SPEC_IS_IN_SURVEY]
 
+    -
+        - SELECT specuid, ra, dec FROM dr1.spectrum WHERE a(specuid, '04');
+        - value
+        - 
+        - [a, b, c, d, e, f, g, h, i, j, k, l]
+
 
 adql_mysql_tests:
     -

src/queryparser/testing/utils.py

@@ -81,7 +81,12 @@ def _test_parsing(query_processor, test, translate=False):
 
 
 def _test_failure_parsing(query_processor, test, translate=False):
-    query, replace_schema_name, replace_function_names = test
+    query, errortype, replace_schema_name, replace_function_names = test
+
+    if errortype == 'syntax':
+        e = QuerySyntaxError
+    elif errortype == 'value':
+        e = ValueError
 
     if translate:
         adt = ADQLQueryTranslator()
@@ -94,7 +99,7 @@ def _test_failure_parsing(query_processor, test, translate=False):
     qp = query_processor()
     qp.set_query(query)
 
-    with pytest.raises(QuerySyntaxError):
+    with pytest.raises(e):
         qp.process_query(
             replace_schema_name=replace_schema_name,
             replace_function_names=replace_function_names,