diff --git a/src/test/java/org/caosdb/server/query/TestCQL.java b/src/test/java/org/caosdb/server/query/TestCQL.java index 6c289adaef49f356aeaa7b5c7c744d4c4b1a6ce3..6d8f015d158aafe86baa087d6b56d38c0283ec62 100644 --- a/src/test/java/org/caosdb/server/query/TestCQL.java +++ b/src/test/java/org/caosdb/server/query/TestCQL.java @@ -7023,32 +7023,28 @@ public class TestCQL { */ @Test public void testIssue203() { + // setup 203a CQLLexer lexer; lexer = new CQLLexer(CharStreams.fromString(this.issue203a)); CommonTokenStream tokens = new CommonTokenStream(lexer); - CQLParser parser = new CQLParser(tokens); CqContext sfq = parser.cq(); - System.out.println(sfq.toStringTree(parser)); - assertEquals(3, sfq.getChildCount()); + // here we test that the filter stays a POV and is not falsly interpreted + // as subproperty filter assertTrue(sfq.filter instanceof POV); - // with conjunction + // setup 203b (with conjunction) lexer = new CQLLexer(CharStreams.fromString(this.issue203b)); tokens = new CommonTokenStream(lexer); - parser = new CQLParser(tokens); sfq = parser.cq(); - - System.out.println(sfq.toStringTree(parser)); - System.out.println(sfq.getChildCount()); - System.out.println(sfq.getChildCount()); Conjunction conj = (Conjunction) sfq.filter; - System.out.println(conj.getFilters().size()); - assertEquals(3, sfq.getChildCount()); + + // the outer filter should be conjuction assertTrue(sfq.filter instanceof Conjunction); - assertEquals(2, conj.getFilters().size()); + // here we test that the filters stays a POV and is not falsly interpreted + // as subproperty filters assertTrue(conj.getFilters().get(0) instanceof POV); assertTrue(conj.getFilters().get(1) instanceof POV); }