summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Daniel2013-02-13 06:54:26 (EST)
committer Thomas Watson2013-04-02 11:59:42 (EDT)
commite37fcf3a41d769f1e5f84f1432d4b4885ca40c37 (patch)
tree9df7493da98447f05ec605d7b4d58a043ed06c7f
parent7a0f9d3e9ef6a51205db95a3b8af192c86dc12be (diff)
downloadrt.equinox.framework-e37fcf3a41d769f1e5f84f1432d4b4885ca40c37.zip
rt.equinox.framework-e37fcf3a41d769f1e5f84f1432d4b4885ca40c37.tar.gz
rt.equinox.framework-e37fcf3a41d769f1e5f84f1432d4b4885ca40c37.tar.bz2
386298: 37 compilation errors after switching org.eclipse.osgi.tests to 1.5 compliance
Switch compliance to 1.5. Replace properties in tests with HashMap<String,Object>. https://bugs.eclipse.org/bugs/show_bug.cgi?id=386298
-rw-r--r--bundles/org.eclipse.osgi.tests/.classpath2
-rw-r--r--bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs18
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java70
-rw-r--r--bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java18
4 files changed, 56 insertions, 52 deletions
diff --git a/bundles/org.eclipse.osgi.tests/.classpath b/bundles/org.eclipse.osgi.tests/.classpath
index 357e15d..a8cc9cb 100644
--- a/bundles/org.eclipse.osgi.tests/.classpath
+++ b/bundles/org.eclipse.osgi.tests/.classpath
@@ -113,7 +113,7 @@
<classpathentry kind="src" output="bundle_tests/test.logging.a" path="bundles_src/test.logging.a"/>
<classpathentry kind="src" output="bundle_tests/console.test" path="bundles_src/console.test"/>
<classpathentry kind="src" output="bundle_tests/geturl" path="bundles_src/geturl"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs
index 3ad8b24..9530fd0 100644
--- a/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.osgi.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,3 @@
-#Wed Feb 10 08:41:26 CST 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -8,16 +7,16 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.5
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -26,7 +25,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
@@ -91,7 +90,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enab
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.source=1.5
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
@@ -163,7 +162,12 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
index b8abe95..1b34aa5 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
@@ -39,7 +39,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle01() {
// simple test to create an embedded framework
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -80,7 +80,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle02() {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle02"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
@@ -125,7 +125,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle03() {
// create/stop/ test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle03"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -157,7 +157,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle04() {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle04"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -206,7 +206,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle05_1() {
// create/install/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle05_1"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -256,7 +256,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle05_2() {
// create/install/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle05_2"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -336,7 +336,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle06() {
// create multiple instances test
File config1 = OSGiTestsActivator.getContext().getDataFile("testSystemBundle06_1"); //$NON-NLS-1$
- Properties configuration1 = new Properties();
+ Map<String, Object> configuration1 = new HashMap<String, Object>();
configuration1.put(Constants.FRAMEWORK_STORAGE, config1.getAbsolutePath());
Equinox equinox1 = new Equinox(configuration1);
try {
@@ -348,7 +348,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.STARTING, equinox1.getState()); //$NON-NLS-1$
File config2 = OSGiTestsActivator.getContext().getDataFile("testSystemBundle06_2"); //$NON-NLS-1$
- Properties configuration2 = new Properties();
+ Map<String, Object> configuration2 = new HashMap<String, Object>();
configuration2.put(Constants.FRAMEWORK_STORAGE, config2.getAbsolutePath());
Equinox equinox2 = new Equinox(configuration2);
try {
@@ -411,7 +411,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle07() {
// test init twice
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle07_01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -468,7 +468,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle08() {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle08_1"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -491,7 +491,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle08_2"); //$NON-NLS-1$
- configuration = new Properties();
+ configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
equinox = new Equinox(configuration);
try {
@@ -530,7 +530,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle09() {
// test FrameworkUtil.createFilter
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle09"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -567,7 +567,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle10() {
// create/start/update/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle10"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
final Equinox equinox = new Equinox(configuration);
try {
@@ -632,7 +632,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle11() {
// test extra packages property
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle11"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "test.pkg1, test.pkg2"); //$NON-NLS-1$
Equinox equinox = new Equinox(configuration);
@@ -672,7 +672,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle12() {
// Test stop FrameworkEvent
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle12"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
@@ -710,7 +710,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle13() {
// create/install/start/stop clean test
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle13"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -757,7 +757,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
// initialize the framework again to the same configuration
- configuration = new Properties();
+ configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
equinox = new Equinox(configuration);
try {
@@ -783,7 +783,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.RESOLVED, equinox.getState()); //$NON-NLS-1$
// initialize the framework again to the same configuration but use clean option
- configuration = new Properties();
+ configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_STORAGE_CLEAN, Constants.FRAMEWORK_STORAGE_CLEAN_ONFIRSTINIT);
equinox = new Equinox(configuration);
@@ -812,7 +812,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle14() {
// Test startlevel property
File config = OSGiTestsActivator.getContext().getDataFile("testSystemBundle14"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, "10"); //$NON-NLS-1$
Equinox equinox = new Equinox(configuration);
@@ -847,7 +847,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle16() {
// test parent boot
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_BOOT);
checkParentClassLoader(configuration);
@@ -856,7 +856,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle17() {
// test parent app
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_APP);
checkParentClassLoader(configuration);
@@ -865,7 +865,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle18() {
// test parent ext
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_EXT);
checkParentClassLoader(configuration);
@@ -874,13 +874,13 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testSystemBundle19() {
// test parent framework
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_BUNDLE_PARENT, Constants.FRAMEWORK_BUNDLE_PARENT_FRAMEWORK);
checkParentClassLoader(configuration);
}
- private void checkParentClassLoader(Properties configuration) {
+ private void checkParentClassLoader(Map<String, Object> configuration) {
Equinox equinox = new Equinox(configuration);
try {
equinox.init();
@@ -900,7 +900,7 @@ public class SystemBundleTests extends AbstractBundleTests {
try {
Class activatorClazz = test.loadClass("substitutes.x.Ax"); //$NON-NLS-1$
ClassLoader parentCL = activatorClazz.getClassLoader().getParent();
- String configParent = configuration.getProperty(Constants.FRAMEWORK_BUNDLE_PARENT);
+ String configParent = (String) configuration.get(Constants.FRAMEWORK_BUNDLE_PARENT);
if (Constants.FRAMEWORK_BUNDLE_PARENT_APP.equals(configParent))
assertTrue("Wrong parent", parentCL == ClassLoader.getSystemClassLoader()); //$NON-NLS-1$
else if (Constants.FRAMEWORK_BUNDLE_PARENT_EXT.equals(configParent))
@@ -937,7 +937,7 @@ public class SystemBundleTests extends AbstractBundleTests {
private void doMRUBundleFileList(int limit) {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.bundlefile.limit", Integer.toString(limit)); //$NON-NLS-1$//$NON-NLS-2$
@@ -1054,7 +1054,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testURLExternalFormat01() {
// create multiple instances test
File config1 = OSGiTestsActivator.getContext().getDataFile("testURLExternalFormat01_1"); //$NON-NLS-1$
- Properties configuration1 = new Properties();
+ Map<String, Object> configuration1 = new HashMap<String, Object>();
configuration1.put(Constants.FRAMEWORK_STORAGE, config1.getAbsolutePath());
Equinox equinox1 = new Equinox(configuration1);
try {
@@ -1066,7 +1066,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.STARTING, equinox1.getState()); //$NON-NLS-1$
File config2 = OSGiTestsActivator.getContext().getDataFile("testURLExternalFormat01_2"); //$NON-NLS-1$
- Properties configuration2 = new Properties();
+ Map<String, Object> configuration2 = new HashMap<String, Object>();
configuration2.put(Constants.FRAMEWORK_STORAGE, config2.getAbsolutePath());
Equinox equinox2 = new Equinox(configuration2);
try {
@@ -1155,7 +1155,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testURLMultiplexing01() throws BundleException {
// create multiple instances of Equinox to test
File config1 = OSGiTestsActivator.getContext().getDataFile(getName() + "_1");
- Properties configuration1 = new Properties();
+ Map<String, Object> configuration1 = new HashMap<String, Object>();
configuration1.put(Constants.FRAMEWORK_STORAGE, config1.getAbsolutePath());
Equinox equinox1 = new Equinox(configuration1);
try {
@@ -1167,7 +1167,7 @@ public class SystemBundleTests extends AbstractBundleTests {
assertEquals("Wrong state for SystemBundle", Bundle.ACTIVE, equinox1.getState()); //$NON-NLS-1$
File config2 = OSGiTestsActivator.getContext().getDataFile(getName() + "_2"); //$NON-NLS-1$
- Properties configuration2 = new Properties();
+ Map<String, Object> configuration2 = new HashMap<String, Object>();
configuration2.put(Constants.FRAMEWORK_STORAGE, config2.getAbsolutePath());
Equinox equinox2 = new Equinox(configuration2);
try {
@@ -1346,7 +1346,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testBug304213() {
// test installing bundle with empty manifest
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
@@ -1431,7 +1431,7 @@ public class SystemBundleTests extends AbstractBundleTests {
try {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put("osgi.dev", "../devCP");
Equinox equinox = new Equinox(configuration);
@@ -1475,7 +1475,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testBug352275() {
// simple test to create an embedded framework
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, "");
Equinox equinox = new Equinox(configuration);
@@ -1512,7 +1512,7 @@ public class SystemBundleTests extends AbstractBundleTests {
public void testWeavingPersistence() {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
Equinox equinox = new Equinox(configuration);
try {
@@ -1655,7 +1655,7 @@ public class SystemBundleTests extends AbstractBundleTests {
private void doTestBug351519Refresh(Boolean refreshDuplicates) {
// Create a framework with equinox.refresh.duplicate.bsn=false configuration
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
if (refreshDuplicates != null)
configuration.put("equinox.refresh.duplicate.bsn", refreshDuplicates.toString());
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
index c03037c..9fed1b2 100644
--- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
+++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
@@ -96,7 +96,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager01() {
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -132,7 +132,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager02() throws BundleException {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager02"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -183,7 +183,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager03() throws BundleException {
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager03"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -252,7 +252,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager04() throws BundleException {
File config = OSGiTestsActivator.getContext().getDataFile("testEnableSecurityManager04"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -322,7 +322,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testEnableSecurityManager05() throws BundleException {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -372,7 +372,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testLocalization01() throws BundleException {
// create/start/stop/start/stop test
File config = OSGiTestsActivator.getContext().getDataFile("testLocalization01"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -429,7 +429,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testBug254600() {
File config = OSGiTestsActivator.getContext().getDataFile("testBug254600"); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -516,7 +516,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testBug287750() {
File config = OSGiTestsActivator.getContext().getDataFile(getName());
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);
@@ -575,7 +575,7 @@ public class SecurityManagerTests extends AbstractBundleTests {
public void testBug367614() {
File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
- Properties configuration = new Properties();
+ Map<String, Object> configuration = new HashMap<String, Object>();
configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
configuration.put(Constants.FRAMEWORK_SECURITY, Framework.SECURITY_OSGI);
Equinox equinox = new Equinox(configuration);