diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-28 12:54:37 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-07-28 14:51:34 +0200 |
commit | 34ec3d76225844cfed51e407b2f41cd3e311bf47 (patch) | |
tree | 8e8dccbd556c4fce1fba37cdf379538d61fe4922 /container-search/src/test/java/com/yahoo/search/grouping/request | |
parent | 30b533c56ff0286aa3831889f46ba7c19e393ec0 (diff) |
Convert container-search to junit5
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/grouping/request')
9 files changed, 302 insertions, 308 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java index 50058f3777f..d7a888792d9 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/BucketResolverTestCase.java @@ -1,13 +1,13 @@ // 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 java.text.ChoiceFormat; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -22,7 +22,7 @@ public class BucketResolverTestCase { // -------------------------------------------------------------------------------- @Test - public void testResolve() { + void testResolve() { BucketResolver resolver = new BucketResolver(); resolver.push(new StringValue("a"), true); try { @@ -71,32 +71,32 @@ public class BucketResolverTestCase { } @Test - public void testBucketType() { - checkPushFail(Arrays.asList((ConstantValue)new StringValue("a"), new LongValue(1L)), - "Bucket type mismatch, expected 'StringValue' got 'LongValue'."); - checkPushFail(Arrays.asList((ConstantValue)new StringValue("a"), new DoubleValue(1.0)), - "Bucket type mismatch, expected 'StringValue' got 'DoubleValue'."); - checkPushFail(Arrays.asList((ConstantValue)new LongValue(1L), new StringValue("a")), - "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); - checkPushFail(Arrays.asList((ConstantValue)new LongValue(1L), new DoubleValue(1.0)), - "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); - checkPushFail(Arrays.asList((ConstantValue)new DoubleValue(1.0), new StringValue("a")), - "Bucket type mismatch, expected 'DoubleValue' got 'StringValue'."); - checkPushFail(Arrays.asList((ConstantValue)new DoubleValue(1.0), new LongValue(1L)), - "Bucket type mismatch, expected 'DoubleValue' got 'LongValue'."); - checkPushFail(Arrays.asList((ConstantValue)new InfiniteValue(new Infinite(true)), new InfiniteValue(new Infinite(false))), - "Bucket type mismatch, cannot both be infinity."); + void testBucketType() { + checkPushFail(Arrays.asList((ConstantValue) new StringValue("a"), new LongValue(1L)), + "Bucket type mismatch, expected 'StringValue' got 'LongValue'."); + checkPushFail(Arrays.asList((ConstantValue) new StringValue("a"), new DoubleValue(1.0)), + "Bucket type mismatch, expected 'StringValue' got 'DoubleValue'."); + checkPushFail(Arrays.asList((ConstantValue) new LongValue(1L), new StringValue("a")), + "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); + checkPushFail(Arrays.asList((ConstantValue) new LongValue(1L), new DoubleValue(1.0)), + "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); + checkPushFail(Arrays.asList((ConstantValue) new DoubleValue(1.0), new StringValue("a")), + "Bucket type mismatch, expected 'DoubleValue' got 'StringValue'."); + checkPushFail(Arrays.asList((ConstantValue) new DoubleValue(1.0), new LongValue(1L)), + "Bucket type mismatch, expected 'DoubleValue' got 'LongValue'."); + checkPushFail(Arrays.asList((ConstantValue) new InfiniteValue(new Infinite(true)), new InfiniteValue(new Infinite(false))), + "Bucket type mismatch, cannot both be infinity."); } @Test - public void testBucketOrder() { - checkPushFail(Arrays.asList((ConstantValue)new LongValue(2L), new LongValue(1L)), - "Bucket to-value can not be less than from-value."); - checkPushFail(Arrays.asList((ConstantValue)new DoubleValue(2.0), new DoubleValue(1.0)), - "Bucket to-value can not be less than from-value."); - checkPushFail(Arrays.asList((ConstantValue)new StringValue("b"), new StringValue("a")), - "Bucket to-value can not be less than from-value."); + void testBucketOrder() { + checkPushFail(Arrays.asList((ConstantValue) new LongValue(2L), new LongValue(1L)), + "Bucket to-value can not be less than from-value."); + checkPushFail(Arrays.asList((ConstantValue) new DoubleValue(2.0), new DoubleValue(1.0)), + "Bucket to-value can not be less than from-value."); + checkPushFail(Arrays.asList((ConstantValue) new StringValue("b"), new StringValue("a")), + "Bucket to-value can not be less than from-value."); } public void assertBucketRange(BucketValue expected, ConstantValue from, boolean inclusiveFrom, ConstantValue to, boolean inclusiveTo) { @@ -123,7 +123,7 @@ public class BucketResolverTestCase { } @Test - public void requireThatBucketRangesWork() { + void requireThatBucketRangesWork() { BucketValue expected = new LongBucket(2, 5); assertBucketRange(expected, new LongValue(1), false, new LongValue(4), true); assertBucketRange(expected, new LongValue(1), false, new LongValue(5), false); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java index 24ce3cfea32..1f800b37ff0 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/ExpressionVisitorTestCase.java @@ -1,13 +1,13 @@ // 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 java.util.LinkedList; import java.util.List; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author Simon Thoresen Hult @@ -15,7 +15,7 @@ import static org.junit.Assert.assertTrue; public class ExpressionVisitorTestCase { @Test - public void requireThatExpressionsAreVisited() { + void requireThatExpressionsAreVisited() { GroupingOperation op = new AllOperation(); final List<GroupingExpression> lst = new LinkedList<>(); @@ -38,7 +38,7 @@ public class ExpressionVisitorTestCase { } @Test - public void requireThatChildOperationsAreVisited() { + void requireThatChildOperationsAreVisited() { GroupingOperation root, parentA, childA1, childA2, parentB, childB1; root = new AllOperation() .addChild(parentA = new AllOperation() @@ -69,7 +69,7 @@ public class ExpressionVisitorTestCase { } @Test - public void requireThatExpressionsArgumentsAreVisited() { + void requireThatExpressionsArgumentsAreVisited() { final List<GroupingExpression> lst = new LinkedList<>(); GroupingExpression arg1 = new AttributeValue("arg1"); lst.add(arg1); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java index 0e89f348449..d1ab7117677 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/GroupingOperationTestCase.java @@ -3,11 +3,11 @@ package com.yahoo.search.grouping.request; import com.yahoo.search.grouping.request.parser.ParseException; import com.yahoo.search.grouping.request.parser.TokenMgrException; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.List; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -15,7 +15,7 @@ import static org.junit.Assert.*; public class GroupingOperationTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { GroupingOperation op = new AllOperation(); GroupingExpression exp = new AttributeValue("alias"); op.putAlias("alias", exp); @@ -88,7 +88,7 @@ public class GroupingOperationTestCase { } @Test - public void requireThatFromStringAsListParsesAllOperations() { + void requireThatFromStringAsListParsesAllOperations() { List<GroupingOperation> lst = GroupingOperation.fromStringAsList(""); assertTrue(lst.isEmpty()); @@ -107,7 +107,7 @@ public class GroupingOperationTestCase { } @Test - public void requireThatFromStringAcceptsOnlyOneOperation() { + void requireThatFromStringAcceptsOnlyOneOperation() { try { GroupingOperation.fromString(""); fail(); @@ -125,7 +125,7 @@ public class GroupingOperationTestCase { } @Test - public void requireThatParseExceptionsAreRethrown() { + void requireThatParseExceptionsAreRethrown() { try { GroupingOperation.fromString("all(foo)"); fail(); @@ -136,7 +136,7 @@ public class GroupingOperationTestCase { } @Test - public void requireThatTokenErrorsAreRethrown() { + void requireThatTokenErrorsAreRethrown() { try { GroupingOperation.fromString("all(\\foo)"); fail(); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java index d22c2dee7b6..823993b6bc6 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/MathFunctionsTestCase.java @@ -1,19 +1,17 @@ // 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.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.*; /** * @author Einar M R Rosenvinge */ public class MathFunctionsTestCase { - + @Test - public void testMathFunctions() { + void testMathFunctions() { //if this fails, update the count AND add a test in each of the two blocks below assertEquals(21, MathFunctions.Function.values().length); 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) { diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java index dfa297b4fa6..03223f786e8 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/RawBufferTestCase.java @@ -1,13 +1,13 @@ // 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 java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; /** * @author Ulf Lilleengen @@ -21,18 +21,18 @@ public class RawBufferTestCase { // -------------------------------------------------------------------------------- @Test - public void requireThatCompareWorks() { + void requireThatCompareWorks() { RawBuffer buffer = new RawBuffer(); - buffer.put((byte)'a'); - buffer.put((byte)'b'); + buffer.put((byte) 'a'); + buffer.put((byte) 'b'); RawBuffer buffer2 = new RawBuffer(); - buffer2.put((byte)'k'); - buffer2.put((byte)'a'); + buffer2.put((byte) 'k'); + buffer2.put((byte) 'a'); ArrayList<Byte> backing = new ArrayList<>(); - backing.add((byte)'a'); - backing.add((byte)'b'); + backing.add((byte) 'a'); + backing.add((byte) 'b'); RawBuffer buffer3 = new RawBuffer(backing); assertEquals(buffer.compareTo(buffer2), -1); @@ -41,9 +41,9 @@ public class RawBufferTestCase { } @Test - public void requireThatToStringWorks() { + void requireThatToStringWorks() { assertToString(Arrays.asList("a".getBytes()[0], "b".getBytes()[0]), "{97,98}"); - assertToString(Arrays.asList((byte)2, (byte)6), "{2,6}"); + assertToString(Arrays.asList((byte) 2, (byte) 6), "{2,6}"); } public void assertToString(List<Byte> data, String expected) { diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java index c02e46fae98..e2b4dc4f34b 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/RequestTestCase.java @@ -1,11 +1,11 @@ // 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 java.util.Arrays; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -13,7 +13,7 @@ import static org.junit.Assert.*; public class RequestTestCase { @Test - public void requireThatApiWorks() { + void requireThatApiWorks() { GroupingOperation op = new AllOperation() .setGroupBy(new AttributeValue("foo")) .addOrderBy(new CountAggregator()) @@ -22,19 +22,19 @@ public class RequestTestCase { .addOutput(new CountAggregator()) .addOutput(new MinAggregator(new AttributeValue("bar"))) .addChild(new EachOperation() - .addOutput(new AddFunction( - new LongValue(69), - new AttributeValue("baz"))) - .addOutput(new SummaryValue("cox")))); + .addOutput(new AddFunction( + new LongValue(69), + new AttributeValue("baz"))) + .addOutput(new SummaryValue("cox")))); assertEquals("all(group(foo) order(count()) all() each() " + - "each(output(count(), min(bar)) each(output(add(69, baz), summary(cox)))))", - op.toString()); + "each(output(count(), min(bar)) each(output(add(69, baz), summary(cox)))))", + op.toString()); op.resolveLevel(1); GroupingExpression exp = op.getGroupBy(); assertNotNull(exp); assertTrue(exp instanceof AttributeValue); - assertEquals("foo", ((AttributeValue)exp).getAttributeName()); + assertEquals("foo", ((AttributeValue) exp).getAttributeName()); assertEquals(1, op.getNumOrderBy()); assertNotNull(exp = op.getOrderBy(0)); assertTrue(exp instanceof CountAggregator); @@ -49,9 +49,9 @@ public class RequestTestCase { assertTrue(exp instanceof CountAggregator); assertNotNull(exp = op.getOutput(1)); assertTrue(exp instanceof MinAggregator); - assertNotNull(exp = ((MinAggregator)exp).getExpression()); + assertNotNull(exp = ((MinAggregator) exp).getExpression()); assertTrue(exp instanceof AttributeValue); - assertEquals("bar", ((AttributeValue)exp).getAttributeName()); + assertEquals("bar", ((AttributeValue) exp).getAttributeName()); assertEquals(1, op.getNumChildren()); assertNotNull(op = op.getChild(0)); @@ -59,24 +59,24 @@ public class RequestTestCase { assertEquals(2, op.getNumOutputs()); assertNotNull(exp = op.getOutput(0)); assertTrue(exp instanceof AddFunction); - assertEquals(2, ((AddFunction)exp).getNumArgs()); - GroupingExpression arg = ((AddFunction)exp).getArg(0); + assertEquals(2, ((AddFunction) exp).getNumArgs()); + GroupingExpression arg = ((AddFunction) exp).getArg(0); assertNotNull(arg); assertTrue(arg instanceof LongValue); - assertEquals(69L, ((LongValue)arg).getValue().longValue()); - assertNotNull(arg = ((AddFunction)exp).getArg(1)); + assertEquals(69L, ((LongValue) arg).getValue().longValue()); + assertNotNull(arg = ((AddFunction) exp).getArg(1)); assertTrue(arg instanceof AttributeValue); - assertEquals("baz", ((AttributeValue)arg).getAttributeName()); + assertEquals("baz", ((AttributeValue) arg).getAttributeName()); assertNotNull(exp = op.getOutput(1)); assertTrue(exp instanceof SummaryValue); - assertEquals("cox", ((SummaryValue)exp).getSummaryName()); + assertEquals("cox", ((SummaryValue) exp).getSummaryName()); } @Test - public void requireThatPredefinedApiWorks() { + void requireThatPredefinedApiWorks() { PredefinedFunction fnc = new LongPredefined(new AttributeValue("foo"), - new LongBucket(1, 2), - new LongBucket(3, 4)); + new LongBucket(1, 2), + new LongBucket(3, 4)); assertEquals(2, fnc.getNumBuckets()); BucketValue bucket = fnc.getBucket(0); assertNotNull(bucket); @@ -91,7 +91,7 @@ public class RequestTestCase { } @Test - public void requireThatBucketIntegrityIsChecked() { + void requireThatBucketIntegrityIsChecked() { try { new LongBucket(2, 1); } catch (IllegalArgumentException e) { @@ -99,37 +99,37 @@ public class RequestTestCase { } try { new LongPredefined(new AttributeValue("foo"), - new LongBucket(3, 4), - new LongBucket(1, 2)); + new LongBucket(3, 4), + new LongBucket(1, 2)); } catch (IllegalArgumentException e) { assertEquals("Buckets must be monotonically increasing, got bucket[3, 4> before bucket[1, 2>.", - e.getMessage()); + e.getMessage()); } } @Test - public void requireThatAliasWorks() { + void requireThatAliasWorks() { GroupingOperation all = new AllOperation(); all.putAlias("myalias", new AttributeValue("foo")); GroupingExpression exp = all.getAlias("myalias"); assertNotNull(exp); assertTrue(exp instanceof AttributeValue); - assertEquals("foo", ((AttributeValue)exp).getAttributeName()); + assertEquals("foo", ((AttributeValue) exp).getAttributeName()); GroupingOperation each = new EachOperation(); all.addChild(each); assertNotNull(exp = each.getAlias("myalias")); assertTrue(exp instanceof AttributeValue); - assertEquals("foo", ((AttributeValue)exp).getAttributeName()); + assertEquals("foo", ((AttributeValue) exp).getAttributeName()); each.putAlias("myalias", new AttributeValue("bar")); assertNotNull(exp = each.getAlias("myalias")); assertTrue(exp instanceof AttributeValue); - assertEquals("bar", ((AttributeValue)exp).getAttributeName()); + assertEquals("bar", ((AttributeValue) exp).getAttributeName()); } @Test - public void testOrderBy() { + void testOrderBy() { GroupingOperation all = new AllOperation(); all.addOrderBy(new AttributeValue("foo")); try { @@ -143,7 +143,7 @@ public class RequestTestCase { } @Test - public void testMax() { + void testMax() { GroupingOperation all = new AllOperation(); all.setMax(69); try { @@ -156,10 +156,10 @@ public class RequestTestCase { } @Test - public void testAccuracy() { + void testAccuracy() { GroupingOperation all = new AllOperation(); all.setAccuracy(0.53); - assertEquals((long)(100.0 * all.getAccuracy()), 53); + assertEquals((long) (100.0 * all.getAccuracy()), 53); try { all.setAccuracy(1.2); fail(); @@ -175,7 +175,7 @@ public class RequestTestCase { } @Test - public void testLevelChange() { + void testLevelChange() { GroupingOperation all = new AllOperation(); all.resolveLevel(0); assertEquals(0, all.getLevel()); @@ -198,7 +198,7 @@ public class RequestTestCase { } @Test - public void testLevelInheritance() { + void testLevelInheritance() { GroupingOperation grandParent, parent, child, grandChild; grandParent = new AllOperation() .addChild(parent = new EachOperation() @@ -213,7 +213,7 @@ public class RequestTestCase { } @Test - public void testLevelPropagation() { + void testLevelPropagation() { GroupingOperation all = new AllOperation() .setGroupBy(new AttributeValue("foo")) .addOrderBy(new MaxAggregator(new AttributeValue("bar"))) @@ -224,6 +224,6 @@ public class RequestTestCase { assertEquals(0, all.getGroupBy().getLevel()); assertEquals(1, all.getOrderBy(0).getLevel()); assertEquals(1, all.getChild(0).getOutput(0).getLevel()); - assertEquals(0, ((AggregatorNode)all.getChild(0).getOutput(0)).getExpression().getLevel()); + assertEquals(0, ((AggregatorNode) all.getChild(0).getOutput(0)).getExpression().getLevel()); } } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java index 56444a99ed3..c95451e991c 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserBenchmarkTest.java @@ -2,7 +2,7 @@ package com.yahoo.search.grouping.request.parser; import com.yahoo.search.grouping.request.GroupingOperation; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedHashMap; @@ -26,7 +26,7 @@ public class GroupingParserBenchmarkTest { } @Test - public void requireThatGroupingParserIsFast() { + void requireThatGroupingParserIsFast() { List<String> inputs = getInputs(); long ignore = 0; long now = 0; @@ -39,9 +39,9 @@ public class GroupingParserBenchmarkTest { } } long micros = TimeUnit.NANOSECONDS.toMicros(System.nanoTime() - now); - System.out.format("%d \u03bcs (avg %.2f)\n", micros, (double)micros / (NUM_RUNS * inputs.size())); + System.out.format("%d \u03bcs (avg %.2f)\n", micros, (double) micros / (NUM_RUNS * inputs.size())); for (Map.Entry<String, Long> entry : PREV_RESULTS.entrySet()) { - System.out.format("%-20s : %4.2f\n", entry.getKey(), (double)micros / entry.getValue()); + System.out.format("%-20s : %4.2f\n", entry.getKey(), (double) micros / entry.getValue()); } System.out.println("\nignore " + ignore); } diff --git a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java index 0dfd4685c0f..dd55dd46e5e 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/request/parser/GroupingParserTestCase.java @@ -9,17 +9,13 @@ import com.yahoo.search.query.parser.Parsable; import com.yahoo.search.query.parser.ParserEnvironment; import com.yahoo.search.yql.VespaGroupingStep; import com.yahoo.search.yql.YqlParser; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -27,7 +23,7 @@ import static org.junit.Assert.fail; public class GroupingParserTestCase { @Test - public void requireThatMathAllowsWhitespace() { + void requireThatMathAllowsWhitespace() { for (String op : Arrays.asList("+", " +", " + ", "+ ", "-", " -", " - ", "- ", "*", " *", " * ", "* ", @@ -41,7 +37,7 @@ public class GroupingParserTestCase { } @Test - public void testRequestList() { + void testRequestList() { List<GroupingOperation> lst = GroupingOperation.fromStringAsList("all();each();all() where(true);each()"); assertNotNull(lst); assertEquals(4, lst.size()); @@ -52,113 +48,113 @@ public class GroupingParserTestCase { } @Test - public void testAttributeFunctions() { + void testAttributeFunctions() { assertParse("all(group(foo) each(output(sum(attribute(bar)))))", - "all(group(foo) each(output(sum(attribute(bar)))))"); + "all(group(foo) each(output(sum(attribute(bar)))))"); assertParse("all(group(foo) each(output(sum(interpolatedlookup(bar, 0.25)))))", - "all(group(foo) each(output(sum(interpolatedlookup(bar, 0.25)))))"); + "all(group(foo) each(output(sum(interpolatedlookup(bar, 0.25)))))"); assertParse("all(group(foo) each(output(sum(array.at(bar, 42.0)))))", - "all(group(foo) each(output(sum(array.at(bar, 42.0)))))"); + "all(group(foo) each(output(sum(array.at(bar, 42.0)))))"); } @Test - public void requireThatTokenImagesAreNotReservedWords() { + void requireThatTokenImagesAreNotReservedWords() { List<String> images = Arrays.asList("acos", - "acosh", - "accuracy", - "add", - "alias", - "all", - "and", - "array", - "as", - "at", - "asin", - "asinh", - "atan", - "atanh", - "attribute", - "avg", - "bucket", - "cat", - "cbrt", - "cos", - "cosh", - "count", - "debugwait", - "div", - "docidnsspecific", - "each", - "exp", - "fixedwidth", - "floor", - "group", - "hint", - "hypot", - "log", - "log1p", - "log10", - "math", - "max", - "md5", - "min", - "mod", - "mul", - "neg", - "normalizesubject", - "now", - "or", - "order", - "output", - "pow", - "precision", - "predefined", - "relevance", - "reverse", - "sin", - "sinh", - "size", - "sort", - "stddev", - "interpolatedlookup", - "sqrt", - "strcat", - "strlen", - "sub", - "sum", - "summary", - "tan", - "tanh", - "time", - "date", - "dayofmonth", - "dayofweek", - "dayofyear", - "hourofday", - "minuteofhour", - "monthofyear", - "secondofminute", - "year", - "todouble", - "tolong", - "toraw", - "tostring", - "true", - "false", - "uca", - "where", - "x", - "xor", - "xorbit", - "y", - "zcurve"); + "acosh", + "accuracy", + "add", + "alias", + "all", + "and", + "array", + "as", + "at", + "asin", + "asinh", + "atan", + "atanh", + "attribute", + "avg", + "bucket", + "cat", + "cbrt", + "cos", + "cosh", + "count", + "debugwait", + "div", + "docidnsspecific", + "each", + "exp", + "fixedwidth", + "floor", + "group", + "hint", + "hypot", + "log", + "log1p", + "log10", + "math", + "max", + "md5", + "min", + "mod", + "mul", + "neg", + "normalizesubject", + "now", + "or", + "order", + "output", + "pow", + "precision", + "predefined", + "relevance", + "reverse", + "sin", + "sinh", + "size", + "sort", + "stddev", + "interpolatedlookup", + "sqrt", + "strcat", + "strlen", + "sub", + "sum", + "summary", + "tan", + "tanh", + "time", + "date", + "dayofmonth", + "dayofweek", + "dayofyear", + "hourofday", + "minuteofhour", + "monthofyear", + "secondofminute", + "year", + "todouble", + "tolong", + "toraw", + "tostring", + "true", + "false", + "uca", + "where", + "x", + "xor", + "xorbit", + "y", + "zcurve"); for (String image : images) { assertParse("all(group(" + image + "))", "all(group(" + image + "))"); } } @Test - public void testTokenizedWhitespace() { + void testTokenizedWhitespace() { String expected = "all(group(foo) each(output(max(bar))))"; assertParse(" all(group(foo)each(output(max(bar))))", expected); @@ -182,7 +178,7 @@ public class GroupingParserTestCase { } @Test - public void testOperationTypes() { + void testOperationTypes() { assertParse("all()"); assertParse("each()"); assertParse("all(each())"); @@ -193,21 +189,21 @@ public class GroupingParserTestCase { assertParse("all(each() each())"); assertParse("each(all() all())"); assertIllegalArgument("each(all() each())", - "Operation 'each()' can not operate on single hit."); + "Operation 'each()' can not operate on single hit."); assertIllegalArgument("each(group(foo) all() each())", - "Operation 'each(group(foo) all() each())' can not group single hit."); + "Operation 'each(group(foo) all() each())' can not group single hit."); assertIllegalArgument("each(each() all())", - "Operation 'each()' can not operate on single hit."); + "Operation 'each()' can not operate on single hit."); assertIllegalArgument("each(group(foo) each() all())", - "Operation 'each(group(foo) each() all())' can not group single hit."); + "Operation 'each(group(foo) each() all())' can not group single hit."); assertIllegalArgument("each(each() each())", - "Operation 'each()' can not operate on single hit."); + "Operation 'each()' can not operate on single hit."); assertIllegalArgument("each(group(foo) each() each())", - "Operation 'each(group(foo) each() each())' can not group single hit."); + "Operation 'each(group(foo) each() each())' can not group single hit."); } @Test - public void testOperationParts() { + void testOperationParts() { assertParse("all(group(foo))"); assertParse("all(hint(foo))"); assertParse("all(hint(foo) hint(bar))"); @@ -232,7 +228,7 @@ public class GroupingParserTestCase { } @Test - public void testComplexExpressionTypes() { + void testComplexExpressionTypes() { // fixedwidth assertParse("all(group(fixedwidth(foo, 1)))"); assertParse("all(group(fixedwidth(foo, 1.2)))"); @@ -315,43 +311,43 @@ public class GroupingParserTestCase { assertParse("all(group(predefined(foo, bucket({'b', 'a'}, {'k', 'a'}), bucket({'k', 'a'}, {'u', 'b'}))))"); assertIllegalArgument("all(group(predefined(foo, bucket(1, 2.0))))", - "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); + "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); assertIllegalArgument("all(group(predefined(foo, bucket(1, '2'))))", - "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); + "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); assertIllegalArgument("all(group(predefined(foo, bucket(1, 2), bucket(3.0, 4.0))))", - "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); + "Bucket type mismatch, expected 'LongValue' got 'DoubleValue'."); assertIllegalArgument("all(group(predefined(foo, bucket(1, 2), bucket('3', '4'))))", - "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); + "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); assertIllegalArgument("all(group(predefined(foo, bucket(1, 2), bucket(\"3\", \"4\"))))", - "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); + "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); assertIllegalArgument("all(group(predefined(foo, bucket(1, 2), bucket(three, four))))", - "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); + "Bucket type mismatch, expected 'LongValue' got 'StringValue'."); assertIllegalArgument("all(group(predefined(foo, bucket<-inf, inf>)))", - "Bucket type mismatch, cannot both be infinity"); + "Bucket type mismatch, cannot both be infinity"); assertIllegalArgument("all(group(predefined(foo, bucket<inf, -inf>)))", - "Encountered \" \"inf\" \"inf\"\" at line 1, column 34."); + "Encountered \" \"inf\" \"inf\"\" at line 1, column 34."); assertIllegalArgument("all(group(predefined(foo, bucket(2, 1))))", - "Bucket to-value can not be less than from-value."); + "Bucket to-value can not be less than from-value."); assertIllegalArgument("all(group(predefined(foo, bucket(3, 4), bucket(1, 2))))", - "Buckets must be monotonically increasing, got bucket[3, 4> before bucket[1, 2>."); + "Buckets must be monotonically increasing, got bucket[3, 4> before bucket[1, 2>."); assertIllegalArgument("all(group(predefined(foo, bucket(b, a))))", - "Bucket to-value can not be less than from-value."); + "Bucket to-value can not be less than from-value."); assertIllegalArgument("all(group(predefined(foo, bucket(b, -inf))))", - "Encountered \" \"-inf\" \"-inf\"\" at line 1, column 37."); + "Encountered \" \"-inf\" \"-inf\"\" at line 1, column 37."); assertIllegalArgument("all(group(predefined(foo, bucket(c, d), bucket(a, b))))", - "Buckets must be monotonically increasing, got bucket[\"c\", \"d\"> before bucket[\"a\", \"b\">."); + "Buckets must be monotonically increasing, got bucket[\"c\", \"d\"> before bucket[\"a\", \"b\">."); assertIllegalArgument("all(group(predefined(foo, bucket(c, d), bucket(-inf, e))))", - "Buckets must be monotonically increasing, got bucket[\"c\", \"d\"> before bucket[-inf, \"e\">."); + "Buckets must be monotonically increasing, got bucket[\"c\", \"d\"> before bucket[-inf, \"e\">."); assertIllegalArgument("all(group(predefined(foo, bucket(u, inf), bucket(e, i))))", - "Buckets must be monotonically increasing, got bucket[\"u\", inf> before bucket[\"e\", \"i\">."); + "Buckets must be monotonically increasing, got bucket[\"u\", inf> before bucket[\"e\", \"i\">."); // xorbit assertParse("all(group(xorbit(foo, 1)))"); } @Test - public void testInfixArithmetic() { + void testInfixArithmetic() { assertParse("all(group(1))", "all(group(1))"); assertParse("all(group(1+2))", "all(group(add(1, 2)))"); assertParse("all(group(1-2))", "all(group(sub(1, 2)))"); @@ -371,16 +367,16 @@ public class GroupingParserTestCase { } @Test - public void testOperationLabel() { + void testOperationLabel() { assertParse("each() as(foo)", - "each() as(foo)"); + "each() as(foo)"); assertParse("all(each() as(foo)" + - " each() as(bar))", - "all(each() as(foo) each() as(bar))"); + " each() as(bar))", + "all(each() as(foo) each() as(bar))"); assertParse("all(group(a) each(each() as(foo)" + - " each() as(bar))" + - " each() as(baz))", - "all(group(a) each(each() as(foo) each() as(bar)) each() as(baz))"); + " each() as(bar))" + + " each() as(baz))", + "all(group(a) each(each() as(foo) each() as(bar)) each() as(baz))"); assertIllegalArgument("all() as(foo)", "Encountered \" \"as\" \"as\"\" at line 1, column 7."); assertIllegalArgument("all(all() as(foo))", "Encountered \" \"as\" \"as\"\" at line 1, column 11."); @@ -388,58 +384,58 @@ public class GroupingParserTestCase { } @Test - public void testAttributeName() { + void testAttributeName() { assertParse("all(group(foo))"); assertIllegalArgument("all(group(foo.))", - "Encountered \" \")\" \")\"\" at line 1, column 15."); + "Encountered \" \")\" \")\"\" at line 1, column 15."); assertParse("all(group(foo.bar))"); assertIllegalArgument("all(group(foo.bar.))", - "Encountered \" \")\" \")\"\" at line 1, column 19."); + "Encountered \" \")\" \")\"\" at line 1, column 19."); assertParse("all(group(foo.bar.baz))"); } @Test - public void testOutputLabel() { + void testOutputLabel() { assertParse("all(output(min(a) as(foo)))", - "all(output(min(a) as(foo)))"); + "all(output(min(a) as(foo)))"); assertParse("all(output(min(a) as(foo), max(b) as(bar)))", - "all(output(min(a) as(foo), max(b) as(bar)))"); + "all(output(min(a) as(foo), max(b) as(bar)))"); assertIllegalArgument("all(output(min(a)) as(foo))", - "Encountered \" \"as\" \"as\"\" at line 1, column 20."); + "Encountered \" \"as\" \"as\"\" at line 1, column 20."); } @Test - public void testRootWhere() { + void testRootWhere() { String expected = "all(where(bar) all(group(foo)))"; assertParse("all(where(bar) all(group(foo)))", expected); assertParse("all(group(foo)) where(bar)", expected); } @Test - public void testParseBadRequest() { + void testParseBadRequest() { assertIllegalArgument("output(count())", - "Encountered \" \"output\" \"output\"\" at line 1, column 1."); + "Encountered \" \"output\" \"output\"\" at line 1, column 1."); assertIllegalArgument("each(output(count()))", - "Expression 'count()' not applicable for single hit."); + "Expression 'count()' not applicable for single hit."); assertIllegalArgument("all(output(count())))", - "Encountered \" \")\" \")\"\" at line 1, column 21."); + "Encountered \" \")\" \")\"\" at line 1, column 21."); } @Test - public void testAttributeFunction() { + void testAttributeFunction() { assertParse("all(group(attribute(foo)))"); assertParse("all(group(attribute(foo)) order(sum(attribute(a))))"); } @Test - public void testAccuracy() { + void testAccuracy() { assertParse("all(accuracy(0.5))"); assertParse("all(group(foo) accuracy(1.0))"); } @Test - public void testMapSyntax() { + void testMapSyntax() { assertParse("all(group(my.little{key}))", "all(group(my.little{\"key\"}))"); assertParse("all(group(my.little{key }))", "all(group(my.little{\"key\"}))"); assertParse("all(group(my.little{\"key\"}))", "all(group(my.little{\"key\"}))"); @@ -458,7 +454,7 @@ public class GroupingParserTestCase { } @Test - public void testMapSyntaxWithKeySourceAttribute() { + void testMapSyntaxWithKeySourceAttribute() { assertAttributeMapLookup("all(group(my_map{attribute(my_attr)}))", "my_map.key", "my_map.value", "", "my_attr"); assertAttributeMapLookup("all(group(my_map{attribute(my_attr)}.name))", @@ -487,7 +483,7 @@ public class GroupingParserTestCase { } @Test - public void testMisc() { + void testMisc() { for (String fnc : Arrays.asList("time.date", "time.dayofmonth", "time.dayofweek", @@ -536,39 +532,39 @@ public class GroupingParserTestCase { // TODO: assertParseRequest("all(group(a) each(output(xor(xorbit(b)) xor(xorbit(b, 64)))))"); assertParse("all(group(artist) each(each(output(summary()))))"); assertParse("all(group(artist) max(13) each(group(fixedwidth(year, 21.34)) max(55) output(count()) " + - "each(each(output(summary())))))"); + "each(each(output(summary())))))"); assertParse("all(group(artist) max(13) each(group(predefined(year, bucket(7, 19), bucket(90, 300))) " + - "max(55) output(count()) each(each(output(summary())))))"); + "max(55) output(count()) each(each(output(summary())))))"); assertParse("all(group(artist) max(13) each(group(predefined(year, bucket(7.1, 19.0), bucket(90.7, 300.0))) " + - "max(55) output(count()) each(each(output(summary())))))"); + "max(55) output(count()) each(each(output(summary())))))"); assertParse("all(group(artist) max(13) each(group(predefined(year, bucket('a', 'b'), bucket('cd'))) " + - "max(55) output(count()) each(each(output(summary())))))"); + "max(55) output(count()) each(each(output(summary())))))"); assertParse("all(output(count()))"); assertParse("all(group(album) output(count()))"); assertParse("all(group(album) each(output(count())))"); assertParse("all(group(artist) each(group(album) output(count()))" + - " each(group(song) output(count())))"); + " each(group(song) output(count())))"); assertParse("all(group(artist) output(count())" + - " each(group(album) output(count())" + - " each(group(song) output(count())" + - " each(each(output(summary()))))))"); + " each(group(album) output(count())" + + " each(group(song) output(count())" + + " each(each(output(summary()))))))"); assertParse("all(group(album) order(-$total=sum(length)) each(output($total)))"); assertParse("all(group(album) max(1) each(output(sum(length))))"); assertParse("all(group(artist) each(max(2) each(output(summary()))))"); assertParse("all(group(artist) max(3)" + - " each(group(album as(albumsongs)) each(each(output(summary()))))" + - " each(group(album as(albumlength)) output(sum(sum(length)))))"); + " each(group(album as(albumsongs)) each(each(output(summary()))))" + + " each(group(album as(albumlength)) output(sum(sum(length)))))"); assertParse("all(group(artist) max(15)" + - " each(group(album) " + - " each(group(song)" + - " each(max(2) each(output(summary()))))))"); + " each(group(album) " + + " each(group(song)" + + " each(max(2) each(output(summary()))))))"); assertParse("all(group(artist) max(15)" + - " each(group(album)" + - " each(group(song)" + - " each(max(2) each(output(summary())))))" + - " each(group(song) max(5) order(sum(popularity))" + - " each(output(sum(sold)) each(output(summary())))))"); + " each(group(album)" + + " each(group(song)" + + " each(max(2) each(output(summary())))))" + + " each(group(song) max(5) order(sum(popularity))" + + " each(output(sum(sold)) each(output(summary())))))"); assertParse("all(group(artist) order(max(relevance) * count()) each(output(count())))"); assertParse("all(group(artist) each(output(sum(popularity) / count())))"); @@ -576,9 +572,9 @@ public class GroupingParserTestCase { assertParse("all(group(debugwait(artist, 3.3, true)))"); assertParse("all(group(debugwait(artist, 3.3, false)))"); assertIllegalArgument("all(group(debugwait(artist, -3.3, true)))", - "Encountered \" \"-\" \"-\"\" at line 1, column 29"); + "Encountered \" \"-\" \"-\"\" at line 1, column 29"); assertIllegalArgument("all(group(debugwait(artist, 3.3, lol)))", - "Encountered \" <IDENTIFIER> \"lol\"\" at line 1, column 34"); + "Encountered \" <IDENTIFIER> \"lol\"\" at line 1, column 34"); assertParse("all(group(artist) each(output(stddev(simple))))"); // Test max() @@ -588,35 +584,35 @@ public class GroupingParserTestCase { } @Test - public void testBucket() { + void testBucket() { List<GroupingOperation> operations = assertParse("all(group(predefined(artist, bucket('a'), bucket('c', 'z'))))"); assertEquals(1, operations.size()); assertEquals("all(group(predefined(artist, bucket[\"a\", \"a \">, bucket[\"c\", \"z\">)))", - operations.get(0).toString()); + operations.get(0).toString()); } @Test - public void requireThatParseExceptionMessagesContainErrorMarker() { + void requireThatParseExceptionMessagesContainErrorMarker() { assertIllegalArgument("foo", - "Encountered \" <IDENTIFIER> \"foo\"\" at line 1, column 1.\n\n" + - "Was expecting one of:\n\n" + - "<SPACE> ...\n" + - " \"all\" ...\n" + - " \"each\" ...\n" + - " \n" + - "At position:\n" + - "foo\n" + - "^"); + "Encountered \" <IDENTIFIER> \"foo\"\" at line 1, column 1.\n\n" + + "Was expecting one of:\n\n" + + "<SPACE> ...\n" + + " \"all\" ...\n" + + " \"each\" ...\n" + + " \n" + + "At position:\n" + + "foo\n" + + "^"); assertIllegalArgument("\n foo", - "Encountered \" <IDENTIFIER> \"foo\"\" at line 2, column 2.\n\n" + - "Was expecting one of:\n\n" + - "<SPACE> ...\n" + - " \"all\" ...\n" + - " \"each\" ...\n" + - " \n" + - "At position:\n" + - " foo\n" + - " ^"); + "Encountered \" <IDENTIFIER> \"foo\"\" at line 2, column 2.\n\n" + + "Was expecting one of:\n\n" + + "<SPACE> ...\n" + + " \"all\" ...\n" + + " \"each\" ...\n" + + " \n" + + "At position:\n" + + " foo\n" + + " ^"); } // -------------------------------------------------------------------------------- |