### 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.19 diff -u -r1.19 EventDrivenTestSuite.java --- src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java 25 Nov 2010 11:18:02 -0000 1.19 +++ src/org/eclipse/jdt/text/tests/performance/EventDrivenTestSuite.java 13 May 2011 18:29:52 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 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 @@ -13,6 +13,8 @@ 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 @@ -28,9 +30,9 @@ } public EventDrivenTestSuite() { - addTest(ScrollJavaEditorTest.suite()); - addTest(ScrollTextEditorTest.suite()); - addTest(WhitespaceCharacterPainterTest.suite()); + addTest(new DebugSetup(ScrollJavaEditorTest.suite())); + addTest(new DebugSetup(ScrollTextEditorTest.suite())); + addTest(new DebugSetup(WhitespaceCharacterPainterTest.suite())); addTest(JavaIndenterTest.suite()); addTest(JavaNonInitialTypingTest.suite()); addTest(TextNonInitialTypingTest.suite()); Index: src/org/eclipse/jdt/text/tests/performance/TextPerformanceTestCase.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.text.tests/src/org/eclipse/jdt/text/tests/performance/TextPerformanceTestCase.java,v retrieving revision 1.24 diff -u -r1.24 TextPerformanceTestCase.java --- src/org/eclipse/jdt/text/tests/performance/TextPerformanceTestCase.java 11 Oct 2010 15:31:27 -0000 1.24 +++ src/org/eclipse/jdt/text/tests/performance/TextPerformanceTestCase.java 13 May 2011 18:29:52 -0000 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 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 @@ -13,10 +13,15 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; +import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.Locale; +import junit.extensions.TestSetup; +import junit.framework.Test; import junit.framework.TestCase; import org.eclipse.jdt.text.tests.JdtTextTestPlugin; @@ -39,7 +44,22 @@ */ public class TextPerformanceTestCase extends TestCase { - private static final boolean DEBUG= false; + public static class DebugSetup extends TestSetup { + public DebugSetup(Test test) { + super(test); + } + @Override + protected void setUp() throws Exception { + DEBUG= true; + } + @Override + protected void tearDown() throws Exception { + DEBUG= false; + } + } + static boolean DEBUG= false; + + private static final SimpleDateFormat DATE_FORMAT= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS Z", Locale.US); /** containing plug-in id */ @@ -104,7 +124,7 @@ EditorsUI.getPreferenceStore().putValue(SpellingService.PREFERENCE_SPELLING_ENABLED, IPreferenceStore.FALSE); if (DEBUG) - System.out.println(getClass().getName() + "." + getName() + ": " + System.currentTimeMillis()); + System.out.println(DATE_FORMAT.format(new Date()) + ": " + getClass().getName() + "." + getName()); } /* @@ -117,8 +137,8 @@ for (Iterator iter= fPerformanceMeters.iterator(); iter.hasNext();) ((PerformanceMeter) iter.next()).dispose(); - if (DEBUG) - System.out.println(" torn down: " + System.currentTimeMillis()); +// if (DEBUG) +// System.out.println(DATE_FORMAT.format(new Date()) + ": tearDown " + getClass().getName() + "." + getName()); } /**