diff options
author | gjoranv <gv@verizonmedia.com> | 2020-07-17 14:23:41 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2020-07-17 14:23:41 +0200 |
commit | 5627a766d1d34159ee126b4980dc817654bc7508 (patch) | |
tree | a1f5ff3d39f0343fc22e3109c5fb331b21ebdaad /container-core/src/test/java | |
parent | f1d49e5d8be88d61c832569ca0871dc240f2ebe2 (diff) |
Reapply "Load platform bundles separately 3"
This reverts commit 1c69b4e72b3212e3ce989a8675db08ac51b7f79d.
Diffstat (limited to 'container-core/src/test/java')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java (renamed from container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java index 414e6b05128..ee71e8a8f4c 100644 --- a/container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java +++ b/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java @@ -16,27 +16,27 @@ import static org.junit.Assert.assertTrue; /** * @author gjoranv */ -public class BundleManagerTest { +public class ApplicationBundleLoaderTest { private static final FileReference BUNDLE_1_REF = new FileReference("bundle-1"); private static final Bundle BUNDLE_1 = new TestBundle(BUNDLE_1_REF.value()); private static final FileReference BUNDLE_2_REF = new FileReference("bundle-2"); private static final Bundle BUNDLE_2 = new TestBundle(BUNDLE_2_REF.value()); - private BundleManager bundleLoader; + private ApplicationBundleLoader bundleLoader; private TestOsgi osgi; @Before public void setup() { osgi = new TestOsgi(testBundles()); var bundleInstaller = new TestBundleInstaller(); - bundleLoader = new BundleManager(osgi); + bundleLoader = new ApplicationBundleLoader(osgi); bundleLoader.useCustomBundleInstaller(bundleInstaller); } @Test public void bundles_are_installed_and_started() { - bundleLoader.use(List.of(BUNDLE_1_REF)); + bundleLoader.useBundles(List.of(BUNDLE_1_REF)); assertEquals(1, osgi.getInstalledBundles().size()); // The bundle is installed and started @@ -51,8 +51,8 @@ public class BundleManagerTest { @Test public void new_bundle_can_be_installed_in_reconfig() { - bundleLoader.use(List.of(BUNDLE_1_REF)); - Set<Bundle> obsoleteBundles = bundleLoader.use(List.of(BUNDLE_1_REF, BUNDLE_2_REF)); + bundleLoader.useBundles(List.of(BUNDLE_1_REF)); + Set<Bundle> obsoleteBundles = bundleLoader.useBundles(List.of(BUNDLE_1_REF, BUNDLE_2_REF)); // No bundles are obsolete assertTrue(obsoleteBundles.isEmpty()); @@ -76,8 +76,8 @@ public class BundleManagerTest { @Test public void unused_bundle_is_marked_obsolete_after_reconfig() { - bundleLoader.use(List.of(BUNDLE_1_REF)); - Set<Bundle> obsoleteBundles = bundleLoader.use(List.of(BUNDLE_2_REF)); + bundleLoader.useBundles(List.of(BUNDLE_1_REF)); + Set<Bundle> obsoleteBundles = bundleLoader.useBundles(List.of(BUNDLE_2_REF)); // The returned set of obsolete bundles contains bundle-1 assertEquals(1, obsoleteBundles.size()); |