Reapply "Load platform bundles separately"

This reverts commit 0355cb740fe498abc03861bcb64de5e418c2fa88.

1 files changed, 10 insertions, 5 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 dd755e8e6dd..2e40b37f78f 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,8 +2,9 @@
 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;
@@ -23,7 +24,8 @@ import static org.junit.Assert.assertThat;
  * @author ollivir
  */
 public class StandaloneSubscriberTest {
-    private static ConfigKey<ConfigInstance> bundlesKey = key("bundles");
+    private static ConfigKey<ConfigInstance> platformBundlesKey = key("platform-bundles");
+    private static ConfigKey<ConfigInstance> applicationBundlesKey = key("application-bundles");
     private static ConfigKey<ConfigInstance> componentsKey = key("components");
 
     private static ConfigKey<ConfigInstance> key(String name) {
@@ -35,16 +37,19 @@ public class StandaloneSubscriberTest {
     public void standalone_subscriber() throws Exception {
         withContainerModel("<container version=\"1.0\"></container>", root -> {
             Set<ConfigKey<ConfigInstance>> keys = new HashSet<>();
-            keys.add(bundlesKey);
+            keys.add(platformBundlesKey);
+            keys.add(applicationBundlesKey);
             keys.add(componentsKey);
             Subscriber subscriber = new StandaloneSubscriberFactory(root).getSubscriber(keys);
             Map<ConfigKey<ConfigInstance>, ConfigInstance> config = subscriber.config();
             assertThat(config.size(), is(2));
 
-            BundlesConfig bundlesConfig = (BundlesConfig) config.get(bundlesKey);
+            PlatformBundlesConfig platformBundlesConfig = (PlatformBundlesConfig) config.get(platformBundlesKey);
+            ApplicationBundlesConfig applicationBundlesConfig = (ApplicationBundlesConfig) config.get(applicationBundlesKey);
             ComponentsConfig componentsConfig = (ComponentsConfig) config.get(componentsKey);
 
-            assertThat(bundlesConfig.bundle().size(), is(0));
+            assertThat(platformBundlesConfig.bundles().size(), is(0));
+            assertThat(applicationBundlesConfig.bundles().size(), is(0));
             assertThat(componentsConfig.components().size(), greaterThan(10));
             return null;
         });