### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.performance Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java,v retrieving revision 1.25 diff -u -r1.25 FullSourceWorkspaceBuildTests.java --- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java 27 Apr 2007 16:05:13 -0000 1.25 +++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java 30 May 2007 14:58:31 -0000 @@ -636,7 +636,7 @@ * @since 3.2 M6 */ public void testFullBuildProjectNoWarning() throws CoreException, IOException { - tagAsSummary("Build JDT/Core project (no warning)", true); // put in fingerprint + tagAsSummary("Build JDT/Core project (no warning)", false); // do NOT put in fingerprint build(JDT_CORE_PROJECT, warningOptions(-1/*no warning*/), true); } @@ -660,7 +660,7 @@ * @since 3.2 M6 */ public void testFullBuildProjectAllWarnings() throws CoreException, IOException { - tagAsSummary("Build JDT/Core project (all warnings)", true); // put in fingerprint + tagAsSummary("Build JDT/Core project (all warnings)", false); // do NOT put in fingerprint build(JDT_CORE_PROJECT, warningOptions(1/*all warnings*/), false); } @@ -671,7 +671,6 @@ * before put it in builds performance results. * * @throws IOException - * TODO (frederic) remove for 3.2 RC1 */ public void testBatchCompilerNoWarning() throws IOException, CoreException { tagAsSummary("Compile folders using cmd line (no warn)", false); // do NOT put in fingerprint @@ -684,7 +683,7 @@ * @throws IOException */ public void testCompileJDTCoreProjectNoWarning() throws IOException, CoreException { - tagAsSummary("Compile JDT/Core with cmd line (no warn)", true); // put in fingerprint + tagAsSummary("Compile JDT/Core with cmd line (no warn)", false); // do NOT put in fingerprint compile(JavaCore.PLUGIN_ID, "-nowarn", false/*no log*/, JDT_CORE_SRC_PATHS); } @@ -704,7 +703,7 @@ * @throws IOException */ public void testCompileJDTCoreProjectJavadoc() throws IOException, CoreException { - tagAsSummary("Compile JDT/Core with cmd line (javadoc)", true); // put in fingerprint + tagAsSummary("Compile JDT/Core with cmd line (javadoc)", false); // do NOT put in fingerprint compile(JavaCore.PLUGIN_ID, "-warn:javadoc", false/*no log*/, JDT_CORE_SRC_PATHS); } @@ -715,7 +714,7 @@ * @since 3.2 M6 */ public void testCompileJDTCoreProjectAllWarnings() throws IOException, CoreException { - tagAsSummary("Compile JDT/Core with cmd line (all)", true); // put in fingerprint + tagAsSummary("Compile JDT/Core with cmd line (all)", false); // do NOT put in fingerprint compile(JavaCore.PLUGIN_ID, ALL_OPTIONS, false/*no log*/, JDT_CORE_SRC_PATHS); } @@ -726,7 +725,7 @@ * @since 3.2 M6 */ public void testCompileSWTProjectDefault() throws IOException, CoreException { - tagAsSummary("Compile SWT with command line", true); // put in fingerprint + tagAsSummary("Compile SWT with command line", false); // do NOT put in fingerprint String[] sourcePaths = { "Eclipse SWT/win32", "Eclipse SWT/common", Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java,v retrieving revision 1.23 diff -u -r1.23 FullSourceWorkspaceASTTests.java --- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java 20 Apr 2007 09:02:36 -0000 1.23 +++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java 30 May 2007 14:58:30 -0000 @@ -583,7 +583,7 @@ * @deprecated To reduce deprecated warnings */ public void testPerfDomAstCreationJLS2() throws JavaModelException { - tagAsSummary("DOM AST tree for one file using JLS2", true); // put in fingerprint + tagAsSummary("DOM AST tree for one file using JLS2", false); // do NOT put in fingerprint ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.compiler.parser", "Parser.java"); Hashtable options = JavaCore.getOptions(); @@ -596,7 +596,7 @@ * Performance DOM/AST creation on the entire workspace using JLS3. */ public void testPerfDomAstCreationJLS3() throws JavaModelException { - tagAsSummary("DOM AST tree for one file using JLS3", false); // put in fingerprint + tagAsSummary("DOM AST tree for one file using JLS3", false); // do NOT put in fingerprint ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.compiler.parser", "Parser.java"); createAST(unit, AST.JLS3); @@ -655,7 +655,7 @@ * @deprecated To reduce deprecated warnings */ public void testWkspDomAstCreationJLS2() throws JavaModelException { - tagAsSummary("DOM AST tree for workspace files (JLS2)", true); // put in fingerprint + tagAsSummary("DOM AST tree for workspace files (JLS2)", false); // do NOT put in fingerprint runAllProjectsAstCreation(AST.JLS2); } Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceFormatterTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceFormatterTests.java,v retrieving revision 1.1 diff -u -r1.1 FullSourceWorkspaceFormatterTests.java --- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceFormatterTests.java 29 May 2007 15:43:10 -0000 1.1 +++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceFormatterTests.java 30 May 2007 14:58:31 -0000 @@ -18,13 +18,12 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.formatter.CodeFormatter; -import org.eclipse.jdt.core.search.IJavaSearchConstants; import org.eclipse.jdt.core.tests.util.Util; import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter; /** */ -public class FullSourceWorkspaceFormatterTests extends FullSourceWorkspaceTests implements IJavaSearchConstants { +public class FullSourceWorkspaceFormatterTests extends FullSourceWorkspaceTests { // Tests counters static int TESTS_COUNT = 0; @@ -47,13 +46,7 @@ static { // TESTS_NAMES = new String[] { -// "testPerfNameLookupFindKnownSecondaryType", -// "testPerfNameLookupFindUnknownType", -// "testPerfReconcile", -// "testPerfSearchAllTypeNamesAndReconcile", // }; - -// TESTS_PREFIX = "testPerfReconcile"; } public static Test suite() { Test suite = buildSuite(testClass()); @@ -135,8 +128,8 @@ /** * Format big file (GenericTypeTest.java - 1297242 chars) using code formatter default options. */ -public void testFormatDefaultBigFile() throws JavaModelException { - tagAsGlobalSummary("Format big file with default options", false); // do NOT put in global fingerprint yet... +public void testFormatDefaultBigFile() { + tagAsSummary("Format big file with default options", false); // do NOT put in fingerprint yet... // Warm up String source = FORMAT_TYPE_SOURCE; Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceModelTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceModelTests.java,v retrieving revision 1.35 diff -u -r1.35 FullSourceWorkspaceModelTests.java --- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceModelTests.java 29 May 2007 15:43:10 -0000 1.35 +++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceModelTests.java 30 May 2007 14:58:31 -0000 @@ -621,7 +621,7 @@ * (regression test for bug 135083 RangeUtil#isInInterval(...) takes significant amount of time while editing) */ public void testPerfReconcileBigFileWithSyntaxError() throws JavaModelException { - tagAsSummary("Reconcile editor change on big file with syntax error", true); // put in fingerprint + tagAsSummary("Reconcile editor change on big file with syntax error", false); // do NOT put in fingerprint // build big file contents String method = @@ -796,7 +796,7 @@ } public void testCloseProjects() throws JavaModelException { - tagAsSummary("Close all workspace projects", true); // put in fingerprint + tagAsSummary("Close all workspace projects", false); // do NOT put in fingerprint // Warm-up int length=ALL_PROJECTS.length; Index: src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceSearchTests.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceSearchTests.java,v retrieving revision 1.35 diff -u -r1.35 FullSourceWorkspaceSearchTests.java --- src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceSearchTests.java 15 May 2007 11:04:35 -0000 1.35 +++ src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceSearchTests.java 30 May 2007 14:58:31 -0000 @@ -598,7 +598,7 @@ * Performance tests for search: Constructors occruences. */ public void testSearchConstructor() throws CoreException { - tagAsSummary("Search constructor occurences", true); // put in fingerprint + tagAsSummary("Search constructor occurences", false); // do NOT put in fingerprint // Wait for indexing end AbstractJavaModelTests.waitUntilIndexesReady(); @@ -668,7 +668,7 @@ * Performance tests for search: Package Declarations on workspace scope. */ public void testSearchPackageDeclarationsWorkspace() throws CoreException { - tagAsSummary("Search workspace package declarations", true); // put in fingerprint + tagAsSummary("Search workspace package declarations", false); // do NOT put in fingerprint // Wait for indexing end AbstractJavaModelTests.waitUntilIndexesReady(); Index: build.properties =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.performance/build.properties,v retrieving revision 1.6 diff -u -r1.6 build.properties --- build.properties 19 Oct 2006 02:47:35 -0000 1.6 +++ build.properties 30 May 2007 14:58:30 -0000 @@ -14,7 +14,8 @@ local_test.xml,\ META-INF/,\ plugin.properties,\ - full-source-R3_0.zip + full-source-R3_0.zip,\ + GenericTypeTest.java src.includes = about.html,\ .classpath,\ .cvsignore,\ @@ -26,5 +27,6 @@ local_test.xml,\ plugin.properties,\ src/,\ - test.xml + test.xml,\ + GenericTypeTest.java source.jdtcoretestsperf.jar = src