Avoid wrapping the 12 bytes in yet another object.

5 files changed, 6 insertions, 6 deletions

diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
index e6cc3ac9e54..d8924e16ff9 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java
@@ -73,7 +73,7 @@ public class SlimeSummaryTestCase {
     public void testTimeout() {
         DocsumDefinitionSet docsum = createDocsumDefinitionSet(summary_cf);
         FastHit hit = new FastHit();
-        assertEquals("Hit hit index:null/0/000000000000000000000000 (relevance null) [fasthit, globalid: 0 0 0 0 0 0 0 0 0 0 0 0, partId: 0, distributionkey: 0] failed: Timed out....",
+        assertEquals("Hit hit index:null/0/000000000000000000000000 (relevance 0.0) [fasthit, globalid: 0 0 0 0 0 0 0 0 0 0 0 0, partId: 0, distributionkey: 0] failed: Timed out....",
                      docsum.lazyDecode("default", timeoutSummary(), hit));
     }
 
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java
index 70314300cc8..db14a2894db 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/fs4mock/MockFSChannel.java
@@ -28,11 +28,11 @@ public class MockFSChannel extends FS4Channel {
     /** The number of active documents this should report in ping reponses */
     private final long activeDocuments;
 
-    public MockFSChannel(Backend backend) {
+    MockFSChannel(Backend backend) {
         this(0, backend);
     }
 
-    public MockFSChannel(long activeDocuments, Backend backend) {
+    MockFSChannel(long activeDocuments, Backend backend) {
         super(backend, 0);
         this.activeDocuments = activeDocuments;
     }
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java
index 110dbedf05a..27685426cf8 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/InterleavedSearchInvokerTest.java
@@ -290,7 +290,7 @@ public class InterleavedSearchInvokerTest {
             if (value < 0) {
                 hits.add(new MetaHit(value));
             } else {
-                hits.add(new FastHit(new GlobalId(IdString.createIdString("id:test:test::" + value)), new Relevance(value), partId, distributionKey));
+                hits.add(new FastHit(new GlobalId(IdString.createIdString("id:test:test::" + value)).getRawId(), new Relevance(value), partId, distributionKey));
             }
         }
         return hits;
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java
index cc32bfe1572..a5086c1446d 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/FillTestCase.java
@@ -197,7 +197,7 @@ public class FillTestCase {
         FastHit hit = new FastHit("hit:" + hitId, 1.0);
         hit.setPartId(sourceNodeId);
         hit.setDistributionKey(sourceNodeId);
-        hit.setGlobalId(client.globalIdFrom(hitId));
+        hit.setGlobalId(client.globalIdFrom(hitId).getRawId());
         return hit;
     }
 
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
index 80daabe653f..0b1d0d07e7a 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/ProtobufSerializationTest.java
@@ -24,7 +24,7 @@ public class ProtobufSerializationTest {
         var builder = ProtobufSerialization.createDocsumRequestBuilder(q, "server", "summary", true);
         builder.setTimeout(0);
         var hit = new FastHit();
-        hit.setGlobalId(new GlobalId(IdString.createIdString("id:ns:type::id")));
+        hit.setGlobalId(new GlobalId(IdString.createIdString("id:ns:type::id")).getRawId());
         var bytes = ProtobufSerialization.serializeDocsumRequest(builder, Collections.singletonList(hit));
 
         assertThat(bytes.length, equalTo(41));