diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-09-03 08:43:23 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-09-03 08:43:23 +0200 |
commit | b097a24f16f641441adab25faaad2581a7c938c7 (patch) | |
tree | 688393e50c816c6889655e72f12884d5bbd36efe /config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java | |
parent | 6b1d725aee53839385a44d4542955dd6b9c5221e (diff) |
Simplify
Diffstat (limited to 'config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java')
-rw-r--r-- | config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java index b810c6c7e4c..ffa70b5bfb5 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java @@ -28,7 +28,7 @@ import static org.junit.Assert.assertThat; public class ConfigProxyRpcServerTest { private static final String hostname = "localhost"; private static final int port = 12345; - private static final String address = "tcp/" + hostname + ":" + port; + private static final String configSourceAddress = "tcp/" + hostname + ":" + port; private TestServer server; private TestClient client; @@ -46,7 +46,7 @@ public class ConfigProxyRpcServerTest { @Test public void basic() { - ProxyServer proxy = ProxyServer.createTestServer(new MockConfigSource()); + ProxyServer proxy = createTestServer(new MockConfigSource()); Spec spec = new Spec("localhost", 12345); ConfigProxyRpcServer server = new ConfigProxyRpcServer(proxy, new Supervisor(new Transport()), spec); assertThat(server.getSpec(), is(spec)); @@ -131,8 +131,8 @@ public class ConfigProxyRpcServerTest { assertThat(req.returnValues().size(), is(1)); final String[] ret = req.returnValues().get(0).asStringArray(); assertThat(ret.length, is(2)); - assertThat(ret[0], is("Current source: " + address)); - assertThat(ret[1], is("All sources:\n" + address + "\n")); + assertThat(ret[0], is("Current source: " + configSourceAddress)); + assertThat(ret[1], is("All sources:\n" + configSourceAddress + "\n")); } /** @@ -204,7 +204,7 @@ public class ConfigProxyRpcServerTest { ret = req.returnValues().get(0).asStringArray(); assertThat(ret.length, is(2)); assertThat(ret[0], is("1")); - assertThat(ret[1], is("Could not set mode to '" + mode + "'. Legal modes are '" + Mode.modes() + "'")); + assertThat(ret[1], is("Unrecognized mode '" + mode + "' supplied. Legal modes are '" + Mode.modes() + "'")); assertThat(server.proxyServer().getMode().name(), is(oldMode)); } @@ -257,11 +257,15 @@ public class ConfigProxyRpcServerTest { assertThat(req.returnValues().get(0).asString(), is("success")); } + private static ProxyServer createTestServer(ConfigSourceSet source) { + return new ProxyServer(null, source, ProxyServer.defaultTimingValues(), new MemoryCache(), null); + } + private static class TestServer implements AutoCloseable { private static final Spec SPEC = new Spec(0); - private final ProxyServer proxyServer = ProxyServer.createTestServer(new ConfigSourceSet(address)); + private final ProxyServer proxyServer = createTestServer(new ConfigSourceSet(configSourceAddress)); private final Supervisor supervisor = new Supervisor(new Transport()); private final ConfigProxyRpcServer rpcServer = new ConfigProxyRpcServer(proxyServer, supervisor, SPEC); private final Acceptor acceptor; |