diff --git a/src/test/java/caosdb/server/query/TestCQL.java b/src/test/java/caosdb/server/query/TestCQL.java index 829e148a45223e560f4d3236f51d6ec4ad0bde4c..578cb5c9e918c4a81ced10a3c65248356f762fe5 100644 --- a/src/test/java/caosdb/server/query/TestCQL.java +++ b/src/test/java/caosdb/server/query/TestCQL.java @@ -4673,44 +4673,44 @@ public class TestCQL { assertEquals("2015", pov.getValue()); } - /** String query33a = "FIND ename WITH a date IN \"2015\""; */ - @Test - public void testQuery33a() { - CQLLexer lexer; - lexer = new CQLLexer(CharStreams.fromString(this.query33a)); - final CommonTokenStream tokens = new CommonTokenStream(lexer); - - final CQLParser parser = new CQLParser(tokens); - final CqContext sfq = parser.cq(); - - System.out.println(sfq.toStringTree(parser)); - - // 4 children: FIND, role, WHICHCLAUSE, EOF - assertEquals(4, sfq.getChildCount()); - assertEquals("FIND", sfq.getChild(0).getText()); - assertEquals("ename", sfq.getChild(1).getText()); - assertEquals("WITHadateIN\"2015\"", sfq.getChild(2).getText()); - assertEquals("ename", sfq.e.toString()); - assertNull(sfq.r); - assertEquals("POV", sfq.filter.getClass().getSimpleName()); - - final ParseTree whichclause sfq.getChild(2); - // 2 children; WHICH, transaction - assertEquals(2, whichclause.getChildCount()); - assertEquals("WITHa", whichclause.getChild(0).getText()); - assertEquals("dateIN\"2015\"", whichclause.getChild(1).getText()); - - final ParseTree transactionFilter = whichclause.getChild(1).getChild(0); - assertEquals(3, transactionFilter.getChildCount()); - assertEquals("date", transactionFilter.getChild(0).getText()); - assertEquals("IN", transactionFilter.getChild(1).getText()); - assertEquals("\"2015\"", transactionFilter.getChild(2).getText()); - - asserTrue(sfq.filter instanceof POV); - final POV pov = (POV) sfq.filter; - assertEquals("(", pov.getOperator()); - assertEquals("2015", pov.getValue()); - } + /** String query33a = "FIND ename WITH a date IN \"2015\""; */ + @Test + public void testQuery33a() { + CQLLexer lexer; + lexer = new CQLLexer(CharStreams.fromString(this.query33a)); + final CommonTokenStream tokens = new CommonTokenStream(lexer); + + final CQLParser parser = new CQLParser(tokens); + final CqContext sfq = parser.cq(); + + System.out.println(sfq.toStringTree(parser)); + + // 4 children: FIND, role, WHICHCLAUSE, EOF + assertEquals(4, sfq.getChildCount()); + assertEquals("FIND", sfq.getChild(0).getText()); + assertEquals("ename", sfq.getChild(1).getText()); + assertEquals("WITHadateIN\"2015\"", sfq.getChild(2).getText()); + assertEquals("ename", sfq.e.toString()); + assertNull(sfq.r); + assertEquals("POV", sfq.filter.getClass().getSimpleName()); + + final ParseTree whichclause = sfq.getChild(2); + // 2 children; WHICH, transaction + assertEquals(2, whichclause.getChildCount()); + assertEquals("WITHa", whichclause.getChild(0).getText()); + assertEquals("dateIN\"2015\"", whichclause.getChild(1).getText()); + + final ParseTree transactionFilter = whichclause.getChild(1).getChild(0); + assertEquals(3, transactionFilter.getChildCount()); + assertEquals("date", transactionFilter.getChild(0).getText()); + assertEquals("IN", transactionFilter.getChild(1).getText()); + assertEquals("\"2015\"", transactionFilter.getChild(2).getText()); + + assertTrue(sfq.filter instanceof POV); + final POV pov = (POV) sfq.filter; + assertEquals("(", pov.getOperator()); + assertEquals("2015", pov.getValue()); + } /** String query34 = "FIND ename WITH a date NOT IN 2015"; */ @Test