Bug 78166 - [performance test] console
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
index 99101ff..658556e 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/AbstractDebugTest.java
@@ -345,8 +345,20 @@
* @return thread in which the first suspend event occurs
*/
protected IJavaThread resume(IJavaThread thread) throws Exception {
+ return resume(thread, DEFAULT_TIMEOUT);
+ }
+
+ /**
+ * Resumes the given thread, and waits for another breakpoint-caused suspend event.
+ * Returns the thread in which the suspend event occurs.
+ *
+ * @param thread thread to resume
+ * @param timeout timeout in ms
+ * @return thread in which the first suspend event occurs
+ */
+ protected IJavaThread resume(IJavaThread thread, int timeout) throws Exception {
DebugEventWaiter waiter= new DebugElementKindEventDetailWaiter(DebugEvent.SUSPEND, IJavaThread.class, DebugEvent.BREAKPOINT);
- waiter.setTimeout(DEFAULT_TIMEOUT);
+ waiter.setTimeout(timeout);
thread.resume();
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java
index 91ac941..668d38a 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/PerformanceSuite.java
@@ -14,6 +14,7 @@
import junit.framework.TestSuite;
import org.eclipse.jdt.debug.tests.performance.PerfConditionalBreakpointsTests;
+import org.eclipse.jdt.debug.tests.performance.PerfConsoleTests;
import org.eclipse.jdt.debug.tests.performance.PerfSteppingTests;
/**
@@ -36,7 +37,8 @@
addTest(new TestSuite(ProjectCreationDecorator.class));
addTest(new TestSuite(PerfConditionalBreakpointsTests.class));
- addTest(new TestSuite(PerfSteppingTests.class));
+ addTest(new TestSuite(PerfSteppingTests.class));
+ addTest(new TestSuite(PerfConsoleTests.class));
}
}
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
index 8a37a07..040c702 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ProjectCreationDecorator.java
@@ -122,6 +122,7 @@
createLaunchConfiguration("WatchItemTests");
createLaunchConfiguration("ArrayTests");
createLaunchConfiguration("PerfLoop");
+ createLaunchConfiguration("Console80Chars");
}
/**
