condition, long timeout) throw
Thread.sleep(5);
}
}
- return condition.get();
+ return nonNullCondition.get();
}
/**
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java
index 0ac6bd73dd1..6d748a35401 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/breakpoint/SerialExecutorTest.java
@@ -23,7 +23,6 @@
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.debug.internal.ui.model.elements.SerialExecutor;
import org.eclipse.debug.tests.AbstractDebugTest;
-import org.junit.Ignore;
import org.junit.Test;
@SuppressWarnings("restriction")
@@ -118,7 +117,6 @@ public void testSchedulingQueue() throws InterruptedException {
}
@Test
- @Ignore("See https://bugs.eclipse.org/bugs/show_bug.cgi?id=574883")
public void testHeavyScheduling() throws InterruptedException {
// Executor has to execute every task. Even when they are scheduled fast
// and execute fast
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java
index f2b58e55d93..62b1ecfbd5a 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ConsoleDocumentAdapterTests.java
@@ -939,7 +939,8 @@ public void testChangeDocument() {
/**
* Test if invalid arguments produces error log messages.
*/
- public void _testInvalidInvocations() {
+ @Test
+ public void testInvalidInvocations() {
final AtomicInteger expectedErrors = new AtomicInteger(0);
final ILogListener logListener = new ILogListener() {
@Override
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/MockProcess.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/MockProcess.java
index c615cb40b7d..14be9f3fab1 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/MockProcess.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/MockProcess.java
@@ -53,7 +53,7 @@ public class MockProcess extends Process {
* Store number of bytes received which are not buffered anymore (i.e. those
* input was already passed through {@link #getReceivedInput()}).
*/
- private AtomicInteger receivedInput = new AtomicInteger(0);
+ private final AtomicInteger receivedInput = new AtomicInteger(0);
/**
* The time (in epoch milliseconds) when the mockup process terminates.
*
@@ -85,7 +85,7 @@ public static enum ProcessState {
*/
LASTREAD('L'), TERMINATED(-1);
- private int code;
+ private final int code;
ProcessState(int c) {
this.code = c;
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java
index a1c6beb2cda..9bc20c1b688 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/console/ProcessConsoleTests.java
@@ -244,7 +244,7 @@ public void testProcessTerminationNotificationWithInputFile() throws Exception {
assertTrue("Failed to prepare input file.", fileCreated);
try {
ILaunchConfigurationType launchType = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(LaunchConfigurationTests.ID_TEST_LAUNCH_TYPE);
- ILaunchConfigurationWorkingCopy launchConfiguration = launchType.newInstance(null, "testProcessTerminationNotificationWithInputFromFile");
+ ILaunchConfigurationWorkingCopy launchConfiguration = launchType.newInstance(null, name.getMethodName());
launchConfiguration.setAttribute(IDebugUIConstants.ATTR_CAPTURE_STDIN_FILE, inFile.getAbsolutePath());
TestUtil.log(IStatus.INFO, name.getMethodName(), "Process terminates after Console is initialized.");
processTerminationTest(launchConfiguration, false);
@@ -267,7 +267,7 @@ public void testProcessTerminationNotificationWithInputFile() throws Exception {
public void processTerminationTest(ILaunchConfiguration launchConfig, boolean terminateBeforeConsoleInitialization) throws Exception {
final AtomicBoolean terminationSignaled = new AtomicBoolean(false);
final Process mockProcess = new MockProcess(null, null, terminateBeforeConsoleInitialization ? 0 : -1);
- final IProcess process = DebugPlugin.newProcess(new Launch(launchConfig, ILaunchManager.RUN_MODE, null), mockProcess, "testProcessTerminationNotification");
+ final IProcess process = DebugPlugin.newProcess(new Launch(launchConfig, ILaunchManager.RUN_MODE, null), mockProcess, name.getMethodName());
@SuppressWarnings("restriction")
final org.eclipse.debug.internal.ui.views.console.ProcessConsole console = new org.eclipse.debug.internal.ui.views.console.ProcessConsole(process, new ConsoleColorProvider());
console.addPropertyChangeListener(event -> {
@@ -281,8 +281,7 @@ public void processTerminationTest(ILaunchConfiguration launchConfig, boolean te
if (mockProcess.isAlive()) {
mockProcess.destroy();
}
- TestUtil.waitForJobs(name.getMethodName(), 50, 10000);
- assertTrue("No console complete notification received.", terminationSignaled.get());
+ waitWhile(__ -> !terminationSignaled.get(), 10_000, __ -> "No console complete notification received.");
} finally {
consoleManager.removeConsoles(new IConsole[] { console });
TestUtil.waitForJobs(name.getMethodName(), 0, 10000);
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
index 5b11e558c18..6944a4fb587 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/AbstractLaunchTest.java
@@ -49,20 +49,20 @@ protected LaunchConfigurationManager getLaunchConfigurationManager() {
/**
* Returns a launch configuration with the given name, creating one if required.
*
- * @param name configuration name
+ * @param configurationName configuration name
* @return launch configuration
* @throws CoreException
*/
- protected ILaunchConfiguration getLaunchConfiguration(String name) throws CoreException {
+ protected ILaunchConfiguration getLaunchConfiguration(String configurationName) throws CoreException {
ILaunchManager manager = getLaunchManager();
ILaunchConfiguration[] configurations = manager.getLaunchConfigurations();
for (ILaunchConfiguration config : configurations) {
- if (config.getName().equals(name)) {
+ if (config.getName().equals(configurationName)) {
return config;
}
}
ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(LaunchConfigurationTests.ID_TEST_LAUNCH_TYPE);
- ILaunchConfigurationWorkingCopy wc = type.newInstance(null, name);
+ ILaunchConfigurationWorkingCopy wc = type.newInstance(null, configurationName);
ILaunchConfiguration saved = wc.doSave();
return saved;
}
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java
index f00b2e4b84b..fa75358794e 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/ArgumentParsingTests.java
@@ -110,8 +110,8 @@ private static void runCommandLine(String commandLine, String[] arguments) throw
private static ArrayList runCommandLine(String[] execArgs)
throws CoreException, IOException {
- execArgs = quoteWindowsArgs(execArgs);
- Process process = DebugPlugin.exec(execArgs, null);
+ String[] systemDependentExecArgs = quoteWindowsArgs(execArgs);
+ Process process = DebugPlugin.exec(systemDependentExecArgs, null);
BufferedReader procOut = new BufferedReader(new InputStreamReader(process.getInputStream()));
ArrayList procArgs = new ArrayList<>();
@@ -124,14 +124,15 @@ private static ArrayList runCommandLine(String[] execArgs)
private static String[] quoteWindowsArgs(String[] cmdLine) {
// see https://bugs.eclipse.org/387504#c13 , workaround for http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6511002
+ String[] systemDependentCmdLine = cmdLine;
if (Platform.getOS().equals(Constants.OS_WIN32)) {
String[] winCmdLine = new String[cmdLine.length];
for (int i = 0; i < cmdLine.length; i++) {
winCmdLine[i] = winQuote(cmdLine[i]);
}
- cmdLine = winCmdLine;
+ systemDependentCmdLine = winCmdLine;
}
- return cmdLine;
+ return systemDependentCmdLine;
}
@@ -155,9 +156,7 @@ private static String winQuote(String s) {
if (! needsQuoting(s)) {
return s;
}
- s = s.replaceAll("([\\\\]*)\"", "$1$1\\\\\""); //$NON-NLS-1$ //$NON-NLS-2$
- s = s.replaceAll("([\\\\]*)\\z", "$1$1"); //$NON-NLS-1$ //$NON-NLS-2$
- return "\"" + s + "\""; //$NON-NLS-1$ //$NON-NLS-2$
+ return "\"" + s.replaceAll("([\\\\]*)\"", "$1$1\\\\\"").replaceAll("([\\\\]*)\\z", "$1$1") + "\"";
}
// -- tests:
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
index 01396b3d46c..8e787b9d66a 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchConfigurationTests.java
@@ -33,6 +33,7 @@
import java.nio.charset.CodingErrorAction;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -238,11 +239,11 @@ protected IProject getProject() throws CoreException {
* - Boolean1 = true
* - Boolean2 = false
*/
- protected ILaunchConfigurationWorkingCopy newConfiguration(IContainer container, String name) throws CoreException {
+ protected ILaunchConfigurationWorkingCopy newConfiguration(IContainer container, String configurationName) throws CoreException {
ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(ID_TEST_LAUNCH_TYPE);
assertTrue("Should support debug mode", type.supportsMode(ILaunchManager.DEBUG_MODE)); //$NON-NLS-1$
assertTrue("Should support run mode", type.supportsMode(ILaunchManager.RUN_MODE)); //$NON-NLS-1$
- ILaunchConfigurationWorkingCopy wc = type.newInstance(container, name);
+ ILaunchConfigurationWorkingCopy wc = type.newInstance(container, configurationName);
wc.setAttribute("String1", "String1"); //$NON-NLS-1$ //$NON-NLS-2$
wc.setAttribute("Int1", 1); //$NON-NLS-1$
wc.setAttribute("Boolean1", true); //$NON-NLS-1$
@@ -255,9 +256,9 @@ protected ILaunchConfigurationWorkingCopy newConfiguration(IContainer container,
* Creates and returns a new launch configuration with the given name, local
* or shared, with no attributes
*/
- protected ILaunchConfigurationWorkingCopy newEmptyConfiguration(IContainer container, String name) throws CoreException {
+ protected ILaunchConfigurationWorkingCopy newEmptyConfiguration(IContainer container, String configurationName) throws CoreException {
ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(ID_TEST_LAUNCH_TYPE);
- ILaunchConfigurationWorkingCopy wc = type.newInstance(container, name);
+ ILaunchConfigurationWorkingCopy wc = type.newInstance(container, configurationName);
assertEquals("Should have no attributes", 0, wc.getAttributes().size()); //$NON-NLS-1$
return wc;
}
@@ -270,11 +271,11 @@ protected ILaunchConfigurationWorkingCopy newEmptyConfiguration(IContainer conta
* - Boolean1 = true
* - Boolean2 = false
*/
- protected ILaunchConfigurationWorkingCopy newPrototype(IContainer container, String name) throws CoreException {
+ protected ILaunchConfigurationWorkingCopy newPrototype(IContainer container, String configurationName) throws CoreException {
ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(ID_TEST_LAUNCH_TYPE);
assertTrue("Should support debug mode", type.supportsMode(ILaunchManager.DEBUG_MODE)); //$NON-NLS-1$
assertTrue("Should support run mode", type.supportsMode(ILaunchManager.RUN_MODE)); //$NON-NLS-1$
- ILaunchConfigurationWorkingCopy wc = type.newPrototypeInstance(container, name);
+ ILaunchConfigurationWorkingCopy wc = type.newPrototypeInstance(container, configurationName);
wc.setAttribute("String1", "String1"); //$NON-NLS-1$ //$NON-NLS-2$
wc.setAttribute("Int1", 1); //$NON-NLS-1$
wc.setAttribute("Boolean1", true); //$NON-NLS-1$
@@ -287,9 +288,9 @@ protected ILaunchConfigurationWorkingCopy newPrototype(IContainer container, Str
* Creates and returns a new launch configuration prototype with the given name, local
* or shared, with no attributes
*/
- protected ILaunchConfigurationWorkingCopy newEmptyPrototype(IContainer container, String name) throws CoreException {
+ protected ILaunchConfigurationWorkingCopy newEmptyPrototype(IContainer container, String configurationName) throws CoreException {
ILaunchConfigurationType type = getLaunchManager().getLaunchConfigurationType(ID_TEST_LAUNCH_TYPE);
- ILaunchConfigurationWorkingCopy wc = type.newPrototypeInstance(container, name);
+ ILaunchConfigurationWorkingCopy wc = type.newPrototypeInstance(container, configurationName);
assertEquals("Should have no attributes", 0, wc.getAttributes().size()); //$NON-NLS-1$
return wc;
}
@@ -514,9 +515,9 @@ public void testDoubleSave() throws CoreException {
ILaunchConfiguration[] configs = getLaunchManager().getLaunchConfigurations();
assertTrue("Configuration should exist in project index", existsIn(configs, handle)); //$NON-NLS-1$
- String name = wc.getName();
+ String configurationName = wc.getName();
wc.rename("newName"); //$NON-NLS-1$
- wc.rename(name);
+ wc.rename(configurationName);
assertTrue("Should be dirty", wc.isDirty()); //$NON-NLS-1$
wc.doSave();
@@ -1340,8 +1341,7 @@ public void testLaunchTimeStamp() throws CoreException {
@Test
public void testTerminateTimeStamp() throws Exception {
ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "test-time-stamp"); //$NON-NLS-1$
- ILaunch launch = workingCopy.launch(ILaunchManager.DEBUG_MODE, null);
- AtomicBoolean launchTerminated = new AtomicBoolean();
+ Set terminatedLaunches = Collections.synchronizedSet(new HashSet<>());
ILaunchesListener2 listener = new ILaunchesListener2() {
@Override
public void launchesRemoved(ILaunch[] launches) {
@@ -1357,22 +1357,22 @@ public void launchesAdded(ILaunch[] launches) {
@Override
public void launchesTerminated(ILaunch[] launches) {
- for (ILaunch l : launches) {
- if (l == launch) {
- launchTerminated.set(true);
- }
- }
+ terminatedLaunches.addAll(Arrays.asList(launches));
}
};
DebugPlugin.getDefault().getLaunchManager().addLaunchListener(listener);
+ final ILaunch launch = workingCopy.launch(ILaunchManager.DEBUG_MODE, null);
IProcess process = null;
try {
process = DebugPlugin.newProcess(launch, new MockProcess(0), "test-terminate-timestamp");
- waitWhile(c -> !launchTerminated.get(), testTimeout, c -> "Launch did not finished");
- String stamp = launch.getAttribute(DebugPlugin.ATTR_TERMINATE_TIMESTAMP);
- assertNotNull("missing time stamp", stamp); //$NON-NLS-1$
- long lstamp = Long.parseLong(stamp); // should be a long - will throw NumberFormatException if not
- assertTrue("Time travel launch", lstamp <= System.currentTimeMillis());
+ waitWhile(__ -> !terminatedLaunches.contains(launch), testTimeout,
+ __ -> "Launch termination event did not occur: "+
+ "launch termination state is \"" + launch.isTerminated() + "\" " +
+ "and " + terminatedLaunches.size() + " launches have terminated");
+ String launchTerminateTimestampUntyped = launch.getAttribute(DebugPlugin.ATTR_TERMINATE_TIMESTAMP);
+ assertNotNull("Time stamp is missing", launchTerminateTimestampUntyped);
+ long launchTerminateTimestamp = Long.parseLong(launchTerminateTimestampUntyped);
+ assertTrue("Launch time is before current time", launchTerminateTimestamp <= System.currentTimeMillis());
} finally {
DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(listener);
if (launch != null) {
@@ -1384,6 +1384,72 @@ public void launchesTerminated(ILaunch[] launches) {
}
}
+ /**
+ * Tests that a launch is properly registered for notifications before a
+ * process is spawned and may already propagate a termination event.
+ *
+ * @see https://github.com/eclipse-platform/eclipse.platform/issues/598
+ */
+ @Test
+ public void testTerminateLaunchListener_Issue598() throws Exception {
+ final ILaunchConfigurationWorkingCopy workingCopy = newConfiguration(null, "test-launch-listener");
+ final AtomicBoolean processStarted = new AtomicBoolean(false);
+ final AtomicBoolean launchTerminated = new AtomicBoolean(false);
+ ILaunchesListener2 listener = new ILaunchesListener2() {
+ @Override
+ public void launchesRemoved(ILaunch[] launches) {
+ }
+
+ @Override
+ public void launchesChanged(ILaunch[] launches) {
+ }
+
+ @Override
+ public void launchesAdded(ILaunch[] launches) {
+ }
+
+ @Override
+ public void launchesTerminated(ILaunch[] launches) {
+ launchTerminated.set(true);
+ }
+ };
+ DebugPlugin.getDefault().getLaunchManager().addLaunchListener(listener);
+
+ MockProcess mockProcess = new MockProcess(0) {
+ @Override
+ public int waitFor() throws InterruptedException {
+ processStarted.set(true);
+ return super.waitFor();
+ }
+ };
+ ILaunch launch = new Launch(workingCopy, ILaunchManager.DEBUG_MODE, null) {
+ @Override
+ public void addProcess(IProcess process) {
+ long msecToWaitForProcessToStart = 500;
+ long startTimeMsec = System.currentTimeMillis();
+ while (System.currentTimeMillis() - startTimeMsec < msecToWaitForProcessToStart) {
+ assertFalse("Process started before registering launch for notifications", processStarted.get());
+ }
+ super.addProcess(process);
+ }
+ };
+ DebugPlugin.getDefault().getLaunchManager().addLaunch(launch);
+
+ IProcess runtimeProcess = null;
+ try {
+ runtimeProcess = DebugPlugin.newProcess(launch, mockProcess, "test-terminate-launch-listener");
+ waitWhile(__ -> !launchTerminated.get(), testTimeout, __ -> "Launch termination event did not occur");
+ } finally {
+ DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(listener);
+ if (launch != null) {
+ getLaunchManager().removeLaunch(launch);
+ }
+ if (runtimeProcess != null) {
+ runtimeProcess.terminate();
+ }
+ }
+ }
+
/**
* Tests that attributes in a nested map are persisted in alphabetical
* order.
@@ -1767,6 +1833,8 @@ public void testNullLaunchConfigurationInLaunch() throws Exception {
}
// no NPE should be logged
lm.addLaunch(l);
+ // Clean up by removing launch again
+ lm.removeLaunch(l);
}
/**
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
index 74ed4a95fda..99dcd14ac53 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchGroupTests.java
@@ -62,7 +62,7 @@ public class LaunchGroupTests extends AbstractLaunchTest {
private final AtomicInteger launchCount = new AtomicInteger(0);
private ILaunchConfiguration lcToCount = null;
- private ILaunchListener lcListener = new ILaunchListener() {
+ private final ILaunchListener lcListener = new ILaunchListener() {
@Override
public void launchRemoved(ILaunch launch) {
}
@@ -475,7 +475,7 @@ public void write(String s) {
private static final class DummyAttachListener implements ILaunchListener {
- private ILaunchConfiguration cfg;
+ private final ILaunchConfiguration cfg;
private DummyStream stream;
public DummyAttachListener(ILaunchConfiguration cfg) {
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java
index 0b2bc004554..265e731cef8 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchManagerTests.java
@@ -17,7 +17,6 @@
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThrows;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import org.eclipse.core.runtime.CoreException;
@@ -49,9 +48,9 @@ public class LaunchManagerTests extends AbstractLaunchTest {
*/
@Test
public void testGenereateConfigName() {
- String configname = "launch_configuration"; //$NON-NLS-1$
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertTrue("the name nust be '" + configname + "'", name.equals(configname)); //$NON-NLS-1$ //$NON-NLS-2$
+ String originalName = "launch_configuration";
+ String generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", originalName, generatedName);
}
/**
@@ -60,9 +59,9 @@ public void testGenereateConfigName() {
*/
@Test
public void testGenereateConfigNameBadChar() {
- String configname = "config:name"; //$NON-NLS-1$
- String name = getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configname);
- assertEquals("config name should be '" + configname + "'", configname, name); //$NON-NLS-1$ //$NON-NLS-2$
+ String originalName = "config:name";
+ String generatedName = getLaunchManager().generateUniqueLaunchConfigurationNameFrom(originalName);
+ assertEquals("unexpected generated configuration name", originalName, generatedName);
}
/**
@@ -70,9 +69,9 @@ public void testGenereateConfigNameBadChar() {
*/
@Test
public void testGenerateValidName() {
- String configname = "thisisavalidname"; //$NON-NLS-1$
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("Should be the same as the seed", configname, name); //$NON-NLS-1$
+ String originalName = "thisisavalidname";
+ String generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", originalName, generatedName);
}
/**
@@ -82,9 +81,9 @@ public void testGenerateValidName() {
@Test
public void testGenerateConfigNameReservedName() {
if(Platform.OS_WIN32.equals(Platform.getOS())) {
- String configname = "aux"; //$NON-NLS-1$
- String name = getLaunchManager().generateUniqueLaunchConfigurationNameFrom(configname);
- assertEquals("config name should be 'aux'", configname, name); //$NON-NLS-1$
+ String originalName = "aux";
+ String generatedName = getLaunchManager().generateUniqueLaunchConfigurationNameFrom(originalName);
+ assertEquals("unexpected generated configuration name", originalName, generatedName);
}
}
@@ -93,9 +92,10 @@ public void testGenerateConfigNameReservedName() {
*/
@Test
public void testGenerateBadConfigName() {
- String configname = "config:name"; //$NON-NLS-1$
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("config name should be 'config_name'", "config_name", name); //$NON-NLS-1$ //$NON-NLS-2$
+ String originalName = "config:name";
+ String expectedName = "config_name";
+ String generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", expectedName, generatedName);
}
/**
@@ -105,9 +105,10 @@ public void testGenerateBadConfigName() {
@Test
public void testGenerateConflictingName() {
if(Platform.OS_WIN32.equals(Platform.getOS())) {
- String configname = "aux"; //$NON-NLS-1$
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("config name should be 'launch_configuration'", "launch_configuration", name); //$NON-NLS-1$ //$NON-NLS-2$
+ String originalName = "aux";
+ String expectedName = "launch_configuration";
+ String generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", expectedName, generatedName);
}
}
@@ -117,13 +118,15 @@ public void testGenerateConflictingName() {
*/
@Test
public void testGenerateBadCharConflict() throws Exception {
- String configname = "config:name"; //$NON-NLS-1$
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("config name should be 'config_name'", "config_name", name); //$NON-NLS-1$ //$NON-NLS-2$
- getLaunchConfiguration(name);
- name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("config name should be 'config_name (1)'", "config_name (1)", name); //$NON-NLS-1$ //$NON-NLS-2$
- ILaunchConfiguration config = getLaunchConfiguration("config_name"); //$NON-NLS-1$
+ String originalName = "config:name";
+ String expectedName = "config_name";
+ String generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", expectedName, generatedName);
+ getLaunchConfiguration(generatedName);
+ expectedName = "config_name (1)";
+ generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", expectedName, generatedName);
+ ILaunchConfiguration config = getLaunchConfiguration("config_name");
config.delete();
}
@@ -135,13 +138,15 @@ public void testGenerateBadCharConflict() throws Exception {
@Test
public void testGenerateBadNameConflict() throws Exception {
if(Platform.OS_WIN32.equals(Platform.getOS())) {
- String configname = "com2"; //$NON-NLS-1$
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("config name should be 'launch_configuration'", "launch_configuration", name); //$NON-NLS-1$ //$NON-NLS-2$
- getLaunchConfiguration(name);
- name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("config name should be 'launch_configuration (1)'", "launch_configuration (1)", name); //$NON-NLS-1$ //$NON-NLS-2$
- ILaunchConfiguration config = getLaunchConfiguration("launch_configuration"); //$NON-NLS-1$
+ String originalName = "com2";
+ String expectedName = "launch_configuration";
+ String generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", expectedName, generatedName);
+ getLaunchConfiguration(generatedName);
+ expectedName = "launch_configuration (1)";
+ generatedName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", expectedName, generatedName);
+ ILaunchConfiguration config = getLaunchConfiguration("launch_configuration");
config.delete();
}
}
@@ -205,18 +210,18 @@ public void testValidateConfigBadName() {
*/
@Test
public void testGenerateNameExistingConfig() throws Exception {
- String configname = "x.y.z.configname"; //$NON-NLS-1$
- getLaunchConfiguration(configname);
- String name = getLaunchManager().generateLaunchConfigurationName(configname);
- assertEquals("the configuration name should have been " + configname + " (1)", configname + " (1)", name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- getLaunchConfiguration(name);
- name = getLaunchManager().generateLaunchConfigurationName(name);
- assertEquals("the configuration name should have been " + configname + " (2)", configname + " (2)", name); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- ILaunchConfiguration config = getLaunchConfiguration(configname);
+ String originalName = "x.y.z.configname"; //$NON-NLS-1$
+ getLaunchConfiguration(originalName);
+ String generatedConfigurationName = getLaunchManager().generateLaunchConfigurationName(originalName);
+ assertEquals("unexpected generated configuration name", originalName + " (1)", generatedConfigurationName); //$NON-NLS-1$ //$NON-NLS-2$
+ getLaunchConfiguration(generatedConfigurationName);
+ generatedConfigurationName = getLaunchManager().generateLaunchConfigurationName(generatedConfigurationName);
+ assertEquals("unexpected generated configuration name", originalName + " (2)", generatedConfigurationName); //$NON-NLS-1$ //$NON-NLS-2$
+ ILaunchConfiguration config = getLaunchConfiguration(originalName);
if(config != null) {
config.delete();
}
- config = getLaunchConfiguration(configname + " (1)"); //$NON-NLS-1$
+ config = getLaunchConfiguration(originalName + " (1)"); //$NON-NLS-1$
if(config != null) {
config.delete();
}
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java
index 41534438325..6aecbb3deb9 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/launching/LaunchTests.java
@@ -54,8 +54,8 @@ public void setUp() throws Exception {
final Launch launch = new Launch(null, ILaunchManager.RUN_MODE, null);
handler = (proxy, method, args) -> {
- String name = method.getName();
- if (name.equals("equals")) { //$NON-NLS-1$
+ String methodName = method.getName();
+ if (methodName.equals("equals")) { //$NON-NLS-1$
return args.length == 1 && proxy == args[0];
}
return Boolean.TRUE;
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTestsMemoryBlock.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTestsMemoryBlock.java
index 28b125be5f3..307e57d5d85 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTestsMemoryBlock.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/view/memory/TableRenderingTestsMemoryBlock.java
@@ -28,8 +28,8 @@
*/
public class TableRenderingTestsMemoryBlock implements IMemoryBlockExtension {
- private int fAddressableSize;
- private byte[] fBytes;
+ private final int fAddressableSize;
+ private final byte[] fBytes;
public TableRenderingTestsMemoryBlock(byte[] bytes, int addressableSize) {
fBytes = bytes;
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java
index bcffbb94253..4099454ef83 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/CheckTests.java
@@ -18,6 +18,7 @@
import org.eclipse.debug.internal.ui.viewers.model.provisional.ModelDelta;
import org.eclipse.debug.tests.viewer.model.TestModel.TestElement;
import org.eclipse.jface.viewers.TreePath;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -74,35 +75,32 @@ public void testSimpleMultiLevel() throws Exception {
model.validateData(fViewer, TreePath.EMPTY);
}
- // TODO: no idea how to trigger a toggle event on an item
-// public void testCheckReceiver() {
-// // Initial setup
-// TestModel model = TestModel.simpleSingleLevel();
-// fViewer.setAutoExpandLevel(-1);
-// //TreeModelViewerAutopopulateAgent autopopulateAgent = new TreeModelViewerAutopopulateAgent(fViewer);
-// fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false);
-// fViewer.setInput(model.getRootElement());
-//
-// // Wait for the updates to complete and validate.
-// while (!fListener.isFinished()) if (!fDisplay.readAndDispatch ()) Thread.sleep(0);
-// model.validateData(fViewer, TreePath.EMPTY);
-//
-// InternalTreeModelViewer treeViewer = ((InternalTreeModelViewer)fViewer);
-// TreePath elementPath = model.findElement("1");
-// TestElement element = model.getElement(elementPath);
-// boolean initialCheckState = element.getChecked();
-// Event event = new Event();
-// event.item = treeViewer.findItem(elementPath);
-// event.detail = SWT.CHECK;
-// event.display = fDisplay;
-// event.type = SWT.Selection;
-// event.widget = treeViewer.getControl();
-// fDisplay.post(event);
-//
-// while (fDisplay.readAndDispatch ());
-//
-// Assert.assertTrue(element.getChecked() != initialCheckState);
-// }
+ @Test
+ public void testCheckReceiver() throws Exception {
+ // Initial setup
+ TestModel model = TestModel.simpleSingleLevel();
+ fViewer.setAutoExpandLevel(-1);
+ // TreeModelViewerAutopopulateAgent autopopulateAgent = new
+ // TreeModelViewerAutopopulateAgent(fViewer);
+ fListener.reset(TreePath.EMPTY, model.getRootElement(), -1, true, false);
+ fViewer.setInput(model.getRootElement());
+
+ waitWhile(t -> !fListener.isFinished(), createListenerErrorMessage());
+ model.validateData(fViewer, TreePath.EMPTY);
+
+ TestElement element = model.getRootElement().getChildren()[0];
+ boolean initialCheckState = element.getChecked();
+ TreePath elementPath = new TreePath(new Object[] { element });
+ ModelDelta delta = model.setElementChecked(elementPath, true, false);
+
+ fListener.reset(elementPath, element, -1, true, false);
+ model.postDelta(delta);
+
+ waitWhile(t -> !fListener.isFinished(ITestModelUpdatesListenerConstants.MODEL_CHANGED_COMPLETE), createListenerErrorMessage());
+
+ Assert.assertTrue(element.getChecked() != initialCheckState);
+ }
+
@Test
public void testUpdateCheck() throws Exception {
//TreeModelViewerAutopopulateAgent autopopulateAgent = new TreeModelViewerAutopopulateAgent(fViewer);
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java
index 0bd96f04fcc..6133a9620d8 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/ContentTests.java
@@ -100,7 +100,7 @@ static class TestModelWithCapturedUpdates extends TestModel {
boolean fCaptureLabelUpdates = false;
boolean fCaptureChildrenUpdates = false;
- List fCapturedUpdates = Collections.synchronizedList(new ArrayList());
+ List fCapturedUpdates = Collections.synchronizedList(new ArrayList<>());
@Override
public void update(IChildrenUpdate[] updates) {
@@ -161,7 +161,7 @@ public void testLabelUpdatesCompletedOutOfSequence1() throws Exception {
waitWhile(t -> model.fCapturedUpdates.size() < model.getRootElement().fChildren.length, createModelErrorMessage(model));
List firstUpdates = model.fCapturedUpdates;
- model.fCapturedUpdates = Collections.synchronizedList(new ArrayList(2));
+ model.fCapturedUpdates = Collections.synchronizedList(new ArrayList<>(2));
// // Change the model and run another update set.
model.getElement(model.findElement("1")).setLabelAppendix(" - changed"); //$NON-NLS-1$ //$NON-NLS-2$
@@ -216,7 +216,7 @@ public void testLabelUpdatesCompletedOutOfSequence2() throws Exception {
TestUtil.waitForJobs(name.getMethodName(), 300, 5000);
waitWhile(t -> model.fCapturedUpdates.size() < model.getRootElement().fChildren.length, createModelErrorMessage(model));
List firstUpdates = model.fCapturedUpdates;
- model.fCapturedUpdates = Collections.synchronizedList(new ArrayList(2));
+ model.fCapturedUpdates = Collections.synchronizedList(new ArrayList<>(2));
// Change the model and run another update set.
model.setElementChildren(TreePath.EMPTY, new TestElement[] {
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java
index cb4da5b0127..c3cf81ee802 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModel.java
@@ -178,7 +178,7 @@ private void installSubModelProxies(TreePath path, ModelDelta delta) {
private IModelSelectionPolicy fModelSelectionPolicy;
private boolean fQueueingUpdates = false;
private boolean fDelayUpdates = false;
- private List fQueuedUpdates = new LinkedList<>();
+ private final List fQueuedUpdates = new LinkedList<>();
/**
* Constructor private. Use static factory methods instead.
@@ -564,10 +564,9 @@ public ModelDelta replaceElementChild(TreePath parentPath, int index, TestElemen
}
public ModelDelta addElementChild(TreePath parentPath, ModelDelta rootDelta, int index, TestElement newChild) {
- if (rootDelta == null) {
- rootDelta = new ModelDelta(fInput, IModelDelta.NO_CHANGE);
- }
- ModelDelta baseDelta = getBaseDelta(rootDelta);
+ ModelDelta nonNullRootDelta = rootDelta != null ? rootDelta : new ModelDelta(fInput, IModelDelta.NO_CHANGE);
+
+ ModelDelta baseDelta = getBaseDelta(nonNullRootDelta);
TreePath relativePath = getRelativePath(parentPath);
// Find the parent element and generate the delta node for it.
@@ -581,7 +580,7 @@ public ModelDelta addElementChild(TreePath parentPath, ModelDelta rootDelta, int
delta.setChildCount(element.getChildren().length);
delta.addNode(newChild, index, IModelDelta.ADDED);
- return rootDelta;
+ return nonNullRootDelta;
}
public ModelDelta insertElementChild(TreePath parentPath, int index, TestElement newChild) {
@@ -589,10 +588,9 @@ public ModelDelta insertElementChild(TreePath parentPath, int index, TestElement
}
public ModelDelta insertElementChild(ModelDelta rootDelta, TreePath parentPath, int index, TestElement newChild) {
- if (rootDelta == null) {
- rootDelta = new ModelDelta(fInput, IModelDelta.NO_CHANGE);
- }
- ModelDelta baseDelta = getBaseDelta(rootDelta);
+ ModelDelta nonNullRootDelta = rootDelta != null ? rootDelta : new ModelDelta(fInput, IModelDelta.NO_CHANGE);
+
+ ModelDelta baseDelta = getBaseDelta(nonNullRootDelta);
TreePath relativePath = getRelativePath(parentPath);
// Find the parent element and generate the delta node for it.
@@ -606,7 +604,7 @@ public ModelDelta insertElementChild(ModelDelta rootDelta, TreePath parentPath,
delta.setChildCount(element.getChildren().length);
delta.addNode(newChild, index, IModelDelta.INSERTED);
- return rootDelta;
+ return nonNullRootDelta;
}
private TestElement[] doInsertElementInArray(TestElement[] children, int index, TestElement newChild) {
@@ -721,12 +719,12 @@ public static TestElement[] makeMultiLevelElements2(TestModel model, int[] level
}
int count = levelCounts[0];
int[] oldLevelCounts = levelCounts;
- levelCounts = new int[levelCounts.length - 1];
- System.arraycopy(oldLevelCounts, 1, levelCounts, 0, levelCounts.length);
+ int[] newlevelCounts = new int[levelCounts.length - 1];
+ System.arraycopy(oldLevelCounts, 1, newlevelCounts, 0, newlevelCounts.length);
TestElement[] elements = new TestElement[count];
for (int i = 0; i < count; i++) {
String name = prefix + i;
- elements[i] = new TestElement(model, name, makeMultiLevelElements2(model, levelCounts, name + ".")); //$NON-NLS-1$
+ elements[i] = new TestElement(model, name, makeMultiLevelElements2(model, newlevelCounts, name + ".")); //$NON-NLS-1$
}
return elements;
}
diff --git a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java
index 0e6bb13277a..3ef119cd0ab 100644
--- a/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java
+++ b/debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/viewer/model/TestModelUpdatesListener.java
@@ -57,30 +57,30 @@ public class TestModelUpdatesListener implements IViewerUpdateListener, ILabelUp
private boolean fFailOnRedundantUpdates;
private boolean fFailOnRedundantLabelUpdates;
- private Set fRedundantUpdates = new HashSet<>();
- private Set fRedundantLabelUpdates = new HashSet<>();
- private Set fRedundantHasChildrenUpdateExceptions = new HashSet<>();
- private Set fRedundantChildCountUpdateExceptions = new HashSet<>();
- private Set fRedundantChildrenUpdateExceptions = new HashSet<>();
- private Set fRedundantLabelUpdateExceptions = new HashSet<>();
+ private final Set fRedundantUpdates = new HashSet<>();
+ private final Set fRedundantLabelUpdates = new HashSet<>();
+ private final Set fRedundantHasChildrenUpdateExceptions = new HashSet<>();
+ private final Set fRedundantChildCountUpdateExceptions = new HashSet<>();
+ private final Set fRedundantChildrenUpdateExceptions = new HashSet<>();
+ private final Set fRedundantLabelUpdateExceptions = new HashSet<>();
private boolean fFailOnMultipleModelUpdateSequences;
private boolean fFailOnMultipleLabelUpdateSequences;
- private Set fHasChildrenUpdatesScheduled = new HashSet<>();
- private Set fHasChildrenUpdatesRunning = new HashSet<>();
- private Set fHasChildrenUpdatesCompleted = new HashSet<>();
- private Map> fChildrenUpdatesScheduled = new HashMap<>();
- private Set fChildrenUpdatesRunning = new HashSet<>();
- private Set fChildrenUpdatesCompleted = new HashSet<>();
- private Set fChildCountUpdatesScheduled = new HashSet<>();
- private Set fChildCountUpdatesRunning = new HashSet<>();
- private Set fChildCountUpdatesCompleted = new HashSet<>();
- private Set fLabelUpdates = new HashSet<>();
- private Set fLabelUpdatesRunning = new HashSet<>();
- private Set fLabelUpdatesCompleted = new HashSet<>();
- private Set fProxyModels = new HashSet<>();
- private Set fStateUpdates = new HashSet<>();
+ private final Set fHasChildrenUpdatesScheduled = new HashSet<>();
+ private final Set fHasChildrenUpdatesRunning = new HashSet<>();
+ private final Set fHasChildrenUpdatesCompleted = new HashSet<>();
+ private final Map> fChildrenUpdatesScheduled = new HashMap<>();
+ private final Set fChildrenUpdatesRunning = new HashSet<>();
+ private final Set fChildrenUpdatesCompleted = new HashSet<>();
+ private final Set fChildCountUpdatesScheduled = new HashSet<>();
+ private final Set fChildCountUpdatesRunning = new HashSet<>();
+ private final Set fChildCountUpdatesCompleted = new HashSet<>();
+ private final Set fLabelUpdates = new HashSet<>();
+ private final Set fLabelUpdatesRunning = new HashSet<>();
+ private final Set fLabelUpdatesCompleted = new HashSet<>();
+ private final Set fProxyModels = new HashSet<>();
+ private final Set fStateUpdates = new HashSet<>();
private int fViewerUpdatesStarted = 0;
private int fViewerUpdatesComplete = 0;
private int fViewerUpdatesStartedAtReset;
@@ -356,11 +356,12 @@ public Set getChildrenUpdatesCompleted() {
*/
private TreePath getViewerTreePath(IModelDelta node) {
ArrayList