diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java')
| -rw-r--r-- | container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java index 734e2c6a0cb..39fdc7fc3a6 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/MathResolverTestCase.java @@ -1,10 +1,10 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.request; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; /** * @author Simon Thoresen Hult @@ -18,40 +18,40 @@ public class MathResolverTestCase { // -------------------------------------------------------------------------------- @Test - public void testOperators() { + void testOperators() { MathResolver resolver = new MathResolver(); resolver.push(MathResolver.Type.ADD, new LongValue(1)); resolver.push(MathResolver.Type.ADD, new LongValue(2)); assertEquals("add(1, 2)", - resolver.resolve().toString()); + resolver.resolve().toString()); resolver = new MathResolver(); resolver.push(MathResolver.Type.ADD, new LongValue(1)); resolver.push(MathResolver.Type.SUB, new LongValue(2)); assertEquals("sub(1, 2)", - resolver.resolve().toString()); + resolver.resolve().toString()); resolver = new MathResolver(); resolver.push(MathResolver.Type.ADD, new LongValue(1)); resolver.push(MathResolver.Type.DIV, new LongValue(2)); assertEquals("div(1, 2)", - resolver.resolve().toString()); + resolver.resolve().toString()); resolver = new MathResolver(); resolver.push(MathResolver.Type.ADD, new LongValue(1)); resolver.push(MathResolver.Type.MOD, new LongValue(2)); assertEquals("mod(1, 2)", - resolver.resolve().toString()); + resolver.resolve().toString()); resolver = new MathResolver(); resolver.push(MathResolver.Type.ADD, new LongValue(1)); resolver.push(MathResolver.Type.MUL, new LongValue(2)); assertEquals("mul(1, 2)", - resolver.resolve().toString()); + resolver.resolve().toString()); } @Test - public void testOperatorPrecedence() { + void testOperatorPrecedence() { assertResolve("add(add(1, 2), 3)", MathResolver.Type.ADD, MathResolver.Type.ADD); assertResolve("add(1, sub(2, 3))", MathResolver.Type.ADD, MathResolver.Type.SUB); assertResolve("add(1, div(2, 3))", MathResolver.Type.ADD, MathResolver.Type.DIV); @@ -83,21 +83,21 @@ public class MathResolverTestCase { assertResolve("mul(mul(1, 2), 3)", MathResolver.Type.MUL, MathResolver.Type.MUL); assertResolve("add(1, sub(div(2, mod(3, mul(4, 5))), 6))", - MathResolver.Type.ADD, MathResolver.Type.DIV, MathResolver.Type.MOD, - MathResolver.Type.MUL, MathResolver.Type.SUB); + MathResolver.Type.ADD, MathResolver.Type.DIV, MathResolver.Type.MOD, + MathResolver.Type.MUL, MathResolver.Type.SUB); assertResolve("add(sub(1, div(mod(mul(2, 3), 4), 5)), 6)", - MathResolver.Type.SUB, MathResolver.Type.MUL, MathResolver.Type.MOD, - MathResolver.Type.DIV, MathResolver.Type.ADD); + MathResolver.Type.SUB, MathResolver.Type.MUL, MathResolver.Type.MOD, + MathResolver.Type.DIV, MathResolver.Type.ADD); assertResolve("add(1, sub(2, div(3, mod(4, mul(5, 6)))))", - MathResolver.Type.ADD, MathResolver.Type.SUB, MathResolver.Type.DIV, - MathResolver.Type.MOD, MathResolver.Type.MUL); + MathResolver.Type.ADD, MathResolver.Type.SUB, MathResolver.Type.DIV, + MathResolver.Type.MOD, MathResolver.Type.MUL); assertResolve("add(sub(div(mod(mul(1, 2), 3), 4), 5), 6)", - MathResolver.Type.MUL, MathResolver.Type.MOD, MathResolver.Type.DIV, - MathResolver.Type.SUB, MathResolver.Type.ADD); + MathResolver.Type.MUL, MathResolver.Type.MOD, MathResolver.Type.DIV, + MathResolver.Type.SUB, MathResolver.Type.ADD); } @Test - public void testOperatorSupport() { + void testOperatorSupport() { MathResolver resolver = new MathResolver(); for (MathResolver.Type type : MathResolver.Type.values()) { if (type == MathResolver.Type.ADD) { |