Bug 256708 Accept null base in SimpleConfiguratorManipulator#saveConfiguration

2 files changed, 48 insertions, 0 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/AllTests.java
index e8ed347c3..a1ef60f86 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/AllTests.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/AllTests.java
@@ -20,6 +20,7 @@ public class AllTests extends TestCase {
 	public static Test suite() {
 		TestSuite suite = new TestSuite(AllTests.class.getName());
 		suite.addTestSuite(SimpleConfiguratorManipulatorUtilsTest.class);
+		suite.addTestSuite(SimpleConfiguratorManipulatorTests.class);
 		return suite;
 	}
 }
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java
new file mode 100644
index 000000000..4134ec067
--- /dev/null
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/manipulator/SimpleConfiguratorManipulatorTests.java
@@ -0,0 +1,47 @@
+/*******************************************************************************
+ * Copyright (c) 2008 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.equinox.p2.tests.simpleconfigurator.manipulator;
+
+import java.io.File;
+import java.net.URI;
+import org.eclipse.equinox.internal.provisional.frameworkadmin.BundleInfo;
+import org.eclipse.equinox.internal.provisional.simpleconfigurator.manipulator.SimpleConfiguratorManipulator;
+import org.eclipse.equinox.internal.simpleconfigurator.manipulator.SimpleConfiguratorManipulatorImpl;
+import org.eclipse.equinox.p2.tests.AbstractProvisioningTest;
+
+public class SimpleConfiguratorManipulatorTests extends AbstractProvisioningTest {
+
+	public void testSaveConfiguration() throws Exception {
+		File folder = getTestFolder("saveConfiguration");
+		File infoFile = new File(folder, "bundle.info");
+
+		//absolute location written with base
+		BundleInfo[] bundles = new BundleInfo[] {new BundleInfo(new File(folder, "plugins/a_1.0.0.jar").toURI())};
+		SimpleConfiguratorManipulator manipulator = new SimpleConfiguratorManipulatorImpl();
+		manipulator.saveConfiguration(bundles, infoFile, folder);
+		bundles = manipulator.loadConfiguration(infoFile.toURL(), new File("/"));
+		assertEquals(bundles[0].getLocation(), new File("/plugins/a_1.0.0.jar").toURI());
+
+		//relative location written with null base
+		bundles = new BundleInfo[] {new BundleInfo(new URI("plugins/b_1.0.0.jar"))};
+		manipulator.saveConfiguration(bundles, infoFile, null);
+		bundles = manipulator.loadConfiguration(infoFile.toURL(), new File("/"));
+		assertEquals(bundles[0].getLocation(), new File("/plugins/b_1.0.0.jar").toURI());
+
+		//absolute location written with null base
+		URI absolute = new File(folder, "plugins/c_1.0.0.jar").toURI();
+		bundles = new BundleInfo[] {new BundleInfo(absolute)};
+		manipulator.saveConfiguration(bundles, infoFile, null);
+		bundles = manipulator.loadConfiguration(infoFile.toURL(), new File("/"));
+		assertEquals(bundles[0].getLocation(), absolute);
+	}
+}