summaryrefslogtreecommitdiffstats
path: root/jdisc_core/src/test
diff options
context:
space:
mode:
authorgjoranv <gv@oath.com>2018-09-24 13:56:31 +0200
committergjoranv <gv@oath.com>2018-09-27 15:48:29 +0200
commit5f897da5e8a18f4d1f3d260fd943af37426c9db0 (patch)
treed14a0d83c4f51c6c46cbc793621618ca44eb4301 /jdisc_core/src/test
parent3983f26df5038419d769df3b82181c8ebb9a42f1 (diff)
Use a more robust method for retrieving system packages.
- Start the framework and retrieve properties from the system bundle. - The static 'org.osgi.framework.system.packages' property only returns org.osgi packages on Felix 6, and was based on a static list in felix/framework/src/main/resources/default (not good).
Diffstat (limited to 'jdisc_core/src/test')
-rw-r--r--jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java
index 55fca97841a..6836ebde496 100644
--- a/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java
+++ b/jdisc_core/src/test/java/com/yahoo/jdisc/core/FelixParamsTestCase.java
@@ -29,17 +29,19 @@ public class FelixParamsTestCase {
@Test
public void requireThatSystemPackagesAreNotReplaced() {
+ String systemPackages = ExportPackages.getSystemPackages();
+
FelixParams params = new FelixParams();
Map<String, String> config = params.toConfig();
assertNotNull(config);
String str = config.get(Constants.FRAMEWORK_SYSTEMPACKAGES);
assertNotNull(str);
- assertTrue(str.contains(ExportPackages.getSystemPackages()));
+ assertTrue(str.contains(systemPackages));
params.exportPackage("foo");
assertNotNull(config = params.toConfig());
assertNotNull(str = config.get(Constants.FRAMEWORK_SYSTEMPACKAGES));
- assertTrue(str.contains(ExportPackages.getSystemPackages()));
+ assertTrue(str.contains(systemPackages));
assertTrue(str.contains("foo"));
}