From 1db10dd770964dc197f682445bae76f2a1f20556 Mon Sep 17 00:00:00 2001
From: Thomas Watson
Date: Thu, 7 Aug 2014 13:04:25 -0500
Subject: Bug 441377 - Add testcase for null configuration value

Change-Id: If3a26c28dd2e9be6e2b61450cbbe8204f65e3ece
---
 .../eclipse/osgi/tests/bundles/SystemBundleTests.java   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

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 60e2c7792..ae0d40d2b 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
@@ -2189,6 +2189,23 @@ public class SystemBundleTests extends AbstractBundleTests {
 		}
 	}
 
+	static final String nullTest = "null.test";
+
+	public void testNullConfigurationValue() throws BundleException {
+		System.setProperty(nullTest, "system");
+		File config = OSGiTestsActivator.getContext().getDataFile(getName()); //$NON-NLS-1$
+		Map<String, Object> configuration = new HashMap<String, Object>();
+		configuration.put(Constants.FRAMEWORK_STORAGE, config.getAbsolutePath());
+		configuration.put(nullTest, null);
+		Equinox equinox = new Equinox(configuration);
+		equinox.start();
+		String nullValue = equinox.getBundleContext().getProperty(nullTest);
+		assertNull(nullTest + " is not null: " + nullValue, nullValue);
+		String systemNullValue = System.getProperty(nullTest);
+		assertEquals("Wrong system null value.", "system", systemNullValue);
+		equinox.stop();
+	}
+
 	private static File[] createBundles(File outputDir, int bundleCount) throws IOException {
 		outputDir.mkdirs();
 
-- 
cgit v1.2.3