diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 16:43:15 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-08 16:43:15 +0100 |
commit | a7f5024172bdb716eada086614bbccc84b7fa84c (patch) | |
tree | e6a802b7af94e3c88d15316488646a074969a611 /container-di | |
parent | 637e6d823a470eeff9b2d1f91bbb9faa11b39775 (diff) |
Support force reget config for tests
Diffstat (limited to 'container-di')
3 files changed, 14 insertions, 19 deletions
diff --git a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java index 44e38648230..cf80009f3f6 100644 --- a/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java +++ b/container-di/src/main/java/com/yahoo/container/di/ConfigRetriever.java @@ -112,7 +112,7 @@ public final class ConfigRetriever { } private Optional<ConfigSnapshot> configIfChanged(Subscriber subscriber, - Function<Map<ConfigKey<? extends ConfigInstance>, ConfigInstance>, ConfigSnapshot> constructor) { + Function<Map<ConfigKey<? extends ConfigInstance>, ConfigInstance>, ConfigSnapshot> constructor) { if (subscriber.configChanged()) { return Optional.of(constructor.apply(Keys.covariantCopy(subscriber.config()))); } else { diff --git a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java index 005691721c4..be80fc1616d 100644 --- a/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java +++ b/container-di/src/main/java/com/yahoo/container/di/componentgraph/core/Keys.java @@ -14,6 +14,7 @@ import java.util.Map; * @author ollivir */ public class Keys { + static Key<?> createKey(Type instanceType, Annotation annotation) { if (annotation == null) { return Key.get(instanceType); @@ -34,4 +35,5 @@ public class Keys { configs.forEach((k, v) -> ret.put(k, v)); return ret; } + } diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java index 37d84df2612..b8a5c7a236f 100644 --- a/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java +++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTest.java @@ -11,29 +11,22 @@ import com.yahoo.container.di.componentgraph.core.ComponentGraph; import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.SimpleComponent; import com.yahoo.container.di.componentgraph.core.ComponentGraphTest.SimpleComponent2; import com.yahoo.container.di.componentgraph.core.ComponentNode.ComponentConstructorException; -import com.yahoo.container.di.componentgraph.core.Node; import com.yahoo.container.di.config.RestApiContext; import org.junit.Ignore; import org.junit.Test; import org.osgi.framework.Bundle; -import org.osgi.framework.BundleException; import java.util.Collection; import java.util.List; -import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.notNullValue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -52,7 +45,7 @@ public class ContainerTest extends ContainerTestBase { Container container = newContainer(dirConfigSource); ComponentTakingConfig component = createComponentTakingConfig(getNewComponentGraph(container)); - assertThat(component.config.stringVal(), is("myString")); + assertEquals("myString", component.config.stringVal()); container.shutdownConfigurer(); } @@ -63,11 +56,10 @@ public class ContainerTest extends ContainerTestBase { dirConfigSource.writeConfig("test", "stringVal \"original\""); Container container = newContainer(dirConfigSource); - ComponentGraph componentGraph = getNewComponentGraph(container); ComponentTakingConfig component = createComponentTakingConfig(componentGraph); - assertThat(component.config.stringVal(), is("original")); + assertEquals("original", component.config.stringVal()); // Reconfigure dirConfigSource.writeConfig("test", "stringVal \"reconfigured\""); @@ -75,7 +67,7 @@ public class ContainerTest extends ContainerTestBase { ComponentGraph newComponentGraph = getNewComponentGraph(container, componentGraph); ComponentTakingConfig component2 = createComponentTakingConfig(newComponentGraph); - assertThat(component2.config.stringVal(), is("reconfigured")); + assertEquals("reconfigured", component2.config.stringVal()); container.shutdownConfigurer(); } @@ -89,7 +81,7 @@ public class ContainerTest extends ContainerTestBase { ComponentGraph graph = getNewComponentGraph(container); ComponentTakingConfig component = createComponentTakingConfig(graph); - assertThat(component.getId().toString(), is("id1")); + assertEquals("id1", component.getId().toString()); writeBootstrapConfigs( new ComponentEntry("id1", ComponentTakingConfig.class), @@ -98,8 +90,8 @@ public class ContainerTest extends ContainerTestBase { container.reloadConfig(2); ComponentGraph newGraph = getNewComponentGraph(container, graph); - assertThat(ComponentGraph.getNode(newGraph, "id1"), notNullValue(Node.class)); - assertThat(ComponentGraph.getNode(newGraph, "id2"), notNullValue(Node.class)); + assertNotNull(ComponentGraph.getNode(newGraph, "id1")); + assertNotNull(ComponentGraph.getNode(newGraph, "id2")); container.shutdownConfigurer(); } @@ -241,9 +233,9 @@ public class ContainerTest extends ContainerTestBase { RestApiContext restApiContext = componentGraph.getInstance(clazz); assertNotNull(restApiContext); - assertThat(restApiContext.getBundles().size(), is(1)); - assertThat(restApiContext.getBundles().get(0).symbolicName, is(MockBundle.SymbolicName)); - assertThat(restApiContext.getBundles().get(0).version, is(MockBundle.BundleVersion)); + assertEquals(1, restApiContext.getBundles().size()); + assertEquals(MockBundle.SymbolicName, restApiContext.getBundles().get(0).symbolicName); + assertEquals(MockBundle.BundleVersion, restApiContext.getBundles().get(0).version); container.shutdownConfigurer(); } @@ -279,7 +271,7 @@ public class ContainerTest extends ContainerTestBase { RestApiContext restApiContext = componentGraph.getInstance(restApiClass); assertFalse(restApiContext.getInjectableComponents().isEmpty()); - assertThat(restApiContext.getInjectableComponents().size(), is(2)); + assertEquals(2, restApiContext.getInjectableComponents().size()); container.shutdownConfigurer(); } @@ -412,4 +404,5 @@ public class ContainerTest extends ContainerTestBase { private ComponentTakingConfig createComponentTakingConfig(ComponentGraph componentGraph) { return componentGraph.getInstance(ComponentTakingConfig.class); } + } |