switched to strolch elements in tests and fixed mull pointer problem in chained method execution
This commit is contained in:
parent
353c1a35fb
commit
85499f60ae
|
@ -41,6 +41,10 @@
|
||||||
<groupId>li.strolch</groupId>
|
<groupId>li.strolch</groupId>
|
||||||
<artifactId>li.strolch.privilege</artifactId>
|
<artifactId>li.strolch.privilege</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>li.strolch</groupId>
|
||||||
|
<artifactId>li.strolch.model</artifactId>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- Test -->
|
<!-- Test -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -33,6 +33,7 @@ public class ChainedMethodExpression extends AbstractObjectExpression {
|
||||||
for (MethodExpression methodExpression : methodExpressions) {
|
for (MethodExpression methodExpression : methodExpressions) {
|
||||||
methodExpression.setObject(object);
|
methodExpression.setObject(object);
|
||||||
object = methodExpression.evaluate(inputObjects, queryParameter);
|
object = methodExpression.evaluate(inputObjects, queryParameter);
|
||||||
|
if (object == null) return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return object;
|
return object;
|
||||||
|
|
|
@ -8,13 +8,12 @@ import li.strolch.soql.core.SOQLEvaluationException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Compares two or more expressions, for example 'a.name = "12345"'
|
* Compares two or more expressions, for example 'a.name = "12345"'
|
||||||
*
|
* <p>
|
||||||
* Currently only the following operators for equality check are supported:
|
* Currently only the following operators for equality check are supported:
|
||||||
*
|
* <p>
|
||||||
* '=' | '<>' | '>' | '>=' | '<' | '<=' ;
|
* '=' | '<>' | '>' | '>=' | '<' | '<=' ;
|
||||||
*
|
*
|
||||||
* @author msmock
|
* @author msmock
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
public class ComparisonExpression extends AbstractBooleanExpression {
|
public class ComparisonExpression extends AbstractBooleanExpression {
|
||||||
|
|
||||||
|
@ -76,7 +75,7 @@ public class ComparisonExpression extends AbstractBooleanExpression {
|
||||||
return ((Integer) result_1).compareTo((Integer) result_2) < 0;
|
return ((Integer) result_1).compareTo((Integer) result_2) < 0;
|
||||||
} else if (result_1 instanceof Long && result_2 instanceof Long) {
|
} else if (result_1 instanceof Long && result_2 instanceof Long) {
|
||||||
return ((Long) result_1).compareTo((Long) result_2) < 0;
|
return ((Long) result_1).compareTo((Long) result_2) < 0;
|
||||||
} else if (result_1 instanceof Double && result_2 instanceof Double) {
|
} else if (result_1 instanceof Float && result_2 instanceof Float) {
|
||||||
return ((Float) result_1).compareTo((Float) result_2) < 0;
|
return ((Float) result_1).compareTo((Float) result_2) < 0;
|
||||||
} else if (result_1 instanceof Double && result_2 instanceof Double) {
|
} else if (result_1 instanceof Double && result_2 instanceof Double) {
|
||||||
return ((Double) result_1).compareTo((Double) result_2) < 0;
|
return ((Double) result_1).compareTo((Double) result_2) < 0;
|
||||||
|
@ -102,7 +101,7 @@ public class ComparisonExpression extends AbstractBooleanExpression {
|
||||||
return ((Integer) result_1).compareTo((Integer) result_2) > 0;
|
return ((Integer) result_1).compareTo((Integer) result_2) > 0;
|
||||||
} else if (result_1 instanceof Long && result_2 instanceof Long) {
|
} else if (result_1 instanceof Long && result_2 instanceof Long) {
|
||||||
return ((Long) result_1).compareTo((Long) result_2) > 0;
|
return ((Long) result_1).compareTo((Long) result_2) > 0;
|
||||||
} else if (result_1 instanceof Double && result_2 instanceof Double) {
|
} else if (result_1 instanceof Float && result_2 instanceof Float) {
|
||||||
return ((Float) result_1).compareTo((Float) result_2) > 0;
|
return ((Float) result_1).compareTo((Float) result_2) > 0;
|
||||||
} else if (result_1 instanceof Double && result_2 instanceof Double) {
|
} else if (result_1 instanceof Double && result_2 instanceof Double) {
|
||||||
return ((Double) result_1).compareTo((Double) result_2) > 0;
|
return ((Double) result_1).compareTo((Double) result_2) > 0;
|
||||||
|
@ -117,6 +116,8 @@ public class ComparisonExpression extends AbstractBooleanExpression {
|
||||||
private boolean evaluateEquals(final Map<String, Object> inputObjects, final Map<String, Object> queryParameter) {
|
private boolean evaluateEquals(final Map<String, Object> inputObjects, final Map<String, Object> queryParameter) {
|
||||||
Object result_1 = operands.get(0).evaluate(inputObjects, queryParameter);
|
Object result_1 = operands.get(0).evaluate(inputObjects, queryParameter);
|
||||||
Object result_2 = operands.get(1).evaluate(inputObjects, queryParameter);
|
Object result_2 = operands.get(1).evaluate(inputObjects, queryParameter);
|
||||||
|
if (result_1 == null || result_2 == null)
|
||||||
|
return false;
|
||||||
return result_1.equals(result_2);
|
return result_1.equals(result_2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,8 @@ import li.strolch.soql.core.SOQLEvaluationException;
|
||||||
/**
|
/**
|
||||||
* extract state field value by reflection
|
* extract state field value by reflection
|
||||||
*
|
*
|
||||||
|
* TODO: interpret null pointer in chained expression as null !!
|
||||||
|
*
|
||||||
* @author msmock
|
* @author msmock
|
||||||
*/
|
*/
|
||||||
public class MethodExpression extends AbstractObjectExpression {
|
public class MethodExpression extends AbstractObjectExpression {
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
package li.strolch.soql.core;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
|
||||||
|
|
||||||
public class MockObject {
|
|
||||||
|
|
||||||
String id = "testId";
|
|
||||||
String name = "testName";
|
|
||||||
String type = "testType";
|
|
||||||
|
|
||||||
Map<String, MockParameter> parameter = new HashMap<>();
|
|
||||||
|
|
||||||
int number = 42;
|
|
||||||
|
|
||||||
public String getType() {
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getId() {
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getNumber() {
|
|
||||||
return number;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Object getParameter(String key) {
|
|
||||||
return parameter.get(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Object getParameter(String key, String dummy) {
|
|
||||||
return parameter.get(key);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void putParameter(String key, MockParameter value) {
|
|
||||||
this.parameter.put(key, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "MockObject [id=" + id + ", name=" + name + ", type=" + type + ", number=" + number + "]";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
package li.strolch.soql.core;
|
|
||||||
|
|
||||||
public class MockParameter {
|
|
||||||
|
|
||||||
String value = "testValue";
|
|
||||||
String type = "testType";
|
|
||||||
|
|
||||||
public String getType() {
|
|
||||||
return type;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "MockParameter [value=" + value + ", type=" + type + "]";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,12 +1,12 @@
|
||||||
package li.strolch.soql.core;
|
package li.strolch.soql.core;
|
||||||
|
|
||||||
import static org.junit.Assert.assertEquals;
|
import li.strolch.model.ParameterBag;
|
||||||
import static org.junit.Assert.assertTrue;
|
import li.strolch.model.Resource;
|
||||||
|
import li.strolch.model.StrolchElement;
|
||||||
import java.util.HashMap;
|
import li.strolch.model.parameter.FloatParameter;
|
||||||
import java.util.List;
|
import li.strolch.model.parameter.Parameter;
|
||||||
import java.util.Map;
|
import li.strolch.soql.antlr4.generated.SOQLLexer;
|
||||||
|
import li.strolch.soql.antlr4.generated.SOQLParser;
|
||||||
import org.antlr.v4.runtime.CharStream;
|
import org.antlr.v4.runtime.CharStream;
|
||||||
import org.antlr.v4.runtime.CharStreams;
|
import org.antlr.v4.runtime.CharStreams;
|
||||||
import org.antlr.v4.runtime.CommonTokenStream;
|
import org.antlr.v4.runtime.CommonTokenStream;
|
||||||
|
@ -14,8 +14,12 @@ import org.antlr.v4.runtime.tree.ParseTree;
|
||||||
import org.antlr.v4.runtime.tree.ParseTreeWalker;
|
import org.antlr.v4.runtime.tree.ParseTreeWalker;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import li.strolch.soql.antlr4.generated.SOQLLexer;
|
import java.util.HashMap;
|
||||||
import li.strolch.soql.antlr4.generated.SOQLParser;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
import static org.junit.Assert.assertTrue;
|
||||||
|
|
||||||
public class StatementTest {
|
public class StatementTest {
|
||||||
|
|
||||||
|
@ -57,6 +61,25 @@ public class StatementTest {
|
||||||
return soqlStatement;
|
return soqlStatement;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return a test parameter with String value
|
||||||
|
*/
|
||||||
|
public StrolchElement getTestElement() {
|
||||||
|
final Resource resource = new Resource();
|
||||||
|
resource.setId("testId");
|
||||||
|
|
||||||
|
final ParameterBag bag = new ParameterBag();
|
||||||
|
bag.setId("testBag");
|
||||||
|
resource.addParameterBag(bag);
|
||||||
|
|
||||||
|
final Parameter parameter = new FloatParameter();
|
||||||
|
parameter.setId("testId");
|
||||||
|
parameter.setValue(100d);
|
||||||
|
|
||||||
|
resource.addParameter("testBag", parameter);
|
||||||
|
return resource;
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void test0() throws Exception {
|
public void test0() throws Exception {
|
||||||
|
|
||||||
|
@ -68,7 +91,7 @@ public class StatementTest {
|
||||||
// System.out.println(compiledStatement);
|
// System.out.println(compiledStatement);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("r", new MockObject());
|
inputObjects.put("r", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
|
|
||||||
|
@ -89,8 +112,8 @@ public class StatementTest {
|
||||||
// System.out.println(compiledStatement);
|
// System.out.println(compiledStatement);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("r", new MockObject());
|
inputObjects.put("r", getTestElement());
|
||||||
inputObjects.put("a", new MockObject());
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
|
|
||||||
|
@ -106,14 +129,14 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test2() throws Exception {
|
public void test2() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT r FROM Resource r WHERE r.getName() = \"testName\"";
|
String s = "SELECT r FROM Resource r WHERE r.getId() = \"testId\"";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
|
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("r", new MockObject());
|
inputObjects.put("r", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
|
|
||||||
|
@ -128,14 +151,14 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test3() throws Exception {
|
public void test3() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT r FROM Resource r WHERE r.getName() = \"testNameDiffering\"";
|
String s = "SELECT r FROM Resource r WHERE r.getId() = \"testIdNoMatch\"";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
|
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("r", new MockObject());
|
inputObjects.put("r", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
|
|
||||||
|
@ -151,14 +174,14 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test4() throws Exception {
|
public void test4() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT r, a FROM Resource r, Activity a WHERE r.getType() = a.getType() AND r.getName() = \"testName\"";
|
String s = "SELECT r, a FROM Resource r, Activity a WHERE r.getId() = a.getId() AND r.getId() = \"testId\"";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("r", new MockObject());
|
inputObjects.put("r", getTestElement());
|
||||||
inputObjects.put("a", new MockObject());
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> parameter = new HashMap<>();
|
final Map<String, Object> parameter = new HashMap<>();
|
||||||
|
|
||||||
|
@ -173,16 +196,16 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test5() throws Exception {
|
public void test5() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE a.getName() = :outer_var";
|
String s = "SELECT a FROM Activity a WHERE a.getId() = :outer_var";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("outer_var", "testName");
|
queryParameter.put("outer_var", "testId");
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("a", new MockObject());
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
final List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -195,16 +218,18 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test6() throws Exception {
|
public void test6() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE a.getNumber() < :parameter";
|
String s = "SELECT a FROM Activity a WHERE a.getParameter(:p_1, :p_2).getValue() < :parameter";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("a", new MockObject());
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("parameter", 1234);
|
queryParameter.put("p_1", "testBag");
|
||||||
|
queryParameter.put("p_2", "testId");
|
||||||
|
queryParameter.put("parameter", 101d);
|
||||||
|
|
||||||
final List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
final List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -217,16 +242,18 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test8() throws Exception {
|
public void test8() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE a.getNumber() > :parameter";
|
String s = "SELECT a FROM Activity a WHERE a.getParameter(:p_1, :p_2).getValue() > :parameter";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("a", new MockObject());
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("parameter", 122);
|
queryParameter.put("p_1", "testBag");
|
||||||
|
queryParameter.put("p_2", "testId");
|
||||||
|
queryParameter.put("parameter", 101d);
|
||||||
|
|
||||||
final List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
final List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -239,22 +266,17 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test9() throws Exception {
|
public void test9() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a.getParameter(:param_1) FROM Activity a";
|
String s = "SELECT a.getParameterBag(:param_1) FROM Resource a";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
Map<String, Object> queryParameter = new HashMap<>();
|
Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("param_1", "testBag");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -283,26 +305,19 @@ public class StatementTest {
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
Map<String, Object> queryParameter = new HashMap<>();
|
Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("param_1", "testBag");
|
||||||
queryParameter.put("param_2", matchingKey);
|
queryParameter.put("param_2", "testId");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
assertEquals(1, result.size());
|
assertEquals(1, result.size());
|
||||||
|
|
||||||
String nonMatchingKey = "noPid";
|
|
||||||
|
|
||||||
queryParameter = new HashMap<>();
|
queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", nonMatchingKey);
|
queryParameter.put("param_1", "nex");
|
||||||
queryParameter.put("param_2", "");
|
queryParameter.put("param_2", "testId");
|
||||||
|
|
||||||
result = compiledStatement.evaluate(inputObjects, queryParameter);
|
result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -315,28 +330,23 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test11() throws Exception {
|
public void test11() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a.getParameter(:param_1).getType() FROM Activity a";
|
String s = "SELECT a.getParameterBag(:param_1).getId() FROM Activity a";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("param_1", "testBag");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
assertEquals(1, result.size());
|
assertEquals(1, result.size());
|
||||||
|
|
||||||
assertEquals("testType", result.get(0));
|
assertEquals("testBag", result.get(0));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -345,22 +355,18 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test12() throws Exception {
|
public void test12() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE a.getParameter(:param_1).getType() = \"testType\"";
|
String s = "SELECT a FROM Activity a WHERE a.getParameter(:p_1, :p_2).getType() = \"Float\"";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("p_1", "testBag");
|
||||||
|
queryParameter.put("p_2", "testId");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -374,23 +380,19 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test14() throws Exception {
|
public void test14() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE a.getParameter(:param_1).getType() = :param_2";
|
String s = "SELECT a FROM Activity a WHERE a.getParameter(:p_1, :p_2).getType() = :p_3";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("p_1", "testBag");
|
||||||
queryParameter.put("param_2", "notMatchingString");
|
queryParameter.put("p_2", "testId");
|
||||||
|
queryParameter.put("p_3", "String");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -403,23 +405,19 @@ public class StatementTest {
|
||||||
@Test
|
@Test
|
||||||
public void test15() throws Exception {
|
public void test15() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE NOT a.getParameter(:param_1).getType() = :param_2";
|
String s = "SELECT a FROM Activity a WHERE NOT a.getParameter(:p_1, :p_2).getType() = :p_3";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("p_1", "testBag");
|
||||||
queryParameter.put("param_2", "notMatchingString");
|
queryParameter.put("p_2", "testId");
|
||||||
|
queryParameter.put("p_3", "String");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
|
@ -427,32 +425,28 @@ public class StatementTest {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* test an where expression with a NOT inversion
|
* test null pointer in chained method calls, when the first call returns null
|
||||||
*/
|
*/
|
||||||
@Test
|
@Test
|
||||||
public void test16() throws Exception {
|
public void test16() throws Exception {
|
||||||
|
|
||||||
String s = "SELECT a FROM Activity a WHERE a.getParameter(:param_1).getType() = :param_2";
|
String s = "SELECT a FROM Activity a WHERE a.getParameter(:p_1, :p_2).getType() = :p_3";
|
||||||
|
|
||||||
final ParseTree tree = parseString(s);
|
final ParseTree tree = parseString(s);
|
||||||
final CompiledStatement compiledStatement = compile(tree);
|
final CompiledStatement compiledStatement = compile(tree);
|
||||||
|
|
||||||
final Map<String, Object> inputObjects = new HashMap<>();
|
final Map<String, Object> inputObjects = new HashMap<>();
|
||||||
|
|
||||||
final MockObject a = new MockObject();
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
final String matchingKey = "pid";
|
|
||||||
a.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
inputObjects.put("a", a);
|
|
||||||
|
|
||||||
final Map<String, Object> queryParameter = new HashMap<>();
|
final Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("p_1", "testBag");
|
||||||
queryParameter.put("param_2", "testType");
|
queryParameter.put("p_2", "bullshitId");
|
||||||
|
queryParameter.put("p_3", "String");
|
||||||
|
|
||||||
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
List<Object> result = compiledStatement.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
assertEquals(1, result.size());
|
assertEquals(0, result.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,10 +5,13 @@ import static org.junit.Assert.assertEquals;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import li.strolch.model.ParameterBag;
|
||||||
|
import li.strolch.model.Resource;
|
||||||
|
import li.strolch.model.StrolchElement;
|
||||||
|
import li.strolch.model.parameter.Parameter;
|
||||||
|
import li.strolch.model.parameter.StringParameter;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import li.strolch.soql.core.MockObject;
|
|
||||||
import li.strolch.soql.core.MockParameter;
|
|
||||||
import li.strolch.soql.core.expresssion.ChainedMethodExpression;
|
import li.strolch.soql.core.expresssion.ChainedMethodExpression;
|
||||||
import li.strolch.soql.core.expresssion.MethodArgumentDeclaration;
|
import li.strolch.soql.core.expresssion.MethodArgumentDeclaration;
|
||||||
import li.strolch.soql.core.expresssion.MethodExpression;
|
import li.strolch.soql.core.expresssion.MethodExpression;
|
||||||
|
@ -16,6 +19,25 @@ import li.strolch.soql.core.expresssion.ParameterReference;
|
||||||
|
|
||||||
public class ChainedMethodExpressionTest {
|
public class ChainedMethodExpressionTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return a test parameter with String value
|
||||||
|
*/
|
||||||
|
public StrolchElement getTestElement() {
|
||||||
|
final Resource resource = new Resource();
|
||||||
|
resource.setId("testId");
|
||||||
|
|
||||||
|
final ParameterBag bag = new ParameterBag();
|
||||||
|
bag.setId("testBag");
|
||||||
|
resource.addParameterBag(bag);
|
||||||
|
|
||||||
|
final Parameter parameter = new StringParameter();
|
||||||
|
parameter.setId("testId");
|
||||||
|
parameter.setValue("testValue");
|
||||||
|
|
||||||
|
resource.addParameter("testBag", parameter);
|
||||||
|
return resource;
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void test() {
|
public void test() {
|
||||||
|
|
||||||
|
@ -38,11 +60,9 @@ public class ChainedMethodExpressionTest {
|
||||||
chainedMethodExpression.addMethodExpression(methodExpression);
|
chainedMethodExpression.addMethodExpression(methodExpression);
|
||||||
|
|
||||||
// prepare the runtime objects
|
// prepare the runtime objects
|
||||||
MockObject mockObject = new MockObject();
|
|
||||||
mockObject.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
Map<String, Object> inputObjects = new HashMap<>();
|
Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("a", mockObject);
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
Map<String, Object> queryParameter = new HashMap<>();
|
Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("param_1", matchingKey);
|
||||||
|
@ -50,7 +70,7 @@ public class ChainedMethodExpressionTest {
|
||||||
// evaluate the chained expression
|
// evaluate the chained expression
|
||||||
Object result = chainedMethodExpression.evaluate(inputObjects, queryParameter);
|
Object result = chainedMethodExpression.evaluate(inputObjects, queryParameter);
|
||||||
|
|
||||||
assertEquals(MockParameter.class, result.getClass());
|
assertEquals(StringParameter.class, result.getClass());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,11 +101,9 @@ public class ChainedMethodExpressionTest {
|
||||||
chainedMethodExpression.addMethodExpression(methodExpression_2);
|
chainedMethodExpression.addMethodExpression(methodExpression_2);
|
||||||
|
|
||||||
// prepare the runtime objects
|
// prepare the runtime objects
|
||||||
MockObject mockObject = new MockObject();
|
|
||||||
mockObject.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
Map<String, Object> inputObjects = new HashMap<>();
|
Map<String, Object> inputObjects = new HashMap<>();
|
||||||
inputObjects.put("a", mockObject);
|
inputObjects.put("a", getTestElement());
|
||||||
|
|
||||||
Map<String, Object> queryParameter = new HashMap<>();
|
Map<String, Object> queryParameter = new HashMap<>();
|
||||||
queryParameter.put("param_1", matchingKey);
|
queryParameter.put("param_1", matchingKey);
|
||||||
|
|
|
@ -5,27 +5,47 @@ import static org.junit.Assert.assertEquals;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
import li.strolch.model.ParameterBag;
|
||||||
|
import li.strolch.model.Resource;
|
||||||
|
import li.strolch.model.StrolchElement;
|
||||||
|
import li.strolch.model.parameter.Parameter;
|
||||||
|
import li.strolch.model.parameter.StringListParameter;
|
||||||
|
import li.strolch.model.parameter.StringParameter;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
import li.strolch.soql.core.MockObject;
|
|
||||||
import li.strolch.soql.core.MockParameter;
|
|
||||||
import li.strolch.soql.core.expresssion.MethodArgumentDeclaration;
|
import li.strolch.soql.core.expresssion.MethodArgumentDeclaration;
|
||||||
import li.strolch.soql.core.expresssion.MethodExpression;
|
import li.strolch.soql.core.expresssion.MethodExpression;
|
||||||
import li.strolch.soql.core.expresssion.ParameterReference;
|
import li.strolch.soql.core.expresssion.ParameterReference;
|
||||||
|
|
||||||
public class MethodExpressionTest {
|
public class MethodExpressionTest {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return a test parameter with String value
|
||||||
|
*/
|
||||||
|
public StrolchElement getTestElement() {
|
||||||
|
final Resource resource = new Resource();
|
||||||
|
resource.setId("testId");
|
||||||
|
|
||||||
|
final ParameterBag bag = new ParameterBag();
|
||||||
|
bag.setId("testBag");
|
||||||
|
resource.addParameterBag(bag);
|
||||||
|
|
||||||
|
final Parameter parameter = new StringParameter();
|
||||||
|
parameter.setId("testId");
|
||||||
|
parameter.setValue("testValue");
|
||||||
|
|
||||||
|
resource.addParameter("testBag", parameter);
|
||||||
|
return resource;
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void test() {
|
public void test() {
|
||||||
|
|
||||||
String matchingKey = "testString";
|
String matchingKey = "testString";
|
||||||
|
|
||||||
MockObject mockObject = new MockObject();
|
|
||||||
mockObject.putParameter(matchingKey, new MockParameter());
|
|
||||||
|
|
||||||
MethodExpression methodExpression = new MethodExpression();
|
MethodExpression methodExpression = new MethodExpression();
|
||||||
methodExpression.setMethodName("getParameter");
|
methodExpression.setMethodName("getParameter");
|
||||||
methodExpression.setObject(mockObject);
|
methodExpression.setObject(getTestElement());
|
||||||
|
|
||||||
ParameterReference parameterReference = new ParameterReference();
|
ParameterReference parameterReference = new ParameterReference();
|
||||||
parameterReference.varName = "param_1";
|
parameterReference.varName = "param_1";
|
||||||
|
@ -40,7 +60,7 @@ public class MethodExpressionTest {
|
||||||
|
|
||||||
Object result = methodExpression.evaluate(null, queryParameter);
|
Object result = methodExpression.evaluate(null, queryParameter);
|
||||||
|
|
||||||
assertEquals(MockParameter.class, result.getClass());
|
assertEquals(StringParameter.class, result.getClass());
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue