diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-08 13:35:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 13:35:44 +0100 |
commit | 1fce95eefd21a4a0686dbf8557cb540894029a1f (patch) | |
tree | f0535c9ae6ccbf13bf0ad3ce15322a964f261b90 /container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java | |
parent | 10464c859ccca2596e2b841612f8ea958330e4dc (diff) |
Revert "Bratseth/simplify config take 2"
Diffstat (limited to 'container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java')
-rw-r--r-- | container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java b/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java index 4751b9b74b7..e6b0309981a 100644 --- a/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java +++ b/container-di/src/test/java/com/yahoo/container/di/ConfigRetrieverTest.java @@ -51,7 +51,7 @@ public class ConfigRetrieverTest { public void require_that_bootstrap_configs_come_first() { writeConfigs(); ConfigRetriever retriever = createConfigRetriever(); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); assertThat(bootstrapConfigs, Matchers.instanceOf(BootstrapConfigs.class)); } @@ -61,7 +61,7 @@ public class ConfigRetrieverTest { public void require_that_components_comes_after_bootstrap() { writeConfigs(); ConfigRetriever retriever = createConfigRetriever(); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId()); ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0); @@ -73,6 +73,22 @@ public class ConfigRetrieverTest { } } + @Test + @SuppressWarnings("unused") + public void require_no_reconfig_when_restart_on_redeploy() { + // TODO + writeConfigs(); + ConfigRetriever retriever = createConfigRetriever(); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); + + ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId()); + Optional<ConfigSnapshot> componentsConfigs = retriever.getConfigsOnce(Collections.singleton(testConfigKey), 0, true); + + if (componentsConfigs.isPresent()) { + fail("Expected no configs"); + } + } + @Rule public ExpectedException expectedException = ExpectedException.none(); @@ -84,8 +100,8 @@ public class ConfigRetrieverTest { writeConfigs(); ConfigRetriever retriever = createConfigRetriever(); ConfigKey<? extends ConfigInstance> testConfigKey = new ConfigKey<>(TestConfig.class, dirConfigSource.configId()); - ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0); - ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0); + ConfigSnapshot bootstrapConfigs = retriever.getConfigs(Collections.emptySet(), 0, false); + ConfigSnapshot componentsConfigs = retriever.getConfigs(Collections.singleton(testConfigKey), 0, false); Set<ConfigKey<? extends ConfigInstance>> keys = new HashSet<>(); keys.add(testConfigKey); keys.add(new ConfigKey<>(TestConfig.class, "")); |