diff options
author | gjoranv <gv@verizonmedia.com> | 2020-07-16 10:11:49 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-07-16 10:12:19 +0200 |
commit | 1eb5aeac9e1ad94f4e5d290cd57264541968454b (patch) | |
tree | 0db6722d283c5f5080a8a9dc81c0d6bfa5fea6b9 /container-di/src/test/java/com | |
parent | c608c8384315cebdc8adacb012a8c49a09cc0340 (diff) |
Reapply "Load platform bundles separately"
This reverts commit 0355cb740fe498abc03861bcb64de5e418c2fa88.
Diffstat (limited to 'container-di/src/test/java/com')
-rw-r--r-- | container-di/src/test/java/com/yahoo/container/di/ContainerTest.java | 3 | ||||
-rw-r--r-- | container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java | 5 |
2 files changed, 5 insertions, 3 deletions
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 eac64c20274..19f277ff8fb 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 @@ -267,7 +267,8 @@ public class ContainerTest extends ContainerTestBase { "inject[0].forClass \"" + injectedClass.getName() + "\"\n"; dirConfigSource.writeConfig("components", componentsConfig); - dirConfigSource.writeConfig("bundles", ""); + dirConfigSource.writeConfig("platform-bundles", ""); + dirConfigSource.writeConfig("application-bundles", ""); dirConfigSource.writeConfig("jersey-bundles", "bundles[0].spec \"mock-entry-to-enforce-a-MockBundle\""); dirConfigSource.writeConfig("jersey-injection", injectionConfig); diff --git a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java index 18236a6bde9..f1f3c4a2ae4 100644 --- a/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java +++ b/container-di/src/test/java/com/yahoo/container/di/ContainerTestBase.java @@ -61,7 +61,7 @@ public class ContainerTestBase { } @Override - public Set<Bundle> useBundles(Collection<FileReference> bundles) { + public Set<Bundle> useApplicationBundles(Collection<FileReference> bundles) { return emptySet(); } @@ -81,7 +81,8 @@ public class ContainerTestBase { } protected void writeBootstrapConfigs(ComponentEntry... componentEntries) { - dirConfigSource.writeConfig("bundles", ""); + dirConfigSource.writeConfig("platform-bundles", ""); + dirConfigSource.writeConfig("application-bundles", ""); StringBuilder components = new StringBuilder(); for (int i = 0; i < componentEntries.length; i++) { components.append(componentEntries[i].asConfig(i)); |