diff options
author | Kristian Aune <kristian@ymail.com> | 2019-05-13 10:30:51 +0200 |
---|---|---|
committer | Kristian Aune <kristian@ymail.com> | 2019-05-13 10:30:51 +0200 |
commit | 325d59a9c4c983e74cf261d633c98d644f38ccdb (patch) | |
tree | 43903aaf86e611b0c922a7d3776ce22282dba541 /vespa-http-client/src | |
parent | 2493c712767aaef001cd352e36daeaf3efa2b20f (diff) |
better tests, not allow both host/endpoint
Diffstat (limited to 'vespa-http-client/src')
2 files changed, 18 insertions, 19 deletions
diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java index dff5e0f4ef3..4e2c8f1509e 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/runner/CommandLineArguments.java @@ -52,6 +52,10 @@ public class CommandLineArguments { return null; } if (cmdArgs.endpointArg != null) { + if (cmdArgs.hostArg != null) { + System.err.println("Cannot set both '--host' and '--endpoint' "); + return null; + } try { URL url = new URL(cmdArgs.endpointArg); } catch (MalformedURLException e) { diff --git a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java index 6dd0c54e150..174ac5b0d26 100644 --- a/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java +++ b/vespa-http-client/src/test/java/com/yahoo/vespa/http/client/runner/CommandLineArgumentsTest.java @@ -182,34 +182,29 @@ public class CommandLineArgumentsTest { } @Test - public void testEndpointAndHost() { - args.clear(); + public void testEndpoint() { add("endpoint", "http://myendpoint:1234"); CommandLineArguments arguments = CommandLineArguments.build(asArray()); SessionParams params = arguments.createSessionParams(true); - assertThat(params.getClusters().get(0).getEndpoints().get(0).getHostname(), is("myendpoint")); assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(1234)); assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(false)); + } - add("host", "myhost"); // endpoint dominates host and port - add("port", "2345"); - arguments = CommandLineArguments.build(asArray()); - params = arguments.createSessionParams(true); - assertThat(params.getClusters().get(0).getEndpoints().get(0).getHostname(), is("myendpoint")); - assertThat(params.getClusters().get(0).getEndpoints().get(0).getPort(), is(1234)); - - args.clear(); + @Test + public void testEndpointHttps() { add("endpoint", "https://myendpoint:1234"); - arguments = CommandLineArguments.build(asArray()); - params = arguments.createSessionParams(true); - assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(true)); - - args.clear(); - add("endpoint", "https://myendpoint::1234"); - arguments = CommandLineArguments.build(asArray()); - params = arguments.createSessionParams(true); + CommandLineArguments arguments = CommandLineArguments.build(asArray()); + SessionParams params = arguments.createSessionParams(true); assertThat(params.getClusters().get(0).getEndpoints().get(0).isUseSsl(), is(true)); + } + @Test + public void testEndpointAndHost() { + add("host", "myhost"); + add("port", "2345"); + add("endpoint", "http://myendpoint:1234"); + CommandLineArguments arguments = CommandLineArguments.build(asArray()); + assertThat(arguments, is(nullValue())); // cannot have both endpoint and host } } |