Consolidate rendering of raw data by using the same representation as in normal hits by using RawBase64.

2 files changed, 6 insertions, 5 deletions

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 f986c593fae..bdc52685140 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,6 +1,7 @@
 // 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 com.yahoo.prelude.hitfield.RawBase64;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -25,10 +26,10 @@ public class GroupIdTestCase {
         assertEquals(9L, rangeId.getTo());
 
         valueId = new RawId(new byte[]{6, 9});
-        assertArrayEquals(new byte[]{6, 9}, (byte[]) valueId.getValue());
+        assertEquals(new RawBase64(new byte[]{6, 9}, true), 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());
+        assertEquals(new RawBase64(new byte[]{6, 9}, true), rangeId.getFrom());
+        assertEquals(new RawBase64(new byte[]{9, 6}, true), rangeId.getTo());
 
         valueId = new StringId("69");
         assertEquals("69", valueId.getValue());
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 8e98f49df48..69bd848ebcd 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
@@ -57,7 +57,7 @@ public class HitRendererTestCase {
                         "</group>\n");
         assertRender(newGroup(new RawId(Utf8.toBytes("foo"))),
                 "<group relevance=\"1.0\">\n" +
-                        "<id type=\"raw\">[102, 111, 111]</id>\n" +
+                        "<id type=\"raw\">Zm9v</id>\n" +
                         "</group>\n");
         assertRender(newGroup(new StringId("foo")),
                 "<group relevance=\"1.0\">\n" +
@@ -85,7 +85,7 @@ public class HitRendererTestCase {
                         "</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" +
+                        "<id type=\"raw_bucket\">\n<from>YmFy</from>\n<to>YmF6</to>\n</id>\n" +
                         "</group>\n");
     }