aboutsummaryrefslogtreecommitdiffstats
path: root/container-search/src/test/java/com/yahoo/search/grouping
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-10 21:54:18 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2019-08-16 12:12:30 +0200
commite9db9625f385918f02a09e89bdeec17c3f8faceb (patch)
treedab8500b1a6fa6764c00c9030f83eab6bb9cc858 /container-search/src/test/java/com/yahoo/search/grouping
parent99bfefcf450fd8c82a5d6382564eba0f2f58a0ca (diff)
doc: -> id:
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/grouping')
-rw-r--r--container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java6
-rw-r--r--container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java4
-rw-r--r--container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java2
3 files changed, 6 insertions, 6 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java
index 11415b46b82..e2f629604d7 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/GroupingExecutorTestCase.java
@@ -382,8 +382,8 @@ public class GroupingExecutorTestCase {
.addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("foo"))
.addAggregationResult(new HitsAggregationResult(1, "baz"))
));
- GlobalId gid1 = new GlobalId((new DocumentId("doc:test:1")).getGlobalId());
- GlobalId gid2 = new GlobalId((new DocumentId("doc:test:2")).getGlobalId());
+ GlobalId gid1 = new GlobalId((new DocumentId("id:ns:type::1")).getGlobalId());
+ GlobalId gid2 = new GlobalId((new DocumentId("id:ns:type::2")).getGlobalId());
Grouping pass1A = new Grouping(0);
pass1A.setRoot(new com.yahoo.searchlib.aggregation.Group()
.addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("foo"))
@@ -464,7 +464,7 @@ public class GroupingExecutorTestCase {
));
GroupingListHit pass0 = new GroupingListHit(Arrays.asList(grp), null);
- GlobalId gid = new GlobalId((new DocumentId("doc:test:1")).getGlobalId());
+ GlobalId gid = new GlobalId((new DocumentId("id:ns:type::1")).getGlobalId());
grp = new Grouping(0);
grp.setRoot(new com.yahoo.searchlib.aggregation.Group()
.addChild(new com.yahoo.searchlib.aggregation.Group().setId(new StringResultNode("foo"))
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
index b6b71a3e00c..6ed8a209cc5 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/HitConverterTestCase.java
@@ -29,7 +29,7 @@ import static org.junit.Assert.*;
public class HitConverterTestCase {
private GlobalId createGlobalId(int docId) {
- return new GlobalId((new DocumentId("doc:test:" + docId)).getGlobalId());
+ return new GlobalId((new DocumentId("id:ns:type::" + docId)).getGlobalId());
}
@Test
@@ -123,7 +123,7 @@ public class HitConverterTestCase {
public void requireThatVdsHitCanBeConverted() {
HitConverter converter = new HitConverter(new MySearcher(), new Query());
GroupingListHit context = new GroupingListHit(null, new DocsumDefinitionSet(sixtynine()));
- VdsHit lowHit = new VdsHit("doc:scheme:", new byte[] { 0x55, 0x55, 0x55, 0x55 }, 1);
+ VdsHit lowHit = new VdsHit("id:ns:type::", new byte[] { 0x55, 0x55, 0x55, 0x55 }, 1);
lowHit.setContext(context);
Hit hit = converter.toSearchHit("69", lowHit);
assertNotNull(hit);
diff --git a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java
index e27003984d3..df024681eae 100644
--- a/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/grouping/vespa/ResultBuilderTestCase.java
@@ -805,7 +805,7 @@ public class ResultBuilderTestCase {
res.setTag(hitsTag);
res.setSummaryClass("default");
for (int i = 0; i < numHits; ++i) {
- res.addHit(new FS4Hit(i + 1, new GlobalId(IdString.createIdString("doc:scheme:")), 1));
+ res.addHit(new FS4Hit(i + 1, new GlobalId(IdString.createIdString("id:ns:type::")), 1));
}
return res;
}