Attachment 193734 Details for Bug 298952 – Patch

[patch] Patch

patch shorten text.txt (text/plain), 2.88 KB, created by Oleg Besedin

on 2011-04-20 14:21:32 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Oleg Besedin

Created: 2011-04-20 14:21:32 EDT

Size: 2.88 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.tests.performance
>Index: src/org/eclipse/jface/tests/performance/ProgressMonitorDialogPerformanceTest.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.tests.performance/src/org/eclipse/jface/tests/performance/ProgressMonitorDialogPerformanceTest.java,v
>retrieving revision 1.1
>diff -u -r1.1 ProgressMonitorDialogPerformanceTest.java
>--- src/org/eclipse/jface/tests/performance/ProgressMonitorDialogPerformanceTest.java	26 Oct 2007 17:29:14 -0000	1.1
>+++ src/org/eclipse/jface/tests/performance/ProgressMonitorDialogPerformanceTest.java	20 Apr 2011 18:10:27 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2007 IBM Corporation and others.
>+ * Copyright (c) 2007, 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
>@@ -13,7 +13,6 @@
> 
> import java.lang.reflect.InvocationTargetException;
> 
>-import org.eclipse.core.runtime.CoreException;
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.jface.dialogs.ProgressMonitorDialog;
> import org.eclipse.jface.operation.IRunnableWithProgress;
>@@ -21,7 +20,6 @@
> import org.eclipse.swt.widgets.Shell;
> import org.eclipse.test.performance.Dimension;
> import org.eclipse.ui.tests.performance.BasicPerformanceTest;
>-import org.eclipse.ui.tests.performance.TestRunnable;
> 
> /**
>  * @since 3.3
>@@ -55,6 +53,7 @@
> 
> 		tagIfNecessary("JFace - 10000 element task name in progress dialog",
> 				Dimension.ELAPSED_PROCESS);
>+		setDegradationComment("The test changed in 3.7. For details, consult bug 298952.");
> 		
> 		Display display = Display.getCurrent();
> 		if (display == null) {
>@@ -70,26 +69,22 @@
> 				for (int i = 0; i < chars.length; i++) {
> 					chars[i] = 'A';
> 				}
>-				
> 				final String taskName = new String(chars);
>-				final IProgressMonitor finalMonitor = monitor;
> 				
>-				try {
>-					exercise(new TestRunnable() {
>-						public void run() {
>-							startMeasuring();
>-							finalMonitor.setTaskName(taskName);
>-							processEvents();
>-							stopMeasuring();
>-						}
>-					}, ViewerTest.MIN_ITERATIONS, ViewerTest.ITERATIONS,
>-							JFacePerformanceSuite.MAX_TIME);
>-				} catch (CoreException e) {
>-					fail(e.getMessage(), e);
>+				// warm up
>+				monitor.setTaskName(taskName);
>+				processEvents();
>+				
>+				// test
>+				for (int testCounter = 0; testCounter < 20; testCounter++) {
>+					startMeasuring();
>+					for (int counter = 0; counter < 30; counter++) {
>+						monitor.setTaskName(taskName);
>+						processEvents();
>+					}
>+					processEvents();
>+					stopMeasuring();
> 				}
>-
>-			
>-
> 			}
> 		};
>

Actions: View | Diff

Attachments on bug 298952: 193734