diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2022-09-20 22:54:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-20 22:54:04 +0200 |
| commit | 530593d97fa55ec3044f5b6baff3e40e8b37342a (patch) | |
| tree | fa20ede0378f568ad48a4053e9875d289f83d233 /searchlib/src/test/java/com/yahoo/searchlib | |
| parent | 5f308520b4030c1670c394a62bcb4cd1284476ef (diff) | |
Revert "Short circuit boolean expressions"
Diffstat (limited to 'searchlib/src/test/java/com/yahoo/searchlib')
| -rw-r--r-- | searchlib/src/test/java/com/yahoo/searchlib/rankingexpression/evaluation/EvaluationTestCase.java | 12 |
1 files changed, 1 insertions, 11 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 ad50a423eb9..19e32c23234 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 @@ -56,15 +56,6 @@ public class EvaluationTestCase { } @Test - public void testEvaluationOrder() { - EvaluationTester tester = new EvaluationTester(); - tester.assertEvaluates(-4, "1 + -2 + -3"); - tester.assertEvaluates(2, "1 - (2 - 3)"); - tester.assertEvaluates(-4, "(1 - 2) - 3"); - tester.assertEvaluates(-4, "1 - 2 - 3"); - } - - @Test public void testEvaluation() { EvaluationTester tester = new EvaluationTester(); tester.assertEvaluates(0.5, "0.5"); @@ -87,7 +78,6 @@ public class EvaluationTestCase { tester.assertEvaluates(3, "1 + 10 % 6 / 2"); tester.assertEvaluates(10.0, "3 ^ 2 + 1"); tester.assertEvaluates(18.0, "2 * 3 ^ 2"); - tester.assertEvaluates(-4, "1 - 2 - 3"); // Means 1 + -2 + -3 // Conditionals tester.assertEvaluates(2 * (3 * 4 + 3) * (4 * 5 - 4 * 200) / 10, "2*(3*4+3)*(4*5-4*200)/10"); @@ -116,7 +106,7 @@ public class EvaluationTestCase { // Conditionals with branch probabilities RankingExpression e = tester.assertEvaluates(3.5, "if(1.0-1.0, 2.5, 3.5, 0.3)"); - assertEquals(0.3d, ((IfNode) e.getRoot()).getTrueProbability(), tolerance); + assertEquals(0.3d, (double)((IfNode) e.getRoot()).getTrueProbability(), tolerance); // Conditionals as expressions tester.assertEvaluates(new BooleanValue(true), "2<3"); |