From 9a0f1022943a5fd3b4a2fb1a7c9f1e392f196500 Mon Sep 17 00:00:00 2001
From: gmantele <gmantele@ari.uni-heidelberg.de>
Date: Wed, 20 Apr 2016 16:02:29 +0200
Subject: [PATCH] [ADQL] Adapt the JUnit test case for ADQLParser according to
the last commit.
---
test/adql/parser/TestADQLParser.java | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/test/adql/parser/TestADQLParser.java b/test/adql/parser/TestADQLParser.java
index 1272d67..16044b9 100644
--- a/test/adql/parser/TestADQLParser.java
+++ b/test/adql/parser/TestADQLParser.java
@@ -40,7 +40,6 @@ public class TestADQLParser {
parser.parseQuery("SELECT * FROM cat ORDER BY 1 DESC;");
// GROUP BY
parser.parseQuery("SELECT * FROM cat GROUP BY oid;");
- parser.parseQuery("SELECT * FROM cat GROUP BY 1;");
// JOIN ... USING(...)
parser.parseQuery("SELECT * FROM cat JOIN cat2 USING(oid);");
}catch(Exception e){
@@ -67,14 +66,23 @@ public class TestADQLParser {
}
try{
- // GROUP BY
+ // GROUP BY with a qualified column name
parser.parseQuery("SELECT * FROM cat GROUP BY cat.oid;");
- fail("A qualified column name is forbidden in ORDER BY! This test should have failed.");
+ fail("A qualified column name is forbidden in GROUP BY! This test should have failed.");
}catch(Exception e){
assertEquals(ParseException.class, e.getClass());
assertEquals(" Encountered \".\". Was expecting one of: <EOF> \",\" \";\" \"HAVING\" \"ORDER BY\" ", e.getMessage());
}
+ try{
+ // GROUP BY with a SELECT item index
+ parser.parseQuery("SELECT * FROM cat GROUP BY 1;");
+ fail("A SELECT item index is forbidden in GROUP BY! This test should have failed.");
+ }catch(Exception e){
+ assertEquals(ParseException.class, e.getClass());
+ assertEquals(" Encountered \"1\". Was expecting one of: \"\\\"\" <REGULAR_IDENTIFIER> ", e.getMessage());
+ }
+
try{
// JOIN ... USING(...)
parser.parseQuery("SELECT * FROM cat JOIN cat2 USING(cat.oid);");
--
GitLab