diff options
author | Jon Bratseth <bratseth@gmail.com> | 2022-04-29 17:57:50 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2022-04-29 17:57:50 +0200 |
commit | abb29ce91cd648aa73b6c4c26cb4b82f107f5c38 (patch) | |
tree | ab52e0e45d05a579692394fd0ed2683f15ac53ef /container-search/src/test/java/com/yahoo/search/rendering | |
parent | 2c36f7c97ed9747101945c7958c7ec4be6763f6e (diff) |
Use renderResponse
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/rendering')
3 files changed, 9 insertions, 11 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 1d2e3c240b9..3236cbd5bbc 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 @@ -66,6 +66,7 @@ import java.math.BigInteger; import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import static org.junit.Assert.assertEquals; @@ -82,7 +83,7 @@ public class JsonRendererTestCase { private static final ObjectMapper jsonMapper = new ObjectMapper(); - private JsonRenderer originalRenderer; + private final JsonRenderer originalRenderer; private JsonRenderer renderer; public JsonRendererTestCase() { @@ -381,7 +382,6 @@ public class JsonRendererTestCase { } @Test - @SuppressWarnings("removal") public void testEmptyTracing() throws IOException, InterruptedException, ExecutionException { String expected = "{" + " \"root\": {" @@ -403,7 +403,7 @@ public class JsonRendererTestCase { subQuery.trace("yellow", 1); q.trace("marker", 1); ByteArrayOutputStream bs = new ByteArrayOutputStream(); - ListenableFuture<Boolean> f = renderer.render(bs, r, execution, null); + CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null); assertTrue(f.get()); String summary = Utf8.toString(bs.toByteArray()); assertEqualJson(expected, summary); @@ -445,7 +445,7 @@ public class JsonRendererTestCase { execution.search(q); new Execution(new Chain<>(), execution.context()); ByteArrayOutputStream bs = new ByteArrayOutputStream(); - ListenableFuture<Boolean> f = renderer.render(bs, r, execution, null); + CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null); assertTrue(f.get()); String summary = Utf8.toString(bs.toByteArray()); ObjectMapper m = new ObjectMapper(); @@ -1441,7 +1441,7 @@ public class JsonRendererTestCase { @SuppressWarnings("removal") private String render(Execution execution, Result r) throws InterruptedException, ExecutionException { ByteArrayOutputStream bs = new ByteArrayOutputStream(); - ListenableFuture<Boolean> f = renderer.render(bs, r, execution, null); + CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null); assertTrue(f.get()); return Utf8.toString(bs.toByteArray()); } 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 99911276f50..2166000cf7a 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 @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.rendering; -import com.google.common.util.concurrent.ListenableFuture; import com.yahoo.component.chain.Chain; import com.yahoo.prelude.fastsearch.FastHit; import com.yahoo.search.Query; @@ -20,6 +19,7 @@ import org.junit.Before; import org.junit.Test; import java.io.ByteArrayOutputStream; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import static org.junit.Assert.assertEquals; @@ -54,7 +54,6 @@ public class SyncDefaultRendererTestCase { assertEquals("text/xml", d.getMimeType()); } - @SuppressWarnings({"deprecation", "removal"}) @Test public void testRenderWriterResult() throws InterruptedException, ExecutionException { Query q = new Query("/?query=a&tracelevel=5"); @@ -90,7 +89,7 @@ public class SyncDefaultRendererTestCase { r.hits().add(gg); r.hits().addError(ErrorMessage.createInternalServerError("boom")); ByteArrayOutputStream bs = new ByteArrayOutputStream(); - ListenableFuture<Boolean> f = d.render(bs, r, null, null); + CompletableFuture<Boolean> f = d.renderResponse(bs, r, null, null); assertTrue(f.get()); String summary = Utf8.toString(bs.toByteArray()); // TODO figure out a reasonably strict and reasonably flexible way to test 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 b3534d580d8..a8b38130333 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 @@ -1,7 +1,6 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.search.rendering; -import com.google.common.util.concurrent.ListenableFuture; import com.yahoo.component.ComponentId; import com.yahoo.component.chain.Chain; import com.yahoo.container.QrSearchersConfig; @@ -28,6 +27,7 @@ import com.yahoo.text.Utf8; import org.junit.Test; import java.io.ByteArrayOutputStream; +import java.util.concurrent.CompletableFuture; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -155,12 +155,11 @@ public class XMLRendererTestCase { assertTrue(summary.contains("<meta type=\"context\">")); } - @SuppressWarnings("removal") private String render(Result result) throws Exception { XmlRenderer renderer = new XmlRenderer(); renderer.init(); ByteArrayOutputStream bs = new ByteArrayOutputStream(); - ListenableFuture<Boolean> f = renderer.render(bs, result, null, null); + CompletableFuture<Boolean> f = renderer.renderResponse(bs, result, null, null); assertTrue(f.get()); return Utf8.toString(bs.toByteArray()); } |