Avoid deprecated method

4 files changed, 21 insertions, 23 deletions

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 726d5cb76be..4be43c4ea81 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
@@ -559,7 +559,7 @@ public class JsonRendererTestCase {
         Execution execution = new Execution(
                 Execution.Context.createContextStub());
         Result r = new Result(q);
-        r.setCoverage(new Coverage(500, 1, true));
+        r.setCoverage(new Coverage(500, 1));
 
         FastHit h = new FastHit("http://localhost/", .95);
         h.setField("$a", "Hello, world.");
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
index 09d36bb3857..1d2187376a4 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/SyncDefaultRendererTestCase.java
@@ -30,7 +30,7 @@ import com.yahoo.text.Utf8;
 /**
  * Check the legacy sync default renderer doesn't spontaneously combust.
  *
- * @author <a href="mailto:steinar@yahoo-inc.com">Steinar Knutsen</a>
+ * @author Steinar Knutsen
  */
 public class SyncDefaultRendererTestCase {
 
@@ -58,11 +58,11 @@ public class SyncDefaultRendererTestCase {
 
     @SuppressWarnings("deprecation")
     @Test
-    public final void testRenderWriterResult() throws IOException, InterruptedException, ExecutionException {
+    public final void testRenderWriterResult() throws InterruptedException, ExecutionException {
         Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
         q.getPresentation().setTiming(true);
         Result r = new Result(q);
-        r.setCoverage(new Coverage(500, 1, true));
+        r.setCoverage(new Coverage(500, 1));
 
         TimeTracker t = new TimeTracker(new Chain<Searcher>(
                 new UselessSearcher("first"), new UselessSearcher("second"),
@@ -77,7 +77,6 @@ public class SyncDefaultRendererTestCase {
         t.sampleSearchReturn(1, true, null);
         t.sampleSearchReturn(0, true, null);
         r.getElapsedTime().add(t);
-        r.getTemplating().setRenderer(d);
         FastHit h = new FastHit("http://localhost/", .95);
         h.setField("$a", "Hello, world.");
         h.setField("b", "foo");
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
index 41b2a235daa..c95019d37d6 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/XMLRendererTestCase.java
@@ -62,7 +62,7 @@ public class XMLRendererTestCase {
         Query q = new Query("/?query=a&tracelevel=5&reportCoverage=true");
         q.getPresentation().setTiming(true);
         Result r = new Result(q);
-        r.setCoverage(new Coverage(500, 1, true));
+        r.setCoverage(new Coverage(500, 1));
 
         TimeTracker t = new TimeTracker(new Chain<Searcher>(
                 new UselessSearcher("first"), new UselessSearcher("second"),
@@ -77,7 +77,6 @@ public class XMLRendererTestCase {
         t.sampleSearchReturn(1, true, null);
         t.sampleSearchReturn(0, true, null);
         r.getElapsedTime().add(t);
-        r.getTemplating().setRenderer(d);
         FastHit h = new FastHit("http://localhost/", .95);
         h.setField("$a", "Hello, world.");
         h.setField("b", "foo");
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 68399e6bfc4..471813525bf 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, false, 0);
+        Coverage c = new Coverage(0L, 0, 0);
         assertEquals(0, c.getResultPercentage());
         assertEquals(0, c.getResultSets());
     }
@@ -35,36 +35,36 @@ public class CoverageTestCase {
 
     @Test
     public void testDefaultCoverage() {
-        boolean create=true;
+        boolean create = true;
 
-        Result r1=new Result(new Query());
-        assertEquals(0,r1.getCoverage(create).getResultSets());
-        Result r2=new Result(new Query());
+        Result r1 = new Result(new Query());
+        assertEquals(0, r1.getCoverage(create).getResultSets());
+        Result r2 = new Result(new Query());
 
         r1.mergeWith(r2);
-        assertEquals(0,r1.getCoverage(create).getResultSets());
+        assertEquals(0, r1.getCoverage(create).getResultSets());
     }
 
     @Test
     public void testDefaultSearchScenario() {
-        boolean create=true;
+        boolean create = true;
 
-        Result federationSearcherResult=new Result(new Query());
-        Result singleSourceResult=new Result(new Query());
+        Result federationSearcherResult = new Result(new Query());
+        Result singleSourceResult = new Result(new Query());
         federationSearcherResult.mergeWith(singleSourceResult);
-        assertNull(federationSearcherResult.getCoverage(!create));
-        assertEquals(0,federationSearcherResult.getCoverage(create).getResultSets());
+        assertNull(federationSearcherResult.getCoverage( ! create));
+        assertEquals(0, federationSearcherResult.getCoverage(create).getResultSets());
     }
 
     @Test
     public void testRequestingCoverageSearchScenario() {
-        boolean create=true;
+        boolean create = true;
 
-        Result federationSearcherResult=new Result(new Query());
-        Result singleSourceResult=new Result(new Query());
-        singleSourceResult.setCoverage(new Coverage(10,1,true));
+        Result federationSearcherResult = new Result(new Query());
+        Result singleSourceResult = new Result(new Query());
+        singleSourceResult.setCoverage(new Coverage(10, 1));
         federationSearcherResult.mergeWith(singleSourceResult);
-        assertEquals(1,federationSearcherResult.getCoverage(create).getResultSets());
+        assertEquals(1, federationSearcherResult.getCoverage(create).getResultSets());
     }
 
 }