From 58d0b78df92935964925f5cf0f29892084ea5352 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 10 Nov 2022 16:07:13 +0100
Subject: [PATCH] TST: fix unit tests
---
.../org/caosdb/server/query/QueryTest.java | 21 +++++++++++--------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/test/java/org/caosdb/server/query/QueryTest.java b/src/test/java/org/caosdb/server/query/QueryTest.java
index 1827ceaf..fa57410f 100644
--- a/src/test/java/org/caosdb/server/query/QueryTest.java
+++ b/src/test/java/org/caosdb/server/query/QueryTest.java
@@ -61,20 +61,23 @@ public class QueryTest {
@Test
public void testGetKey() {
- assertEquals("E_enameF_POV(pname,=,val1)", getCacheKey("FIND ename WITH pname = val1"));
- assertEquals("E_enameF_POV(pname,=,val1)", getCacheKey("COUNT ename WITH pname = val1"));
+ assertEquals("R_RECORDE_enameF_POV(pname,=,val1)", getCacheKey("FIND ename WITH pname = val1"));
assertEquals(
- "E_enameF_POV(pname,=,val1)", getCacheKey("SELECT bla FROM ename WITH pname = val1"));
- assertEquals("E_enameF_POV(pname,null,null)", getCacheKey("SELECT bla FROM ename WITH pname"));
+ "R_RECORDE_enameF_POV(pname,=,val1)", getCacheKey("COUNT ename WITH pname = val1"));
assertEquals(
- "E_enameF_maxPOV(pname,null,null)",
+ "R_RECORDE_enameF_POV(pname,=,val1)",
+ getCacheKey("SELECT bla FROM ename WITH pname = val1"));
+ assertEquals(
+ "R_RECORDE_enameF_POV(pname,null,null)", getCacheKey("SELECT bla FROM ename WITH pname"));
+ assertEquals(
+ "R_RECORDE_enameF_maxPOV(pname,null,null)",
getCacheKey("SELECT bla FROM ename WITH THE GREATEST pname"));
assertEquals(
"R_RECORDE_enameF_POV(pname,=,val1)", getCacheKey("FIND RECORD ename WITH pname = val1"));
assertEquals("R_ENTITYF_POV(pname,=,val1)", getCacheKey("COUNT ENTITY WITH pname = val1"));
assertEquals(
- "E_enameF_Conj(POV(pname,=,val1)POV(ename2,=,val2))",
+ "R_RECORDE_enameF_Conj(POV(pname,=,val1)POV(ename2,=,val2))",
getCacheKey("SELECT bla FROM ename WITH pname = val1 AND ename2 = val2"));
assertEquals("V_R_ENTITYF_ID(,>,2)", getCacheKey("FIND ANY VERSION OF ENTITY WITH ID > 2"));
@@ -83,14 +86,14 @@ public class QueryTest {
assertEquals(
"R_ENTITYF_SAT(asdf/asdf)", getCacheKey("FIND ENTITY WHICH IS STORED AT asdf/asdf"));
assertEquals(
- "E_enameF_POV(ref1,null,null)SUB(POV(pname,>,val1)",
+ "R_RECORDE_enameF_POV(ref1,null,null)SUB(POV(pname,>,val1)",
getCacheKey("FIND ename WITH ref1 WITH pname > val1 "));
assertEquals(
- "E_enameF_@(ref1,null)SUB(POV(pname,>,val1)",
+ "R_RECORDE_enameF_@(ref1,null)SUB(POV(pname,>,val1)",
getCacheKey("FIND ename WHICH IS REFERENCED BY ref1 WITH pname > val1 "));
assertEquals(
- "U_anonymous@anonymousE_enameF_POV(pname,=,val1)",
+ "U_anonymous@anonymousR_RECORDE_enameF_POV(pname,=,val1)",
getCacheKeyWithUser("FIND ename WITH pname = val1"));
}
--
GitLab