Bug 447983: [performance] Mac OS X: ScrollEditorTest must not pressI20141027-0800I20141026-2100

Ctrl+Arrow_Down/Up

1 files changed, 5 insertions, 5 deletions

diff --git a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java
index 83e8e8d6ff..564d24be42 100644
--- a/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java
+++ b/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/ScrollEditorTest.java
@@ -35,7 +35,7 @@ public abstract class ScrollEditorTest extends TextPerformanceTestCase {
 
 	private static final String LINE_SCROLLING_FILE= PerformanceTestSetup.TEXT_LAYOUT;
 
-	private static final int[] CTRL_HOME= new int[] { SWT.CTRL, SWT.HOME };
+	private static final int[] CTRL_HOME= new int[] { SWT.MOD1, SWT.HOME };
 	/* Ctrl+ARROW_DOWN is "Application windows" on Mac OS X.
 	 * COMMAND+SHIFT+ALT+CTRL+ARROW_DOWN is defined in org.eclipse.jdt.text.tests/plugin.xml */
 	private static final int[] CTRL_DOWN= Util.isMac()
@@ -224,21 +224,21 @@ public abstract class ScrollEditorTest extends TextPerformanceTestCase {
 				assertFalse("Failed to receive event within " + delay + "ms.", timeout.hasTimedOut());
 
 				// 2: wait until the events have been swallowed
-				timeout= waiter.restart(2000);
+				timeout= waiter.restart(10000);
 				while (!timeout.hasTimedOut() && text.getTopIndex() + visibleLinesInViewport < numberOfLines - 1) {
 					runEventQueue(display);
 				}
 				waiter.hold();
-				assertFalse("Never scrolled to the bottom within 2000ms.\nTopIndex: " + text.getTopIndex() + " visibleLines: " + visibleLinesInViewport + " totalLines: " + numberOfLines + " operations: " + operations, timeout.hasTimedOut());
+				assertFalse("Never scrolled to the bottom within 10000ms.\nTopIndex: " + text.getTopIndex() + " visibleLines: " + visibleLinesInViewport + " totalLines: " + numberOfLines + " operations: " + operations, timeout.hasTimedOut());
 
 				// 3: go back home
-				timeout= waiter.restart(2000);
+				timeout= waiter.restart(10000);
 				SWTEventHelper.pressKeyCodeCombination(display, mode.HOME_COMBO, false);
 				while (!timeout.hasTimedOut() && text.getTopIndex() != 0) {
 					runEventQueue(display);
 				}
 				waiter.hold();
-				assertFalse("Never went back to the top within 2000ms.", timeout.hasTimedOut());
+				assertFalse("Never went back to the top within 10000ms.", timeout.hasTimedOut());
 
 				waiter.hold();
 			}