diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-07-17 12:04:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-17 12:04:07 +0200 |
commit | 1c69b4e72b3212e3ce989a8675db08ac51b7f79d (patch) | |
tree | 3714c4ea91a3e68826e5ddbb73f71daa93105aec /container-core/src/test | |
parent | 174910488e7793d9962775c0325764ed265ea2ce (diff) |
Revert "Load platform bundles separately 3"
Diffstat (limited to 'container-core/src/test')
-rw-r--r-- | container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java (renamed from container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java) | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java b/container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java index ee71e8a8f4c..414e6b05128 100644 --- a/container-core/src/test/java/com/yahoo/container/core/config/ApplicationBundleLoaderTest.java +++ b/container-core/src/test/java/com/yahoo/container/core/config/BundleManagerTest.java @@ -16,27 +16,27 @@ import static org.junit.Assert.assertTrue; /** * @author gjoranv */ -public class ApplicationBundleLoaderTest { +public class BundleManagerTest { 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 ApplicationBundleLoader bundleLoader; + private BundleManager bundleLoader; private TestOsgi osgi; @Before public void setup() { osgi = new TestOsgi(testBundles()); var bundleInstaller = new TestBundleInstaller(); - bundleLoader = new ApplicationBundleLoader(osgi); + bundleLoader = new BundleManager(osgi); bundleLoader.useCustomBundleInstaller(bundleInstaller); } @Test public void bundles_are_installed_and_started() { - bundleLoader.useBundles(List.of(BUNDLE_1_REF)); + bundleLoader.use(List.of(BUNDLE_1_REF)); assertEquals(1, osgi.getInstalledBundles().size()); // The bundle is installed and started @@ -51,8 +51,8 @@ public class ApplicationBundleLoaderTest { @Test public void new_bundle_can_be_installed_in_reconfig() { - bundleLoader.useBundles(List.of(BUNDLE_1_REF)); - Set<Bundle> obsoleteBundles = bundleLoader.useBundles(List.of(BUNDLE_1_REF, BUNDLE_2_REF)); + bundleLoader.use(List.of(BUNDLE_1_REF)); + Set<Bundle> obsoleteBundles = bundleLoader.use(List.of(BUNDLE_1_REF, BUNDLE_2_REF)); // No bundles are obsolete assertTrue(obsoleteBundles.isEmpty()); @@ -76,8 +76,8 @@ public class ApplicationBundleLoaderTest { @Test public void unused_bundle_is_marked_obsolete_after_reconfig() { - bundleLoader.useBundles(List.of(BUNDLE_1_REF)); - Set<Bundle> obsoleteBundles = bundleLoader.useBundles(List.of(BUNDLE_2_REF)); + bundleLoader.use(List.of(BUNDLE_1_REF)); + Set<Bundle> obsoleteBundles = bundleLoader.use(List.of(BUNDLE_2_REF)); // The returned set of obsolete bundles contains bundle-1 assertEquals(1, obsoleteBundles.size()); |