Allow to set INI values in session tests

The JUnit 3 ConfigurationSessionTestSuite allows to set/change INI
values for the configuration of an execution session. This capability is
currently missing in the JUnit 5 SessionTestExection and the respective
CustomSessionConfiguration. This change adds it.

Author: HeikoKlare

runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/session/CustomSessionConfiguration.java

@@ -72,4 +72,15 @@ public interface CustomSessionConfiguration extends SessionCustomization {
 	 */
 	public CustomSessionConfiguration setReadOnly();
 
+	/**
+	 * Sets the given config value for the application configuration via the ini. If
+	 * the value is null, the key will be removed from the ini.
+	 *
+	 * @param key   the key to define
+	 * @param value the value to set to the key or {@code null} to remove the key
+	 *
+	 * @return this
+	 */
+	public CustomSessionConfiguration setConfigIniValue(String key, String value);
+
 }

runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/session/RemoteTestExecutor.java

@@ -66,7 +66,7 @@ void executeRemotely(String testClass, String testMethod, boolean shouldFail) th
 				throw new CoreException(status);
 			}
 			if (!collector.didTestFinish()) {
-				throw new Exception("session test did not run: " + descriptor);
+				throw new Exception("session test did not run: " + descriptor + "\n" + collector.stackTrace);
 			}
 			if (!collector.wasTestSuccessful()) {
 				throw collector.getError();

runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/session/customization/CustomSessionConfigurationDummy.java

@@ -63,4 +63,9 @@ public CustomSessionConfiguration addBundle(Bundle bundle) {
 		return this;
 	}
 
+	@Override
+	public CustomSessionConfiguration setConfigIniValue(String key, String value) {
+		return this;
+	}
+
 }

runtime/tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/session/customization/CustomSessionConfigurationImpl.java

@@ -20,7 +20,9 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Properties;
@@ -50,6 +52,7 @@ public class CustomSessionConfigurationImpl implements CustomSessionConfiguratio
 
 	private final Collection<BundleReference> bundleReferences = new LinkedHashSet<>();
 	private Path configurationDirectory;
+	private final Map<String, String> configIniValues = new HashMap<>();
 	private boolean readOnly = false;
 	private boolean cascaded = false;
 	private boolean firstExecutedSession = true;
@@ -141,6 +144,16 @@ public CustomSessionConfiguration setReadOnly() {
 		return this;
 	}
 
+	@Override
+	public CustomSessionConfiguration setConfigIniValue(String key, String value) {
+		if (value == null) {
+			configIniValues.remove(key);
+		} else {
+			configIniValues.put(key, value);
+		}
+		return this;
+	}
+
 	@Override
 	public CustomSessionConfiguration setConfigurationDirectory(Path configurationDirectory) {
 		Objects.requireNonNull(configurationDirectory);
@@ -212,6 +225,9 @@ private void createOrRefreshConfigIni() throws IOException {
 			contents.put(PROP_SHARED_CONFIG_AREA, Platform.getConfigurationLocation().getURL().toExternalForm());
 		}
 		contents.put(PROP_CONFIG_AREA_READ_ONLY, Boolean.valueOf(readOnly).toString());
+		for (Map.Entry<String, String> entry : configIniValues.entrySet()) {
+			contents.put(entry.getKey(), entry.getValue());
+		}
 		// save the properties
 		Path configINI = getConfigurationDirectory().resolve("config.ini");
 		try (OutputStream out = Files.newOutputStream(configINI)) {