Attachment 196141 Details for Bug 342697 – Fix for KeyboardProbe

[patch] Fix for KeyboardProbe

patch.txt (text/plain), 3.61 KB, created by Markus Keller

on 2011-05-19 13:25:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Keller

Created: 2011-05-19 13:25:32 EDT

Size: 3.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.text.tests
>Index: src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java,v
>retrieving revision 1.20
>diff -u -r1.20 EventDrivenTestSuite.java
>--- src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java	13 May 2011 18:31:13 -0000	1.20
>+++ src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java	19 May 2011 17:24:00 -0000
>@@ -13,8 +13,6 @@
> import junit.framework.Test;
> import junit.framework.TestSuite;
> 
>-import org.eclipse.jdt.text.tests.performance.TextPerformanceTestCase.DebugSetup;
>-
> 
> /**
>  * Depends on {@link PerformanceTestSetup}, which is currently run by
>@@ -30,9 +28,9 @@
> 	}
> 
> 	public EventDrivenTestSuite() {
>-		addTest(new DebugSetup(ScrollJavaEditorTest.suite()));
>-		addTest(new DebugSetup(ScrollTextEditorTest.suite()));
>-		addTest(new DebugSetup(WhitespaceCharacterPainterTest.suite()));
>+		addTest(ScrollJavaEditorTest.suite());
>+		addTest(ScrollTextEditorTest.suite());
>+		addTest(WhitespaceCharacterPainterTest.suite());
> 		addTest(JavaIndenterTest.suite());
> 		addTest(JavaNonInitialTypingTest.suite());
> 		addTest(TextNonInitialTypingTest.suite());
>Index: src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java,v
>retrieving revision 1.13
>diff -u -r1.13 KeyboardProbe.java
>--- src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java	11 Sep 2008 12:00:06 -0000	1.13
>+++ src/org/eclipse/jdt/text/tests/performance/KeyboardProbe.java	19 May 2011 17:24:00 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2008 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -226,7 +226,7 @@
> 		text.setText("");
> 		do
> 			driveEventQueue();
>-		while (!fTextContinue && fDisplay.sleep());
>+		while (!fTextContinue);
> 	}
> 
> 	private Display createDisplay() {
>@@ -297,7 +297,7 @@
> 
> 		do
> 			driveEventQueue();
>-		while (!fKeyContinue && fDisplay.sleep());
>+		while (!fKeyContinue);
> 
> 	}
> 
>@@ -330,7 +330,7 @@
> 
> 		do
> 			driveEventQueue();
>-		while (!fKeyContinue && fDisplay.sleep());
>+		while (!fKeyContinue);
> 	}
> 
> 	private boolean fShiftPressed= false;
>@@ -352,6 +352,11 @@
> 
> 	private void driveEventQueue() {
> 		while (fDisplay.readAndDispatch()) {}
>+		try {
>+			Thread.sleep(10);
>+		} catch (InterruptedException e) {
>+			// continue
>+		}
> 	}
> 
> }
>Index: test.xml
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.text.tests/test.xml,v
>retrieving revision 1.20
>diff -u -r1.20 test.xml
>--- test.xml	4 May 2011 11:33:26 -0000	1.20
>+++ test.xml	19 May 2011 17:24:00 -0000
>@@ -87,7 +87,6 @@
>     </ant>
>     
>     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
>-      <property name="timeout" value="14400000"/>
>       <property name="vmargs" value="-Xms250M -Xmx250M"/>
>       <property name="data-dir" value="${jdt-text-performance-folder}"/>
>       <property name="plugin-name" value="${plugin-name}"/>

Actions: View | Diff

Attachments on bug 342697: 194345 | 195311 | 195609 | 195621 | 196141 | 196423