From fb2e600fd65ee14e919f8a9b617db62bd55c2fb5 Mon Sep 17 00:00:00 2001
From: Daniel Hornung <d.hornung@indiscale.com>
Date: Mon, 31 Jan 2022 10:12:19 +0100
Subject: [PATCH] MAINT: Putting TestCQL tests in order.
---
.../java/org/caosdb/server/query/TestCQL.java | 81 +++++++++----------
1 file changed, 40 insertions(+), 41 deletions(-)
diff --git a/src/test/java/org/caosdb/server/query/TestCQL.java b/src/test/java/org/caosdb/server/query/TestCQL.java
index 14c6d48b..a721fec3 100644
--- a/src/test/java/org/caosdb/server/query/TestCQL.java
+++ b/src/test/java/org/caosdb/server/query/TestCQL.java
@@ -6748,11 +6748,11 @@ public class TestCQL {
new Query(this.queryIssue131).parse();
}
- /** String issue131f = "FIND ename WITH (pname1.pname2 > 30) AND pname1.pname2 < 40"; */
+ /** String issue131a = "FIND ename WITH pname1.x AND pname2"; */
@Test
- public void testIssue131f() {
+ public void testIssue131a() {
CQLLexer lexer;
- lexer = new CQLLexer(CharStreams.fromString(this.issue131f));
+ lexer = new CQLLexer(CharStreams.fromString(this.issue131a));
final CommonTokenStream tokens = new CommonTokenStream(lexer);
final CQLParser parser = new CQLParser(tokens);
@@ -6768,18 +6768,17 @@ public class TestCQL {
POV pov1 = ((POV) filters.get(0));
POV pov2 = ((POV) filters.get(1));
assertEquals("POV(pname1,null,null)", pov1.toString());
- assertEquals("POV(pname1,null,null)", pov2.toString());
+ assertEquals("POV(pname2,null,null)", pov2.toString());
assertTrue(pov1.hasSubProperty());
- assertTrue(pov2.hasSubProperty());
- assertEquals("POV(pname2,>,30)", pov1.getSubProperty().getFilter().toString());
- assertEquals("POV(pname2,<,40)", pov2.getSubProperty().getFilter().toString());
+ assertFalse(pov2.hasSubProperty());
+ assertEquals("POV(x,null,null)", pov1.getSubProperty().getFilter().toString());
}
- /** String issue131e = "FIND ename WITH (pname1.pname2 > 30) AND (pname1.pname2 < 40)"; */
+ /** String issue131b = "FIND ename WITH (pname1.x < 10) AND (pname1.x)"; */
@Test
- public void testIssue131e() {
+ public void testIssue131b() {
CQLLexer lexer;
- lexer = new CQLLexer(CharStreams.fromString(this.issue131e));
+ lexer = new CQLLexer(CharStreams.fromString(this.issue131b));
final CommonTokenStream tokens = new CommonTokenStream(lexer);
final CQLParser parser = new CQLParser(tokens);
@@ -6798,15 +6797,15 @@ public class TestCQL {
assertEquals("POV(pname1,null,null)", pov2.toString());
assertTrue(pov1.hasSubProperty());
assertTrue(pov2.hasSubProperty());
- assertEquals("POV(pname2,>,30)", pov1.getSubProperty().getFilter().toString());
- assertEquals("POV(pname2,<,40)", pov2.getSubProperty().getFilter().toString());
+ assertEquals("POV(x,<,10)", pov1.getSubProperty().getFilter().toString());
+ assertEquals("POV(x,null,null)", pov2.getSubProperty().getFilter().toString());
}
- /** String issue131d = "FIND ename WITH (pname1.x) AND pname2"; */
+ /** String issue131c = "FIND ename WITH pname2 AND pname1.x "; */
@Test
- public void testIssue131d() {
+ public void testIssue131c() {
CQLLexer lexer;
- lexer = new CQLLexer(CharStreams.fromString(this.issue131d));
+ lexer = new CQLLexer(CharStreams.fromString(this.issue131c));
final CommonTokenStream tokens = new CommonTokenStream(lexer);
final CQLParser parser = new CQLParser(tokens);
@@ -6821,17 +6820,18 @@ public class TestCQL {
assertTrue(filters.get(1) instanceof POV);
POV pov1 = ((POV) filters.get(0));
POV pov2 = ((POV) filters.get(1));
- assertEquals("POV(pname1,null,null)", pov1.toString());
- assertEquals("POV(pname2,null,null)", pov2.toString());
- assertTrue(pov1.hasSubProperty());
- assertFalse(pov2.hasSubProperty());
- assertEquals("POV(x,null,null)", pov1.getSubProperty().getFilter().toString());
+ assertEquals("POV(pname2,null,null)", pov1.toString());
+ assertEquals("POV(pname1,null,null)", pov2.toString());
+ assertFalse(pov1.hasSubProperty());
+ assertTrue(pov2.hasSubProperty());
+ assertEquals("POV(x,null,null)", pov2.getSubProperty().getFilter().toString());
}
- /** String issue131c = "FIND ename WITH pname2 AND pname1.x "; */
+
+ /** String issue131d = "FIND ename WITH (pname1.x) AND pname2"; */
@Test
- public void testIssue131c() {
+ public void testIssue131d() {
CQLLexer lexer;
- lexer = new CQLLexer(CharStreams.fromString(this.issue131c));
+ lexer = new CQLLexer(CharStreams.fromString(this.issue131d));
final CommonTokenStream tokens = new CommonTokenStream(lexer);
final CQLParser parser = new CQLParser(tokens);
@@ -6846,26 +6846,24 @@ public class TestCQL {
assertTrue(filters.get(1) instanceof POV);
POV pov1 = ((POV) filters.get(0));
POV pov2 = ((POV) filters.get(1));
- assertEquals("POV(pname2,null,null)", pov1.toString());
- assertEquals("POV(pname1,null,null)", pov2.toString());
- assertFalse(pov1.hasSubProperty());
- assertTrue(pov2.hasSubProperty());
- assertEquals("POV(x,null,null)", pov2.getSubProperty().getFilter().toString());
+ assertEquals("POV(pname1,null,null)", pov1.toString());
+ assertEquals("POV(pname2,null,null)", pov2.toString());
+ assertTrue(pov1.hasSubProperty());
+ assertFalse(pov2.hasSubProperty());
+ assertEquals("POV(x,null,null)", pov1.getSubProperty().getFilter().toString());
}
- /** String issue131b = "FIND ename WITH (pname1.x < 10) AND (pname1.x)"; */
+ /** String issue131e = "FIND ename WITH (pname1.pname2 > 30) AND (pname1.pname2 < 40)"; */
@Test
- public void testIssue131b() {
+ public void testIssue131e() {
CQLLexer lexer;
- lexer = new CQLLexer(CharStreams.fromString(this.issue131b));
+ lexer = new CQLLexer(CharStreams.fromString(this.issue131e));
final CommonTokenStream tokens = new CommonTokenStream(lexer);
final CQLParser parser = new CQLParser(tokens);
final CqContext sfq = parser.cq();
System.out.println(sfq.toStringTree(parser));
- //
- // assertEquals(sfq.getChild(3).getChild(2).getChild(1).getChild(0).getChild(1).getChild(0).getChild(3).getChild(0).getChild(1).getText(), "");
assertTrue(sfq.filter instanceof Conjunction);
LinkedList<EntityFilterInterface> filters = ((Conjunction) sfq.filter).getFilters();
@@ -6878,15 +6876,15 @@ public class TestCQL {
assertEquals("POV(pname1,null,null)", pov2.toString());
assertTrue(pov1.hasSubProperty());
assertTrue(pov2.hasSubProperty());
- assertEquals("POV(x,<,10)", pov1.getSubProperty().getFilter().toString());
- assertEquals("POV(x,null,null)", pov2.getSubProperty().getFilter().toString());
+ assertEquals("POV(pname2,>,30)", pov1.getSubProperty().getFilter().toString());
+ assertEquals("POV(pname2,<,40)", pov2.getSubProperty().getFilter().toString());
}
- /** String issue131a = "FIND ename WITH pname1.x AND pname2"; */
+ /** String issue131f = "FIND ename WITH (pname1.pname2 > 30) AND pname1.pname2 < 40"; */
@Test
- public void testIssue131a() {
+ public void testIssue131f() {
CQLLexer lexer;
- lexer = new CQLLexer(CharStreams.fromString(this.issue131a));
+ lexer = new CQLLexer(CharStreams.fromString(this.issue131f));
final CommonTokenStream tokens = new CommonTokenStream(lexer);
final CQLParser parser = new CQLParser(tokens);
@@ -6902,9 +6900,10 @@ public class TestCQL {
POV pov1 = ((POV) filters.get(0));
POV pov2 = ((POV) filters.get(1));
assertEquals("POV(pname1,null,null)", pov1.toString());
- assertEquals("POV(pname2,null,null)", pov2.toString());
+ assertEquals("POV(pname1,null,null)", pov2.toString());
assertTrue(pov1.hasSubProperty());
- assertFalse(pov2.hasSubProperty());
- assertEquals("POV(x,null,null)", pov1.getSubProperty().getFilter().toString());
+ assertTrue(pov2.hasSubProperty());
+ assertEquals("POV(pname2,>,30)", pov1.getSubProperty().getFilter().toString());
+ assertEquals("POV(pname2,<,40)", pov2.getSubProperty().getFilter().toString());
}
}
--
GitLab