diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-07-16 07:27:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-16 07:27:49 +0200 |
commit | 0355cb740fe498abc03861bcb64de5e418c2fa88 (patch) | |
tree | a456fc74ed740d6c5c5fb6ed61f100c09c951c24 /standalone-container/src | |
parent | 14c65de9b6b0d7a5dac17aa96109e125c14762b5 (diff) |
Revert "Load platform bundles separately"
Diffstat (limited to 'standalone-container/src')
-rw-r--r-- | standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java index 2e40b37f78f..dd755e8e6dd 100644 --- a/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java +++ b/standalone-container/src/test/java/com/yahoo/container/standalone/StandaloneSubscriberTest.java @@ -2,9 +2,8 @@ package com.yahoo.container.standalone; import com.yahoo.config.ConfigInstance; +import com.yahoo.container.BundlesConfig; import com.yahoo.container.ComponentsConfig; -import com.yahoo.container.di.ApplicationBundlesConfig; -import com.yahoo.container.di.PlatformBundlesConfig; import com.yahoo.container.di.config.Subscriber; import com.yahoo.vespa.config.ConfigKey; import org.junit.Ignore; @@ -24,8 +23,7 @@ import static org.junit.Assert.assertThat; * @author ollivir */ public class StandaloneSubscriberTest { - private static ConfigKey<ConfigInstance> platformBundlesKey = key("platform-bundles"); - private static ConfigKey<ConfigInstance> applicationBundlesKey = key("application-bundles"); + private static ConfigKey<ConfigInstance> bundlesKey = key("bundles"); private static ConfigKey<ConfigInstance> componentsKey = key("components"); private static ConfigKey<ConfigInstance> key(String name) { @@ -37,19 +35,16 @@ public class StandaloneSubscriberTest { public void standalone_subscriber() throws Exception { withContainerModel("<container version=\"1.0\"></container>", root -> { Set<ConfigKey<ConfigInstance>> keys = new HashSet<>(); - keys.add(platformBundlesKey); - keys.add(applicationBundlesKey); + keys.add(bundlesKey); keys.add(componentsKey); Subscriber subscriber = new StandaloneSubscriberFactory(root).getSubscriber(keys); Map<ConfigKey<ConfigInstance>, ConfigInstance> config = subscriber.config(); assertThat(config.size(), is(2)); - PlatformBundlesConfig platformBundlesConfig = (PlatformBundlesConfig) config.get(platformBundlesKey); - ApplicationBundlesConfig applicationBundlesConfig = (ApplicationBundlesConfig) config.get(applicationBundlesKey); + BundlesConfig bundlesConfig = (BundlesConfig) config.get(bundlesKey); ComponentsConfig componentsConfig = (ComponentsConfig) config.get(componentsKey); - assertThat(platformBundlesConfig.bundles().size(), is(0)); - assertThat(applicationBundlesConfig.bundles().size(), is(0)); + assertThat(bundlesConfig.bundle().size(), is(0)); assertThat(componentsConfig.components().size(), greaterThan(10)); return null; }); |