Bug 550345 - [Tests] testBug545769_UTF8OutOdd fails on Windows
Run test not in debug mode. It triggers to often a JVM bug on windows.
Change-Id: Ic9a524f01413085a8af7fd5974fd124419f06333
Signed-off-by: Paul Pazderski <paul-eclipse@ppazderski.de>
diff --git a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
index 3595694..6856ddc 100644
--- a/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.debug.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jdt.debug.tests; singleton:=true
-Bundle-Version: 3.11.600.qualifier
+Bundle-Version: 3.11.700.qualifier
Bundle-ClassPath: javadebugtests.jar
Bundle-Activator: org.eclipse.jdt.debug.testplugin.JavaTestPlugin
Bundle-Vendor: %providerName
diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index b0beb7b..20b629e 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -18,7 +18,7 @@
</parent>
<groupId>org.eclipse.jdt</groupId>
<artifactId>org.eclipse.jdt.debug.tests</artifactId>
- <version>3.11.600-SNAPSHOT</version>
+ <version>3.11.700-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
index 9b947e4..1f1bc1b 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/ConsoleTests.java
@@ -283,11 +283,12 @@
launchCopy.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, arg);
launchCopy.setAttribute(DebugPlugin.ATTR_CONSOLE_ENCODING, StandardCharsets.UTF_8.name());
- IJavaDebugTarget target = null;
+ ILaunch launch = null;
try {
- target = launchAndTerminate(launchCopy.doSave(), DEFAULT_TIMEOUT);
- final IProcess process = target.getProcess();
+ launch = launchCopy.launch(ILaunchManager.RUN_MODE, null);
+ final IProcess process = launch.getProcesses()[0];
assertNotNull("Missing VM process", process);
+ TestUtil.waitForJobs(getName(), 25, DEFAULT_TIMEOUT); // wait for console creation
final IConsole console = DebugUITools.getConsole(process);
assertNotNull("Missing console", console);
assertTrue("Console is not a TextConsole", console instanceof TextConsole);
@@ -304,9 +305,16 @@
}
assertEquals("Wrong number of characters in console.", expectedLength, consoleDocument.getLength());
} finally {
- terminateAndRemove(target);
debugPrefStore.setValue(IDebugPreferenceConstants.CONSOLE_LIMIT_CONSOLE_OUTPUT, true);
debugPrefStore.setValue(IDebugPreferenceConstants.CONSOLE_WRAP, false);
+ if (launch != null) {
+ if (launch.getProcesses() != null) {
+ for (IProcess process : launch.getProcesses()) {
+ process.terminate();
+ }
+ }
+ getLaunchManager().removeLaunch(launch);
+ }
}
}
}
