diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-09-14 21:33:41 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-09-14 21:33:41 +0200 |
commit | f48d0f17f60ef074e131da38cb032a2af8328e84 (patch) | |
tree | 7d706e4813a80263195ff2e311a8e986dfdc9ae2 /jdisc_http_service/src/test/java/com | |
parent | a6a4e2d89afc8f299506ec3c97c9b3613dd26950 (diff) |
Propagate requestType through jdisc core response
Diffstat (limited to 'jdisc_http_service/src/test/java/com')
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java | 6 | ||||
-rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java index eeae1fa74bc..a3cb31d5ecb 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/HttpRequestTestCase.java @@ -28,7 +28,7 @@ public class HttpRequestTestCase { @Test public void requireThatSimpleServerConstructorsUseReasonableDefaults() { - final URI uri = URI.create("http://localhost/"); + URI uri = URI.create("http://localhost/"); HttpRequest request = HttpRequest.newServerRequest(mockContainer(), uri); assertTrue(request.isServerRequest()); assertEquals(uri, request.getUri()); @@ -50,9 +50,9 @@ public class HttpRequestTestCase { @Test public void requireThatSimpleClientConstructorsUseReasonableDefaults() { - final Request parent = new Request(mockContainer(), URI.create("http://localhost/")); + Request parent = new Request(mockContainer(), URI.create("http://localhost/")); - final URI uri = URI.create("http://remotehost/"); + URI uri = URI.create("http://remotehost/"); HttpRequest request = HttpRequest.newClientRequest(parent, uri); assertFalse(request.isServerRequest()); assertEquals(uri, request.getUri()); diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index c1512c04d2b..d2f74a56c80 100644 --- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -1028,10 +1028,9 @@ public class HttpServerTest { @Override public ContentChannel handleRequest(Request request, ResponseHandler handler) { - ContentChannel channel = ResponseDispatch.newInstance(Response.Status.OK).connect(handler); - if (requestType != null) - request.setRequestType(requestType); - return channel; + Response response = new Response(OK); + response.setRequestType(requestType); + return handler.handleResponse(response); } } |