diff options
author | Harald Musum <musum@yahoo-inc.com> | 2017-07-20 07:53:14 +0200 |
---|---|---|
committer | Harald Musum <musum@yahoo-inc.com> | 2017-07-20 07:53:14 +0200 |
commit | 2111f78001e120b832ae43183a445f69f572da8f (patch) | |
tree | ab3940f979e33ead4614893f11577f9a3fc31b5f /config-proxy | |
parent | e8d627cd40ee17afb238a766c3254be3f68d2e07 (diff) |
Delete Helper class (move code to ConfigTester)
Diffstat (limited to 'config-proxy')
5 files changed, 52 insertions, 69 deletions
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java index 92cdb3094a5..c16d6ccbcf5 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/ConfigTester.java @@ -2,16 +2,21 @@ package com.yahoo.vespa.config.proxy; import com.yahoo.jrt.Request; +import com.yahoo.slime.Slime; import com.yahoo.vespa.config.ConfigKey; +import com.yahoo.vespa.config.ConfigPayload; import com.yahoo.vespa.config.RawConfig; import com.yahoo.vespa.config.protocol.CompressionType; import com.yahoo.vespa.config.protocol.DefContent; import com.yahoo.vespa.config.protocol.JRTClientConfigRequestV3; import com.yahoo.vespa.config.protocol.JRTServerConfigRequest; import com.yahoo.vespa.config.protocol.JRTServerConfigRequestV3; +import com.yahoo.vespa.config.protocol.Payload; import com.yahoo.vespa.config.protocol.Trace; +import com.yahoo.vespa.config.util.ConfigUtils; import java.util.Collections; +import java.util.List; import java.util.Optional; /** @@ -21,20 +26,45 @@ public class ConfigTester { private static final long defaultTimeout = 10000; - public JRTServerConfigRequest createRequest(RawConfig config) { + static RawConfig fooConfig; + static RawConfig barConfig; + static Payload fooPayload; + + static { + String defName = "foo"; + String configId = "id"; + String namespace = "bar"; + ConfigKey<?> configKey = new ConfigKey<>(defName, configId, namespace); + + ConfigPayload fooConfigPayload = createConfigPayload("bar", "value"); + fooPayload = Payload.from(fooConfigPayload); + + List<String> defContent = Collections.singletonList("bar string"); + long generation = 1; + String defMd5 = ConfigUtils.getDefMd5(defContent); + String configMd5 = ConfigUtils.getMd5(fooConfigPayload); + fooConfig = new RawConfig(configKey, defMd5, fooPayload, configMd5, + generation, defContent, Optional.empty()); + + String defName2 = "bar"; + barConfig = new RawConfig(new ConfigKey<>(defName2, configId, namespace), defMd5, fooPayload, configMd5, + generation, defContent, Optional.empty()); + } + + JRTServerConfigRequest createRequest(RawConfig config) { return createRequest(config, defaultTimeout); } - public JRTServerConfigRequest createRequest(RawConfig config, long timeout) { + JRTServerConfigRequest createRequest(RawConfig config, long timeout) { return createRequest(config.getName(), config.getConfigId(), config.getNamespace(), config.getConfigMd5(), config.getDefMd5(), config.getGeneration(), timeout); } - public JRTServerConfigRequest createRequest(String configName, String configId, String namespace, long timeout) { + JRTServerConfigRequest createRequest(String configName, String configId, String namespace, long timeout) { return createRequest(configName, configId, namespace, "", null, 0, timeout); } - public JRTServerConfigRequest createRequest(String configName, String configId, String namespace, String md5, String defMd5, long generation, long timeout) { + private JRTServerConfigRequest createRequest(String configName, String configId, String namespace, String md5, String defMd5, long generation, long timeout) { Request request = JRTClientConfigRequestV3. createWithParams(new ConfigKey<>(configName, configId, namespace, defMd5, null), DefContent.fromList(Collections.emptyList()), "fromHost", md5, generation, timeout, Trace.createDummy(), CompressionType.UNCOMPRESSED, @@ -42,4 +72,10 @@ public class ConfigTester { return JRTServerConfigRequestV3.createFromRequest(request); } + static ConfigPayload createConfigPayload(String key, String value) { + Slime slime = new Slime(); + slime.setObject().setString(key, value); + return new ConfigPayload(slime); + } + } diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseHandlerTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseHandlerTest.java index a79f84a056d..84b3e5dbe95 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseHandlerTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/DelayedResponseHandlerTest.java @@ -32,7 +32,7 @@ public class DelayedResponseHandlerTest { DelayedResponses delayedResponses = new DelayedResponses(statistics); final MockRpcServer mockRpcServer = new MockRpcServer(); final MemoryCache memoryCache = new MemoryCache(); - memoryCache.put(ProxyServerTest.fooConfig); + memoryCache.put(ConfigTester.fooConfig); final DelayedResponseHandler delayedResponseHandler = new DelayedResponseHandler(delayedResponses, memoryCache, mockRpcServer); delayedResponses.add(new DelayedResponse(tester.createRequest(ProxyServerTest.fooConfig, 0))); delayedResponses.add(new DelayedResponse(tester.createRequest(ProxyServerTest.fooConfig, 1200000))); // should not be returned yet diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java deleted file mode 100644 index 621ee7783c2..00000000000 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/Helper.java +++ /dev/null @@ -1,53 +0,0 @@ -// 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.slime.Slime; -import com.yahoo.vespa.config.*; -import com.yahoo.vespa.config.protocol.Payload; -import com.yahoo.vespa.config.util.ConfigUtils; - -import java.util.Collections; -import java.util.List; -import java.util.Optional; - -/** - * @author hmusum - * @since 5.1.9 - */ -// TODO: Move into ConfigTester and delete this class -public class Helper { - - static RawConfig fooConfig; - static RawConfig barConfig; - static Payload fooPayload; - - static { - String defName = "foo"; - String configId = "id"; - String namespace = "bar"; - ConfigKey<?> configKey = new ConfigKey<>(defName, configId, namespace); - - ConfigPayload fooConfigPayload = createConfigPayload("bar", "value"); - fooPayload = Payload.from(fooConfigPayload); - - List<String> defContent = Collections.singletonList("bar string"); - long generation = 1; - String defMd5 = ConfigUtils.getDefMd5(defContent); - String configMd5 = ConfigUtils.getMd5(fooConfigPayload); - fooConfig = new RawConfig(configKey, defMd5, fooPayload, configMd5, - generation, defContent, Optional.empty()); - - String defName2 = "bar"; - barConfig = new RawConfig(new ConfigKey<>(defName2, configId, namespace), defMd5, fooPayload, configMd5, - generation, defContent, Optional.empty()); - } - - static ConfigPayload createConfigPayload(String key, String value) { - Slime slime = new Slime(); - slime.setObject().setString(key, value); - return new ConfigPayload(slime); - } - - - -} diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java index 0c6f43b260d..55942c6abd8 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MemoryCacheConfigClientTest.java @@ -18,10 +18,10 @@ public class MemoryCacheConfigClientTest { @Test public void basic() { MemoryCache cache = new MemoryCache(); - cache.put(Helper.fooConfig); + cache.put(ConfigTester.fooConfig); MemoryCacheConfigClient client = new MemoryCacheConfigClient(cache); - assertThat(client.getConfig(Helper.fooConfig, null), is(Helper.fooConfig)); - assertNull(client.getConfig(Helper.barConfig, null)); + assertThat(client.getConfig(ConfigTester.fooConfig, null), is(ConfigTester.fooConfig)); + assertNull(client.getConfig(ConfigTester.barConfig, null)); assertThat(client.getActiveSourceConnection(), is("N/A")); assertThat(client.getSourceConnections(), is(Collections.singletonList("N/A"))); 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 7a6c689a767..f82d9e90184 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 @@ -29,7 +29,7 @@ public class ProxyServerTest { private final ConfigProxyStatistics statistics = new ConfigProxyStatistics(); private ProxyServer proxy; - static final RawConfig fooConfig = Helper.fooConfig; + static final RawConfig fooConfig = ConfigTester.fooConfig; // errorConfig based on fooConfig private static final ConfigKey<?> errorConfigKey = new ConfigKey<>("error", fooConfig.getConfigId(), fooConfig.getNamespace()); @@ -64,7 +64,7 @@ public class ProxyServerTest { assertEquals(0, memoryCache.size()); RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)); assertNotNull(res); - assertThat(res.getPayload().toString(), is(Helper.fooPayload.toString())); + assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString())); assertEquals(1, memoryCache.size()); assertThat(memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())), is(res)); @@ -127,7 +127,7 @@ public class ProxyServerTest { assertEquals(0, memoryCache.size()); RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)); assertNotNull(res); - assertThat(res.getPayload().toString(), is(Helper.fooPayload.toString())); + assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString())); assertEquals(1, memoryCache.size()); assertThat(memoryCache.get(new ConfigCacheKey(fooConfig.getKey(), fooConfig.getDefMd5())), is(res)); @@ -165,7 +165,7 @@ public class ProxyServerTest { res = proxy.resolveConfig(tester.createRequest(fooConfig)); assertNotNull(res); assertNotNull(res.getPayload().getData()); - assertThat(res.getPayload().toString(), is(Helper.fooPayload.toString())); + assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString())); assertEquals(1, cacheManager.size()); JRTServerConfigRequest newRequestBasedOnResponse = tester.createRequest(res); @@ -179,7 +179,7 @@ public class ProxyServerTest { ConfigTester tester = new ConfigTester(); RawConfig res = proxy.resolveConfig(tester.createRequest(fooConfig)); assertNotNull(res); - assertThat(res.getPayload().toString(), is(Helper.fooPayload.toString())); + assertThat(res.getPayload().toString(), is(ConfigTester.fooPayload.toString())); // Simulate deployment, add config with new config generation long previousGeneration = res.getGeneration(); @@ -193,7 +193,7 @@ public class ProxyServerTest { @Test public void testReconfigurationAsClient() { long generation = 1; - RawConfig fooConfig = Helper.fooConfig; + RawConfig fooConfig = ConfigTester.fooConfig; source.put(fooConfig.getKey(), fooConfig); clientUpdater.waitForConfigGeneration(fooConfig.getKey(), generation); @@ -201,7 +201,7 @@ public class ProxyServerTest { // Update payload in config generation++; - final ConfigPayload payload = Helper.createConfigPayload("bar", "value2"); + final ConfigPayload payload = ConfigTester.createConfigPayload("bar", "value2"); RawConfig fooConfig2 = createConfigWithNextConfigGeneration(fooConfig, 0, Payload.from(payload)); source.put(fooConfig2.getKey(), fooConfig2); @@ -221,7 +221,7 @@ public class ProxyServerTest { return createConfigWithNextConfigGeneration(config, errorCode, config.getPayload()); } - static RawConfig createConfigWithNextConfigGeneration(RawConfig config, int errorCode, Payload payload) { + private static RawConfig createConfigWithNextConfigGeneration(RawConfig config, int errorCode, Payload payload) { return new RawConfig(config.getKey(), config.getDefMd5(), payload, config.getConfigMd5(), config.getGeneration() + 1, errorCode, config.getDefContent(), Optional.empty()); |