diff options
Diffstat (limited to 'config-proxy/src/test')
-rw-r--r-- | config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServerTest.java | 16 | ||||
-rw-r--r-- | config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java | 13 |
2 files changed, 20 insertions, 9 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; diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java index 1c64631d205..712567774f1 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ProxyServerTest.java @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.config.proxy; +import com.yahoo.config.subscription.ConfigSourceSet; import com.yahoo.vespa.config.*; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import com.yahoo.vespa.config.protocol.Payload; @@ -41,7 +42,7 @@ public class ProxyServerTest { source.clear(); source.put(fooConfig.getKey(), createConfigWithNextConfigGeneration(fooConfig, 0)); source.put(errorConfigKey, createConfigWithNextConfigGeneration(fooConfig, ErrorCode.UNKNOWN_DEFINITION)); - proxy = ProxyServer.createTestServer(source, client, memoryCache); + proxy = createTestServer(source, client, memoryCache); } @After @@ -70,7 +71,7 @@ public class ProxyServerTest { */ @Test public void testModeSwitch() { - ProxyServer proxy = ProxyServer.createTestServer(source); + ProxyServer proxy = createTestServer(source, client, new MemoryCache()); assertTrue(proxy.getMode().isDefault()); for (String mode : Mode.modes()) { @@ -83,7 +84,7 @@ public class ProxyServerTest { proxy.setMode("invalid"); assert (false); } catch (IllegalArgumentException e) { - assertEquals("Unrecognized mode 'invalid' supplied", e.getMessage()); + assertEquals("Unrecognized mode 'invalid' supplied. Legal modes are '" + Mode.modes() + "'", e.getMessage()); } // Also switch to DEFAULT mode, as that is not covered above @@ -218,6 +219,12 @@ public class ProxyServerTest { assertThat(properties.configSources[0], is(ProxyServer.DEFAULT_PROXY_CONFIG_SOURCES)); } + private static ProxyServer createTestServer(ConfigSourceSet source, + ConfigSourceClient configSourceClient, + MemoryCache memoryCache) { + return new ProxyServer(null, source, ProxyServer.defaultTimingValues(), memoryCache, configSourceClient); + } + static RawConfig createConfigWithNextConfigGeneration(RawConfig config, int errorCode) { return createConfigWithNextConfigGeneration(config, errorCode, config.getPayload()); } |