diff options
| author | Lester Solbakken <lesters@users.noreply.github.com> | 2021-04-13 16:39:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-13 16:39:19 +0200 |
| commit | 80ae4ab691dde21bb156285fafa7910baa4a42bd (patch) | |
| tree | ba3d1519e6fe3e8687accd1a3dfeb431df38c6fc | |
| parent | d37e02a666105a210935643015975a0bf7f4ab9c (diff) | |
| parent | 3c3bc1647057559f4b30a99662e37c7bb64b2c6d (diff) | |
Merge pull request #17408 from vespa-engine/bratseth/concat-test
Test concat
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) { |