diff options
author | HÃ¥kon Hallingstad <hakon@verizonmedia.com> | 2021-04-13 13:29:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-13 13:29:28 +0200 |
commit | 9c56063bb3d68108d391aa6d8441d211b04ab38b (patch) | |
tree | 834d0c08b146ce49bac5057c8d6a9377817a8020 /container-core/src/test/java/com | |
parent | 73abec5c5354cbff70a4aa9a6fba78c5848b0b13 (diff) | |
parent | 32ee992e5cfc6f11a022cc62e658a6f2cf1d25a5 (diff) |
Merge pull request #17385 from vespa-engine/bjorncs/rewrite-to-request-handler
Bjorncs/rewrite to request handler
Diffstat (limited to 'container-core/src/test/java/com')
-rw-r--r-- | container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java b/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java index 1de8184ce22..06fc6d80741 100644 --- a/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java +++ b/container-core/src/test/java/com/yahoo/restapi/RestApiImplTest.java @@ -102,13 +102,25 @@ class RestApiImplTest { verifyJsonResponse(restApi, Method.POST, "/api", rawJson, 200, rawJson); } + @Test + public void uri_builder_creates_valid_uri_prefix() { + RestApi restApi = RestApi.builder() + .addRoute(route("/test").get(ctx -> new MessageResponse(ctx.uriBuilder().toString()))) + .build(); + verifyJsonResponse(restApi, Method.GET, "/test", null, 200, "{\"message\":\"http://localhost\"}"); + } + private static void verifyJsonResponse(RestApi restApi, Method method, String path, String requestContent, int expectedStatusCode, String expectedJson) { - HttpRequest testRequest = requestContent != null ? - HttpRequest.createTestRequest( - path, method, - new ByteArrayInputStream(requestContent.getBytes(StandardCharsets.UTF_8)), - Map.of("Content-Type", "application/json")) : - HttpRequest.createTestRequest(path, method); + HttpRequest testRequest; + String uri = "http://localhost" + path; + if (requestContent != null) { + testRequest = HttpRequest.createTestRequest( + uri, method, + new ByteArrayInputStream(requestContent.getBytes(StandardCharsets.UTF_8)), + Map.of("Content-Type", "application/json")); + } else { + testRequest = HttpRequest.createTestRequest(uri, method); + } HttpResponse response = restApi.handleRequest(testRequest); assertEquals(expectedStatusCode, response.getStatus()); if (expectedJson != null) { |