diff options
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/grouping/result')
6 files changed, 119 insertions, 119 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java index c97bf150645..3e1cff54737 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/FlatteningSearcherTestCase.java @@ -23,15 +23,15 @@ import com.yahoo.searchlib.aggregation.Grouping; import com.yahoo.searchlib.aggregation.HitsAggregationResult; import com.yahoo.searchlib.aggregation.hll.SparseSketch; import com.yahoo.searchlib.expression.StringResultNode; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.LinkedList; import java.util.List; import java.util.Queue; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author bratseth @@ -39,42 +39,42 @@ import static org.junit.Assert.assertTrue; public class FlatteningSearcherTestCase { @Test - public void testFlatteningSearcher() { + void testFlatteningSearcher() { Query query = new Query("?query=test"); GroupingRequest req = GroupingRequest.newInstance(query); req.setRootOperation(GroupingOperation.fromString("all(group(foo) output(count()) each(each(output(summary(bar)))))")); Grouping group0 = new Grouping(0); group0.setRoot(new Group() - .addAggregationResult(new ExpressionCountAggregationResult(new SparseSketch(), sketch -> 69)) - .addChild(new Group().setId(new StringResultNode("unique1")) - .addAggregationResult(new HitsAggregationResult(3, "bar") - ) - ) - .addChild(new Group().setId(new StringResultNode("unique2")) - .addAggregationResult(new HitsAggregationResult(3, "bar") - ) - )); + .addAggregationResult(new ExpressionCountAggregationResult(new SparseSketch(), sketch -> 69)) + .addChild(new Group().setId(new StringResultNode("unique1")) + .addAggregationResult(new HitsAggregationResult(3, "bar") + ) + ) + .addChild(new Group().setId(new StringResultNode("unique2")) + .addAggregationResult(new HitsAggregationResult(3, "bar") + ) + )); Grouping group1 = new Grouping(0); group1.setRoot(new Group() - .addChild(new Group().setId(new StringResultNode("unique1")) - .addAggregationResult(new HitsAggregationResult(3, "bar") - .addHit(fs4Hit(0.7)) - .addHit(fs4Hit(0.6)) - .addHit(fs4Hit(0.3)) - ) - ) - .addChild(new Group().setId(new StringResultNode("unique2")) - .addAggregationResult(new HitsAggregationResult(3, "bar") - .addHit(fs4Hit(0.5)) - .addHit(fs4Hit(0.4)) - ) - )); + .addChild(new Group().setId(new StringResultNode("unique1")) + .addAggregationResult(new HitsAggregationResult(3, "bar") + .addHit(fs4Hit(0.7)) + .addHit(fs4Hit(0.6)) + .addHit(fs4Hit(0.3)) + ) + ) + .addChild(new Group().setId(new StringResultNode("unique2")) + .addAggregationResult(new HitsAggregationResult(3, "bar") + .addHit(fs4Hit(0.5)) + .addHit(fs4Hit(0.4)) + ) + )); Execution execution = newExecution(new FlatteningSearcher(), - new GroupingExecutor(ComponentId.fromString("grouping")), - new ResultProvider(Arrays.asList( - new GroupingListHit(List.of(group0), null), - new GroupingListHit(List.of(group1), null)))); + new GroupingExecutor(ComponentId.fromString("grouping")), + new ResultProvider(Arrays.asList( + new GroupingListHit(List.of(group0), null), + new GroupingListHit(List.of(group1), null)))); Result result = execution.search(query); assertEquals(5, result.hits().size()); assertFlat(result); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java index 01eba55924f..7b2f0d52742 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupIdTestCase.java @@ -1,9 +1,9 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.grouping.result; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; /** * @author Simon Thoresen Hult @@ -11,7 +11,7 @@ import static org.junit.Assert.*; public class GroupIdTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { ValueGroupId valueId = new DoubleId(6.9); assertEquals(6.9, valueId.getValue()); BucketGroupId rangeId = new DoubleBucketId(6.0, 9.0); @@ -24,11 +24,11 @@ public class GroupIdTestCase { assertEquals(6L, rangeId.getFrom()); assertEquals(9L, rangeId.getTo()); - valueId = new RawId(new byte[] { 6, 9 }); - assertArrayEquals(new byte[] { 6, 9 }, (byte[])valueId.getValue()); - rangeId = new RawBucketId(new byte[] { 6, 9 }, new byte[] { 9, 6 }); - assertArrayEquals(new byte[] { 6, 9 }, (byte[])rangeId.getFrom()); - assertArrayEquals(new byte[] { 9, 6 }, (byte[])rangeId.getTo()); + valueId = new RawId(new byte[]{6, 9}); + assertArrayEquals(new byte[]{6, 9}, (byte[]) valueId.getValue()); + rangeId = new RawBucketId(new byte[]{6, 9}, new byte[]{9, 6}); + assertArrayEquals(new byte[]{6, 9}, (byte[]) rangeId.getFrom()); + assertArrayEquals(new byte[]{9, 6}, (byte[]) rangeId.getTo()); valueId = new StringId("69"); assertEquals("69", valueId.getValue()); @@ -41,14 +41,14 @@ public class GroupIdTestCase { } @Test - public void requireThatToStringCorrespondsToType() { + void requireThatToStringCorrespondsToType() { assertEquals("group:double:6.9", new DoubleId(6.9).toString()); assertEquals("group:double_bucket:6.0:9.0", new DoubleBucketId(6.0, 9.0).toString()); assertEquals("group:long:69", new LongId(69L).toString()); assertEquals("group:long_bucket:6:9", new LongBucketId(6L, 9L).toString()); assertEquals("group:null", new NullId().toString()); - assertEquals("group:raw:[6, 9]", new RawId(new byte[] { 6, 9 }).toString()); - assertEquals("group:raw_bucket:[6, 9]:[9, 6]", new RawBucketId(new byte[] { 6, 9 }, new byte[] { 9, 6 }).toString()); + assertEquals("group:raw:[6, 9]", new RawId(new byte[]{6, 9}).toString()); + assertEquals("group:raw_bucket:[6, 9]:[9, 6]", new RawBucketId(new byte[]{6, 9}, new byte[]{9, 6}).toString()); assertTrue(new RootId(0).toString().startsWith("group:root:")); assertEquals("group:string:69", new StringId("69").toString()); assertEquals("group:string_bucket:6:9", new StringBucketId("6", "9").toString()); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java index 33e8f119ec9..3c583c88d5a 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupListTestCase.java @@ -2,10 +2,10 @@ package com.yahoo.search.grouping.result; import com.yahoo.search.grouping.Continuation; -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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** * @author Simon Thoresen Hult @@ -13,7 +13,7 @@ import static org.junit.Assert.assertSame; public class GroupListTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { GroupList lst = new GroupList("foo"); assertEquals("foo", lst.getLabel()); assertEquals(0, lst.continuations().size()); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java index 47f82205689..4e359531b7a 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/GroupTestCase.java @@ -3,10 +3,10 @@ package com.yahoo.search.grouping.result; import com.yahoo.search.result.Hit; import com.yahoo.search.result.Relevance; -import org.junit.Test; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; /** * @author Simon Thoresen Hult @@ -14,7 +14,7 @@ import static org.junit.Assert.assertNull; public class GroupTestCase { @Test - public void requireThatListsAreAccessibleByLabel() { + void requireThatListsAreAccessibleByLabel() { Group grp = new Group(new LongId(69L), new Relevance(1)); grp.add(new Hit("hit")); grp.add(new HitList("hitList")); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java index 2404af09c7a..5f1d2d3f125 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitListTestCase.java @@ -2,10 +2,10 @@ package com.yahoo.search.grouping.result; import com.yahoo.search.grouping.Continuation; -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.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; /** * @author Simon Thoresen Hult @@ -13,7 +13,7 @@ import static org.junit.Assert.assertSame; public class HitListTestCase { @Test - public void requireThatAccessorsWork() { + void requireThatAccessorsWork() { HitList lst = new HitList("foo"); assertEquals("foo", lst.getLabel()); assertEquals(0, lst.continuations().size()); diff --git a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java index 1035c9d9284..8e98f49df48 100644 --- a/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/grouping/result/HitRendererTestCase.java @@ -6,13 +6,13 @@ import com.yahoo.search.result.HitGroup; import com.yahoo.search.result.Relevance; import com.yahoo.text.Utf8; import com.yahoo.text.XMLWriter; -import org.junit.Test; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringWriter; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Simon Thoresen Hult @@ -20,7 +20,7 @@ import static org.junit.Assert.fail; public class HitRendererTestCase { @Test - public void requireThatGroupListsRenderAsExpected() { + void requireThatGroupListsRenderAsExpected() { assertRender(new GroupList("foo"), "<grouplist label=\"foo\"></grouplist>\n"); assertRender(new GroupList("b\u00e6z"), "<grouplist label=\"b\u00e6z\"></grouplist>\n"); @@ -28,21 +28,21 @@ public class HitRendererTestCase { lst.continuations().put("bar.key", new MyContinuation("bar.val")); lst.continuations().put("baz.key", new MyContinuation("baz.val")); assertRender(lst, "<grouplist label=\"foo\">\n" + - "<continuation id=\"bar.key\">bar.val</continuation>\n" + - "<continuation id=\"baz.key\">baz.val</continuation>\n" + - "</grouplist>\n"); + "<continuation id=\"bar.key\">bar.val</continuation>\n" + + "<continuation id=\"baz.key\">baz.val</continuation>\n" + + "</grouplist>\n"); } @Test - public void requireThatGroupIdsRenderAsExpected() { + void requireThatGroupIdsRenderAsExpected() { assertRender(newGroup(new DoubleId(6.9)), - "<group relevance=\"1.0\">\n" + - "<id type=\"double\">6.9</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"double\">6.9</id>\n" + + "</group>\n"); assertRender(newGroup(new LongId(69L)), - "<group relevance=\"1.0\">\n" + - "<id type=\"long\">69</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"long\">69</id>\n" + + "</group>\n"); assertRender(newGroup(new BoolId(true)), "<group relevance=\"1.0\">\n" + "<id type=\"bool\">true</id>\n" + @@ -52,89 +52,89 @@ public class HitRendererTestCase { "<id type=\"bool\">false</id>\n" + "</group>\n"); assertRender(newGroup(new NullId()), - "<group relevance=\"1.0\">\n" + - "<id type=\"null\"/>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"null\"/>\n" + + "</group>\n"); assertRender(newGroup(new RawId(Utf8.toBytes("foo"))), - "<group relevance=\"1.0\">\n" + - "<id type=\"raw\">[102, 111, 111]</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"raw\">[102, 111, 111]</id>\n" + + "</group>\n"); assertRender(newGroup(new StringId("foo")), - "<group relevance=\"1.0\">\n" + - "<id type=\"string\">foo</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"string\">foo</id>\n" + + "</group>\n"); assertRender(newGroup(new StringId("b\u00e6z")), - "<group relevance=\"1.0\">\n" + - "<id type=\"string\">b\u00e6z</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"string\">b\u00e6z</id>\n" + + "</group>\n"); assertRender(newGroup(new DoubleBucketId(6.9, 9.6)), - "<group relevance=\"1.0\">\n" + - "<id type=\"double_bucket\">\n<from>6.9</from>\n<to>9.6</to>\n</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"double_bucket\">\n<from>6.9</from>\n<to>9.6</to>\n</id>\n" + + "</group>\n"); assertRender(newGroup(new LongBucketId(6L, 9L)), - "<group relevance=\"1.0\">\n" + - "<id type=\"long_bucket\">\n<from>6</from>\n<to>9</to>\n</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"long_bucket\">\n<from>6</from>\n<to>9</to>\n</id>\n" + + "</group>\n"); assertRender(newGroup(new StringBucketId("bar", "baz")), - "<group relevance=\"1.0\">\n" + - "<id type=\"string_bucket\">\n<from>bar</from>\n<to>baz</to>\n</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"string_bucket\">\n<from>bar</from>\n<to>baz</to>\n</id>\n" + + "</group>\n"); assertRender(newGroup(new StringBucketId("b\u00e6r", "b\u00e6z")), - "<group relevance=\"1.0\">\n" + - "<id type=\"string_bucket\">\n<from>b\u00e6r</from>\n<to>b\u00e6z</to>\n</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"string_bucket\">\n<from>b\u00e6r</from>\n<to>b\u00e6z</to>\n</id>\n" + + "</group>\n"); assertRender(newGroup(new RawBucketId(Utf8.toBytes("bar"), Utf8.toBytes("baz"))), - "<group relevance=\"1.0\">\n" + - "<id type=\"raw_bucket\">\n<from>[98, 97, 114]</from>\n<to>[98, 97, 122]</to>\n</id>\n" + - "</group>\n"); + "<group relevance=\"1.0\">\n" + + "<id type=\"raw_bucket\">\n<from>[98, 97, 114]</from>\n<to>[98, 97, 122]</to>\n</id>\n" + + "</group>\n"); } @Test - public void requireThatGroupsRenderAsExpected() { + void requireThatGroupsRenderAsExpected() { Group group = newGroup(new StringId("foo")); group.setField("foo", "bar"); group.setField("baz", "cox"); assertRender(group, "<group relevance=\"1.0\">\n" + - "<id type=\"string\">foo</id>\n" + - "<output label=\"foo\">bar</output>\n" + - "<output label=\"baz\">cox</output>\n" + - "</group>\n"); + "<id type=\"string\">foo</id>\n" + + "<output label=\"foo\">bar</output>\n" + + "<output label=\"baz\">cox</output>\n" + + "</group>\n"); group = newGroup(new StringId("foo")); group.setField("foo", "b\u00e6r"); group.setField("b\u00e5z", "cox"); assertRender(group, "<group relevance=\"1.0\">\n" + - "<id type=\"string\">foo</id>\n" + - "<output label=\"foo\">b\u00e6r</output>\n" + - "<output label=\"b\u00e5z\">cox</output>\n" + - "</group>\n"); + "<id type=\"string\">foo</id>\n" + + "<output label=\"foo\">b\u00e6r</output>\n" + + "<output label=\"b\u00e5z\">cox</output>\n" + + "</group>\n"); } @Test - public void requireThatRootGroupsRenderAsExpected() { + void requireThatRootGroupsRenderAsExpected() { RootGroup group = new RootGroup(0, new MyContinuation("69")); group.setField("foo", "bar"); group.setField("baz", "cox"); assertRender(group, "<group relevance=\"1.0\">\n" + - "<id type=\"root\"/>\n" + - "<continuation id=\"this\">69</continuation>\n" + - "<output label=\"foo\">bar</output>\n" + - "<output label=\"baz\">cox</output>\n" + - "</group>\n"); + "<id type=\"root\"/>\n" + + "<continuation id=\"this\">69</continuation>\n" + + "<output label=\"foo\">bar</output>\n" + + "<output label=\"baz\">cox</output>\n" + + "</group>\n"); group = new RootGroup(0, new MyContinuation("96")); group.setField("foo", "b\u00e6r"); group.setField("b\u00e5z", "cox"); assertRender(group, "<group relevance=\"1.0\">\n" + - "<id type=\"root\"/>\n" + - "<continuation id=\"this\">96</continuation>\n" + - "<output label=\"foo\">b\u00e6r</output>\n" + - "<output label=\"b\u00e5z\">cox</output>\n" + - "</group>\n"); + "<id type=\"root\"/>\n" + + "<continuation id=\"this\">96</continuation>\n" + + "<output label=\"foo\">b\u00e6r</output>\n" + + "<output label=\"b\u00e5z\">cox</output>\n" + + "</group>\n"); } @Test - public void requireThatHitListsRenderAsExpected() { + void requireThatHitListsRenderAsExpected() { assertRender(new HitList("foo"), "<hitlist label=\"foo\"></hitlist>\n"); assertRender(new HitList("b\u00e6z"), "<hitlist label=\"b\u00e6z\"></hitlist>\n"); @@ -142,10 +142,10 @@ public class HitRendererTestCase { lst.continuations().put("bar.key", new MyContinuation("bar.val")); lst.continuations().put("baz.key", new MyContinuation("baz.val")); assertRender(lst, "<hitlist label=\"foo\">\n" + - "<continuation id=\"bar.key\">bar.val</continuation>\n" + - "<continuation id=\"baz.key\">baz.val</continuation>\n" + - "</hitlist>\n"); -} + "<continuation id=\"bar.key\">bar.val</continuation>\n" + + "<continuation id=\"baz.key\">baz.val</continuation>\n" + + "</hitlist>\n"); + } private static Group newGroup(GroupId id) { return new Group(id, new Relevance(1)); |