Merge pull request #5768 from vespa-engine/bratseth/cleanup-hit-2

Bratseth/cleanup hit 2

3 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 c179851ba00..9b2de75e272 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
@@ -107,7 +107,7 @@ public class SlimeSummaryTestCase {
         DocsumDefinitionSet set = createDocsumDefinitionSet(summary_cf);
         byte[] docsum = makeTimeout();
         FastHit hit = new FastHit();
-        assertEquals("Hit hit index:0/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....", set.lazyDecode("default", docsum, hit));
+        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....", set.lazyDecode("default", docsum, hit));
     }
 
     @Test
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
index f8aa5e01853..e8af1b8e0ac 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/DocsumDefinitionTestCase.java
@@ -72,7 +72,7 @@ public class DocsumDefinitionTestCase {
         assertEquals("1", hit.getField("EXTINFOSOURCE").toString());
         assertEquals("10", hit.getField("LANG1").toString());
         assertEquals("352", hit.getField("WORDS").toString());
-        assertEquals("index:0/0/" + FastHit.asHexString(hit.getGlobalId()), hit.getId().toString());
+        assertEquals("index:null/0/" + FastHit.asHexString(hit.getGlobalId()), hit.getId().toString());
     }
 
     public static GlobalId createGlobalId(int docId) {
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index 7d905d286fc..2a91319a905 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -187,13 +187,13 @@ public class FastSearcherTestCase {
 
         assertEquals(100, fastSearcher.getCacheControl().capacity()); // Default cache =100MB
 
-        Result result = doSearch(fastSearcher,new Query("?query=ignored"), 0, 10);
+        Result result = doSearch(fastSearcher, new Query("?query=ignored"), 0, 10);
 
         Execution execution = new Execution(chainedAsSearchChain(fastSearcher), Execution.Context.createContextStub());
         assertEquals(2, result.getHitCount());
         execution.fill(result);
-        assertCorrectHit1((FastHit) result.hits().get(0));
-        assertCorrectTypes1((FastHit) result.hits().get(0));
+        assertCorrectHit1((FastHit)result.hits().get(0));
+        assertCorrectTypes1((FastHit)result.hits().get(0));
         for (int idx = 0; idx < result.getHitCount(); idx++) {
             assertTrue(!result.hits().get(idx).isCached());
         }
@@ -545,7 +545,7 @@ public class FastSearcherTestCase {
                 hit.getField("TITLE"));
         assertEquals("352", hit.getField("WORDS").toString());
         assertEquals(2003., hit.getRelevance().getScore(), 0.01d);
-        assertEquals("index:0/234/" + FastHit.asHexString(hit.getGlobalId()), hit.getId().toString());
+        assertEquals("index:testhittype/234/" + FastHit.asHexString(hit.getGlobalId()), hit.getId().toString());
         assertEquals("9190", hit.getField("BYTES").toString());
         assertEquals("testhittype", hit.getSource());
     }