diff options
Diffstat (limited to 'clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller')
2 files changed, 6 insertions, 3 deletions
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestTest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestTest.java index 7baff0453b0..88db20d1ff5 100644 --- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestTest.java +++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestTest.java @@ -107,16 +107,19 @@ public class HttpRequestTest { public void testToString() { assertEquals("GET? http://localhost:8080/", new HttpRequest() + .setScheme("http") .setHost("localhost") .setPort(8080) .toString(true)); assertEquals("POST http://localhost/", new HttpRequest() + .setScheme("http") .setHttpOperation(HttpRequest.HttpOp.POST) .setHost("localhost") .toString(true)); assertEquals("GET http://localhost/?foo=bar", new HttpRequest() + .setScheme("http") .setHttpOperation(HttpRequest.HttpOp.GET) .addUrlOption("foo", "bar") .setHost("localhost") diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java index 3492c632e60..249fcb3ab04 100644 --- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java +++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java @@ -338,17 +338,17 @@ public class StateRestAPITest { setupDummyStateApi(); { stateApi.induceException(new OtherMasterException("example.com", 80)); - HttpResult result = execute(new HttpRequest().setPath("/cluster/v2").addUrlOption(" %=?&", "&?%=").addUrlOption("foo", "bar")); + HttpResult result = execute(new HttpRequest().setScheme("https").setPath("/cluster/v2").addUrlOption(" %=?&", "&?%=").addUrlOption("foo", "bar")); assertEquals(result.toString(true), 307, result.getHttpReturnCode()); assertEquals(result.toString(true), "Temporary Redirect", result.getHttpReturnCodeDescription()); - assertEquals(result.toString(true), "http://example.com:80/cluster/v2?%20%25%3D%3F%26=%26%3F%25%3D&foo=bar", result.getHeader("Location")); + assertEquals(result.toString(true), "https://example.com:80/cluster/v2?%20%25%3D%3F%26=%26%3F%25%3D&foo=bar", result.getHeader("Location")); assertEquals(result.toString(true), "application/json", result.getHeader("Content-Type")); String expected = "{\"message\":\"Cluster controller not master. Use master at example.com:80.\"}"; assertEquals(expected, result.getContent().toString()); } { stateApi.induceException(new OtherMasterException("example.com", 80)); - HttpResult result = execute(new HttpRequest().setPath("/cluster/v2/foo")); + HttpResult result = execute(new HttpRequest().setScheme("http").setPath("/cluster/v2/foo")); assertEquals(result.toString(true), 307, result.getHttpReturnCode()); assertEquals(result.toString(true), "Temporary Redirect", result.getHttpReturnCodeDescription()); assertEquals(result.toString(true), "http://example.com:80/cluster/v2/foo", result.getHeader("Location")); |