Fix tests

4 files changed, 16 insertions, 12 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/Result.java b/container-search/src/main/java/com/yahoo/search/Result.java
index 39c19d938b7..e70916369a3 100644
--- a/container-search/src/main/java/com/yahoo/search/Result.java
+++ b/container-search/src/main/java/com/yahoo/search/Result.java
@@ -97,7 +97,7 @@ public final class Result extends com.yahoo.processing.Response implements Clone
         totalHitCount += result.getTotalHitCount();
         deepHitCount += result.getDeepHitCount();
         timeAccountant.merge(result.getElapsedTime());
-        boolean create=true;
+        boolean create = true;
         if (result.getCoverage(!create) != null || getCoverage(!create) != null)
             getCoverage(create).merge(result.getCoverage(create));
     }
@@ -316,7 +316,7 @@ public final class Result extends com.yahoo.processing.Response implements Clone
      */
     public Coverage getCoverage(boolean create) {
         if (coverage == null && create)
-            coverage = new Coverage(0L, 0, (hits().size() == 0 ? 0 : 1));
+            coverage = new Coverage(0L, 0, 0, (hits().size() == 0 ? 0 : 1));
         return coverage;
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/result/Coverage.java b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
index 8e83fd3d8df..fe59bc9088a 100644
--- a/container-search/src/main/java/com/yahoo/search/result/Coverage.java
+++ b/container-search/src/main/java/com/yahoo/search/result/Coverage.java
@@ -12,13 +12,17 @@ import com.google.common.annotations.Beta;
 public class Coverage extends com.yahoo.container.handler.Coverage {
 
     public Coverage(long docs, long active) {
-        this(docs, active, 0);
+        this(docs, active, docs > 1 ? 1 : 0, docs > 1 ? 1: 0);
     }
 
     public Coverage(long docs, long active, int nodes) {
         super(docs, active, nodes, 1);
     }
 
+    public Coverage(long docs, long active, int nodes, int resultSets) {
+        super(docs, active, nodes, resultSets);
+    }
+
     // TODO: Remove on Vespa 7
     /** @deprecated don't send a "full" boolean */
     @Deprecated // OK
@@ -44,6 +48,7 @@ public class Coverage extends com.yahoo.container.handler.Coverage {
 
     /**
      * Will set the reasons for degraded coverage as reported by vespa backend.
+     *
      * @param degradedReason Reason for degradation
      * @return self for chaining
      */
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index 4be43c4ea81..5b3b5ca6d73 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -479,8 +479,8 @@ public class JsonRendererTestCase {
                 Execution.Context.createContextStub());
         Result r = new Result(q);
         execution.search(q);
-        final TraceNode child = new TraceNode("string payload", 0L);
-        final TraceNode childOfChild = new TraceNode(null, 0L);
+        TraceNode child = new TraceNode("string payload", 0L);
+        TraceNode childOfChild = new TraceNode(null, 0L);
         child.add(childOfChild);
         childOfChild.add(new TraceNode("in OO languages, nesting is for birds", 0L));
         execution.trace().traceNode().add(child);
@@ -490,7 +490,7 @@ public class JsonRendererTestCase {
 
 
     @Test
-    public final void test() throws IOException, InterruptedException, ExecutionException, JSONException {
+    public final void test() throws IOException, InterruptedException, ExecutionException {
         String expected = "{\n"
                 + "    \"root\": {\n"
                 + "        \"children\": [\n"
@@ -556,10 +556,9 @@ public class JsonRendererTestCase {
                 + "    }\n"
                 + "}";
         Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
-        Execution execution = new Execution(
-                Execution.Context.createContextStub());
+        Execution execution = new Execution(Execution.Context.createContextStub());
         Result r = new Result(q);
-        r.setCoverage(new Coverage(500, 1));
+        r.setCoverage(new Coverage(500, 500,1,1));
 
         FastHit h = new FastHit("http://localhost/", .95);
         h.setField("$a", "Hello, world.");
@@ -593,7 +592,7 @@ public class JsonRendererTestCase {
                 + "                \"non-ideal-state\" : false"
                 + "            },\n"
                 + "            \"full\": false,\n"
-                + "            \"nodes\": 0,\n"
+                + "            \"nodes\": 1,\n"
                 + "            \"results\": 1,\n"
                 + "            \"resultsFull\": 0\n"
                 + "        },\n"
diff --git a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
index 471813525bf..7624185481e 100644
--- a/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/result/test/CoverageTestCase.java
@@ -16,7 +16,7 @@ public class CoverageTestCase {
 
     @Test
     public void testZeroCoverage() {
-        Coverage c = new Coverage(0L, 0, 0);
+        Coverage c = new Coverage(0L, 0, 0, 0);
         assertEquals(0, c.getResultPercentage());
         assertEquals(0, c.getResultSets());
     }
@@ -52,7 +52,7 @@ public class CoverageTestCase {
         Result federationSearcherResult = new Result(new Query());
         Result singleSourceResult = new Result(new Query());
         federationSearcherResult.mergeWith(singleSourceResult);
-        assertNull(federationSearcherResult.getCoverage( ! create));
+        assertNull(federationSearcherResult.getCoverage( !create));
         assertEquals(0, federationSearcherResult.getCoverage(create).getResultSets());
     }