summaryrefslogtreecommitdiffstats
path: root/searchlib/src/test/java
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2021-04-13 16:07:45 +0200
committerJon Bratseth <bratseth@gmail.com>2021-04-13 16:07:45 +0200
commit3c3bc1647057559f4b30a99662e37c7bb64b2c6d (patch)
tree47bdf6e86ee975e970de69e505d0185c73c146f2 /searchlib/src/test/java
parenta5f88e456dd105f1c47d2c42329a1c7f97cdde72 (diff)
Test concat
Diffstat (limited to 'searchlib/src/test/java')
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java6
-rw-r--r--searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java2
2 files changed, 7 insertions, 1 deletions
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
index e1daf8c8fe2..bf6a72c5028 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java
@@ -341,6 +341,12 @@ public class EvaluationTestCase {
tester.assertEvaluates("3.0", "tensor0{bar}", true, "{ {x:foo}:1, {x:bar}:3 }");
tester.assertEvaluates("3.3", "tensor0[2]", "tensor(values[4]):[1.1, 2.2, 3.3, 4.4]]");
+ // concat
+ tester.assertEvaluates("tensor(x[5]):[0, 1, 2, 3, 4]",
+ "concat(tensor0, tensor1, x)",
+ "tensor(x[2]):[0, 1]",
+ "tensor(x[3]):[2, 3, 4])");
+
// composite functions
tester.assertEvaluates("{ {x:0}:0.25, {x:1}:0.75 }", "l1_normalize(tensor0, x)", "{ {x:0}:1, {x:1}:3 }");
tester.assertEvaluates("{ {x:0}:0.31622776601683794, {x:1}:0.9486832980505138 }", "l2_normalize(tensor0, x)", "{ {x:0}:1, {x:1}:3 }");
diff --git a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java
index 488930a8eb9..e974bcb47cd 100644
--- a/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java
+++ b/searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTester.java
@@ -75,7 +75,7 @@ public class EvaluationTester {
RankingExpression expression = new RankingExpression(expressionString);
if ( ! explanation.isEmpty())
explanation = explanation + ": ";
- assertEquals(explanation + expression.toString(), value, expression.evaluate(context));
+ assertEquals(explanation + expression, value, expression.evaluate(context));
return expression;
}
catch (ParseException e) {