diff options
author | Valerij Fredriksen <freva@users.noreply.github.com> | 2017-03-10 14:35:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-10 14:35:42 +0100 |
commit | 8d4c358fbdffe099ca3c164f156286563c2aa59b (patch) | |
tree | 454440a0d69a13b3cd318674c6baaa00fe68a734 /config-proxy/src/test | |
parent | fc6e120ee2e3683ad962a44328052a1c79a36acb (diff) | |
parent | 46c80a4297a2c84c72de2bcc3abd96abd9f98474 (diff) |
Merge pull request #1982 from yahoo/hmusum/make-sure-to-subscribe-before-starting-thread
Make sure to subscribe before starting subscriber thread in tests
Diffstat (limited to 'config-proxy/src/test')
3 files changed, 20 insertions, 18 deletions
diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java index 83e11e343be..4863fd24d4e 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/MapBackedConfigSource.java @@ -51,7 +51,7 @@ public class MapBackedConfigSource implements ConfigSource, ConfigSourceClient { public void shutdownSourceConnections() { } - public void clear() { + void clear() { backing.clear(); } 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 c21fad062eb..276c7c07cb7 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 @@ -21,7 +21,7 @@ import static org.junit.Assert.*; */ public class ProxyServerTest { - MemoryCache memoryCache = new MemoryCache(); + private final MemoryCache memoryCache = new MemoryCache(); private final MapBackedConfigSource source = new MapBackedConfigSource(UpstreamConfigSubscriberTest.MockClientUpdater.create(memoryCache)); private ProxyServer proxy = ProxyServer.createTestServer(source, source, memoryCache); diff --git a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java index e566df8bb2a..92ace6c58d1 100644 --- a/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java +++ b/config-proxy/src/test/java/com/yahoo/vespa/config/proxy/UpstreamConfigSubscriberTest.java @@ -34,7 +34,6 @@ public class UpstreamConfigSubscriberTest { private static RawConfig errorConfig; private static ConfigKey<?> errorConfigKey; private static Payload fooPayload; - private static Payload errorPayload; private long generation = 1; @@ -51,7 +50,7 @@ public class UpstreamConfigSubscriberTest { fooConfig = new RawConfig(Helper.fooConfig.getKey(), Helper.fooConfig.getDefMd5(), fooPayload, ConfigUtils.getMd5(payload), generation, 0, Helper.fooConfig.getDefContent(), Optional.empty()); payload = new ConfigPayload(new Slime()); - errorPayload = Payload.from(payload); + Payload errorPayload = Payload.from(payload); errorConfigKey = new ConfigKey<>("error", fooConfig.getConfigId(), fooConfig.getNamespace()); errorConfig = new RawConfig(errorConfigKey, fooConfig.getDefMd5(), errorPayload, ConfigUtils.getMd5(payload), generation, ErrorCode.UNKNOWN_DEFINITION, fooConfig.getDefContent(), Optional.empty()); @@ -61,16 +60,9 @@ public class UpstreamConfigSubscriberTest { mockConnection = new MockConnection(sourceResponses); } - private ConfigPayload getConfigPayload(String key, String value) { - Slime slime = new Slime(); - slime.setObject().setString(key, value); - return new ConfigPayload(slime); - } - @Test public void basic() { - final UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(fooConfig); - new Thread(subscriber).start(); + UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(); waitForConfigGeneration(clientUpdater, generation); assertThat(clientUpdater.getLastConfig(), is(fooConfig)); subscriber.cancel(); @@ -78,9 +70,7 @@ public class UpstreamConfigSubscriberTest { @Test public void require_that_reconfiguration_works() { - final UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(fooConfig); - - new Thread(subscriber).start(); + UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(); waitForConfigGeneration(clientUpdater, generation); assertThat(clientUpdater.getLastConfig(), is(fooConfig)); @@ -99,9 +89,7 @@ public class UpstreamConfigSubscriberTest { @Test public void require_that_error_response_is_handled() { sourceResponses.put(errorConfigKey, errorConfig); - final UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(fooConfig); - - new Thread(subscriber).start(); + UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(); waitForConfigGeneration(clientUpdater, generation); RawConfig lastConfig = clientUpdater.getLastConfig(); assertThat(lastConfig, is(errorConfig)); @@ -166,4 +154,18 @@ public class UpstreamConfigSubscriberTest { return lastConfig; } } + + private UpstreamConfigSubscriber createUpstreamConfigSubscriber() { + UpstreamConfigSubscriber subscriber = createUpstreamConfigSubscriber(fooConfig); + subscriber.subscribe(); + new Thread(subscriber).start(); + return subscriber; + } + + private ConfigPayload getConfigPayload(String key, String value) { + Slime slime = new Slime(); + slime.setObject().setString(key, value); + return new ConfigPayload(slime); + } + } |