View | Details | Raw Unified | Return to bug 189852 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceBuildTests.java (-7 / +6 lines)
Lines 636-642 Link Here
636
	 * @since 3.2 M6
636
	 * @since 3.2 M6
637
	 */
637
	 */
638
	public void testFullBuildProjectNoWarning() throws CoreException, IOException {
638
	public void testFullBuildProjectNoWarning() throws CoreException, IOException {
639
		tagAsSummary("Build JDT/Core project (no warning)", true); // put in fingerprint
639
		tagAsSummary("Build JDT/Core project (no warning)", false); // do NOT put in fingerprint
640
		build(JDT_CORE_PROJECT, warningOptions(-1/*no warning*/), true);
640
		build(JDT_CORE_PROJECT, warningOptions(-1/*no warning*/), true);
641
	}
641
	}
642
642
Lines 660-666 Link Here
660
	 * @since 3.2 M6
660
	 * @since 3.2 M6
661
	 */
661
	 */
662
	public void testFullBuildProjectAllWarnings() throws CoreException, IOException {
662
	public void testFullBuildProjectAllWarnings() throws CoreException, IOException {
663
		tagAsSummary("Build JDT/Core project (all warnings)", true); // put in fingerprint
663
		tagAsSummary("Build JDT/Core project (all warnings)", false); // do NOT put in fingerprint
664
		build(JDT_CORE_PROJECT, warningOptions(1/*all warnings*/), false);
664
		build(JDT_CORE_PROJECT, warningOptions(1/*all warnings*/), false);
665
	}
665
	}
666
666
Lines 671-677 Link Here
671
	 * before put it in builds performance results.
671
	 * before put it in builds performance results.
672
	 * 
672
	 * 
673
	 * @throws IOException
673
	 * @throws IOException
674
	 * TODO (frederic) remove for 3.2 RC1
675
	 */
674
	 */
676
	public void testBatchCompilerNoWarning() throws IOException, CoreException {
675
	public void testBatchCompilerNoWarning() throws IOException, CoreException {
677
		tagAsSummary("Compile folders using cmd line (no warn)", false); // do NOT put in fingerprint
676
		tagAsSummary("Compile folders using cmd line (no warn)", false); // do NOT put in fingerprint
Lines 684-690 Link Here
684
	 * @throws IOException
683
	 * @throws IOException
685
	 */
684
	 */
686
	public void testCompileJDTCoreProjectNoWarning() throws IOException, CoreException {
685
	public void testCompileJDTCoreProjectNoWarning() throws IOException, CoreException {
687
		tagAsSummary("Compile JDT/Core with cmd line (no warn)", true); // put in fingerprint
686
		tagAsSummary("Compile JDT/Core with cmd line (no warn)", false); // do NOT put in fingerprint
688
		compile(JavaCore.PLUGIN_ID, "-nowarn", false/*no log*/, JDT_CORE_SRC_PATHS);
687
		compile(JavaCore.PLUGIN_ID, "-nowarn", false/*no log*/, JDT_CORE_SRC_PATHS);
689
	}
688
	}
690
689
Lines 704-710 Link Here
704
	 * @throws IOException
703
	 * @throws IOException
705
	 */
704
	 */
706
	public void testCompileJDTCoreProjectJavadoc() throws IOException, CoreException {
705
	public void testCompileJDTCoreProjectJavadoc() throws IOException, CoreException {
707
		tagAsSummary("Compile JDT/Core with cmd line (javadoc)", true); // put in fingerprint
706
		tagAsSummary("Compile JDT/Core with cmd line (javadoc)", false); // do NOT put in fingerprint
708
		compile(JavaCore.PLUGIN_ID, "-warn:javadoc", false/*no log*/, JDT_CORE_SRC_PATHS);
707
		compile(JavaCore.PLUGIN_ID, "-warn:javadoc", false/*no log*/, JDT_CORE_SRC_PATHS);
709
	}
708
	}
710
709
Lines 715-721 Link Here
715
	 * @since 3.2 M6
714
	 * @since 3.2 M6
716
	 */
715
	 */
717
	public void testCompileJDTCoreProjectAllWarnings() throws IOException, CoreException {
716
	public void testCompileJDTCoreProjectAllWarnings() throws IOException, CoreException {
718
		tagAsSummary("Compile JDT/Core with cmd line (all)", true); // put in fingerprint
717
		tagAsSummary("Compile JDT/Core with cmd line (all)", false); // do NOT put in fingerprint
719
		compile(JavaCore.PLUGIN_ID, ALL_OPTIONS, false/*no log*/, JDT_CORE_SRC_PATHS);
718
		compile(JavaCore.PLUGIN_ID, ALL_OPTIONS, false/*no log*/, JDT_CORE_SRC_PATHS);
720
	}
719
	}
721
720
Lines 726-732 Link Here
726
	 * @since 3.2 M6
725
	 * @since 3.2 M6
727
	 */
726
	 */
728
	public void testCompileSWTProjectDefault() throws IOException, CoreException {
727
	public void testCompileSWTProjectDefault() throws IOException, CoreException {
729
		tagAsSummary("Compile SWT with command line", true); // put in fingerprint
728
		tagAsSummary("Compile SWT with command line", false); // do NOT put in fingerprint
730
		String[] sourcePaths = {
729
		String[] sourcePaths = {
731
				"Eclipse SWT/win32",
730
				"Eclipse SWT/win32",
732
				"Eclipse SWT/common",
731
				"Eclipse SWT/common",
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceASTTests.java (-4 / +4 lines)
Lines 583-589 Link Here
583
	 * @deprecated To reduce deprecated warnings
583
	 * @deprecated To reduce deprecated warnings
584
	 */
584
	 */
585
	public void testPerfDomAstCreationJLS2() throws JavaModelException {
585
	public void testPerfDomAstCreationJLS2() throws JavaModelException {
586
		tagAsSummary("DOM AST tree for one file using JLS2", true); // put in fingerprint
586
		tagAsSummary("DOM AST tree for one file using JLS2", false); // do NOT put in fingerprint
587
587
588
		ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.compiler.parser", "Parser.java");
588
		ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.compiler.parser", "Parser.java");
589
		Hashtable options = JavaCore.getOptions();
589
		Hashtable options = JavaCore.getOptions();
Lines 596-602 Link Here
596
	 * Performance DOM/AST creation on the entire workspace using JLS3.
596
	 * Performance DOM/AST creation on the entire workspace using JLS3.
597
	 */
597
	 */
598
	public void testPerfDomAstCreationJLS3() throws JavaModelException {
598
	public void testPerfDomAstCreationJLS3() throws JavaModelException {
599
		tagAsSummary("DOM AST tree for one file using JLS3", false); // put in fingerprint
599
		tagAsSummary("DOM AST tree for one file using JLS3", true); // put in fingerprint
600
600
601
		ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.compiler.parser", "Parser.java");
601
		ICompilationUnit unit = getCompilationUnit("org.eclipse.jdt.core", "org.eclipse.jdt.internal.compiler.parser", "Parser.java");
602
		createAST(unit, AST.JLS3);
602
		createAST(unit, AST.JLS3);
Lines 655-661 Link Here
655
	 * @deprecated To reduce deprecated warnings
655
	 * @deprecated To reduce deprecated warnings
656
	 */
656
	 */
657
	public void testWkspDomAstCreationJLS2() throws JavaModelException {
657
	public void testWkspDomAstCreationJLS2() throws JavaModelException {
658
		tagAsSummary("DOM AST tree for workspace files (JLS2)", true); // put in fingerprint
658
		tagAsSummary("DOM AST tree for workspace files (JLS2)", false); // do NOT put in fingerprint
659
		runAllProjectsAstCreation(AST.JLS2);
659
		runAllProjectsAstCreation(AST.JLS2);
660
	}
660
	}
661
661
Lines 730-736 Link Here
730
	 * @throws JavaModelException
730
	 * @throws JavaModelException
731
	 */
731
	 */
732
	public void testDomAstCreationProjectJLS3() throws JavaModelException {
732
	public void testDomAstCreationProjectJLS3() throws JavaModelException {
733
		tagAsSummary("DOM AST tree for project files (JLS3)", true); // put in fingerprint
733
		tagAsSummary("DOM AST tree for project files (JLS3)", false); // do NOT put in fingerprint
734
		runAstCreation(getProject("org.eclipse.search"));
734
		runAstCreation(getProject("org.eclipse.search"));
735
	}
735
	}
736
}
736
}
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceFormatterTests.java (-11 / +4 lines)
Lines 18-30 Link Here
18
import org.eclipse.core.runtime.IPath;
18
import org.eclipse.core.runtime.IPath;
19
import org.eclipse.jdt.core.JavaModelException;
19
import org.eclipse.jdt.core.JavaModelException;
20
import org.eclipse.jdt.core.formatter.CodeFormatter;
20
import org.eclipse.jdt.core.formatter.CodeFormatter;
21
import org.eclipse.jdt.core.search.IJavaSearchConstants;
22
import org.eclipse.jdt.core.tests.util.Util;
21
import org.eclipse.jdt.core.tests.util.Util;
23
import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
22
import org.eclipse.jdt.internal.formatter.DefaultCodeFormatter;
24
23
25
/**
24
/**
26
 */
25
 */
27
public class FullSourceWorkspaceFormatterTests extends FullSourceWorkspaceTests implements IJavaSearchConstants {
26
public class FullSourceWorkspaceFormatterTests extends FullSourceWorkspaceTests {
28
27
29
	// Tests counters
28
	// Tests counters
30
	static int TESTS_COUNT = 0;
29
	static int TESTS_COUNT = 0;
Lines 47-59 Link Here
47
46
48
static {
47
static {
49
//	TESTS_NAMES = new String[] {
48
//	TESTS_NAMES = new String[] {
50
//		"testPerfNameLookupFindKnownSecondaryType",
51
//		"testPerfNameLookupFindUnknownType",
52
//		"testPerfReconcile", 
53
//		"testPerfSearchAllTypeNamesAndReconcile",
54
//	};
49
//	};
55
	
56
//	TESTS_PREFIX = "testPerfReconcile";
57
}
50
}
58
public static Test suite() {
51
public static Test suite() {
59
	Test suite = buildSuite(testClass());
52
	Test suite = buildSuite(testClass());
Lines 103-109 Link Here
103
 * Format file (Parser.java - 225176 chars) using code formatter default options.
96
 * Format file (Parser.java - 225176 chars) using code formatter default options.
104
 */
97
 */
105
public void testFormatDefault() throws JavaModelException {
98
public void testFormatDefault() throws JavaModelException {
106
	tagAsSummary("Format file with default options", false); // do NOT put in fingerprint
99
	tagAsGlobalSummary("Format file with default options", false); // do NOT put in global fingerprint yet...
107
100
108
	// Warm up
101
	// Warm up
109
	String source = PARSER_WORKING_COPY.getSource();
102
	String source = PARSER_WORKING_COPY.getSource();
Lines 135-142 Link Here
135
/**
128
/**
136
 * Format big file (GenericTypeTest.java - 1297242 chars) using code formatter default options.
129
 * Format big file (GenericTypeTest.java - 1297242 chars) using code formatter default options.
137
 */
130
 */
138
public void testFormatDefaultBigFile() throws JavaModelException {
131
public void testFormatDefaultBigFile() {
139
	tagAsGlobalSummary("Format big file with default options", false); // do NOT put in global fingerprint yet...
132
	tagAsSummary("Format big file with default options", false); // do NOT put in fingerprint
140
133
141
	// Warm up
134
	// Warm up
142
	String source = FORMAT_TYPE_SOURCE;
135
	String source = FORMAT_TYPE_SOURCE;
(-)src/org/eclipse/jdt/core/tests/performance/FullSourceWorkspaceModelTests.java (-1 / +1 lines)
Lines 621-627 Link Here
621
 * (regression test for bug 135083 RangeUtil#isInInterval(...) takes significant amount of time while editing)
621
 * (regression test for bug 135083 RangeUtil#isInInterval(...) takes significant amount of time while editing)
622
 */
622
 */
623
public void testPerfReconcileBigFileWithSyntaxError() throws JavaModelException {
623
public void testPerfReconcileBigFileWithSyntaxError() throws JavaModelException {
624
	tagAsSummary("Reconcile editor change on big file with syntax error", true); // put in fingerprint
624
	tagAsSummary("Reconcile editor change on big file with syntax error", false); // do NOT put in fingerprint
625
	
625
	
626
	// build big file contents
626
	// build big file contents
627
	String method =
627
	String method =
(-)build.properties (-2 / +4 lines)
Lines 14-20 Link Here
14
               local_test.xml,\
14
               local_test.xml,\
15
               META-INF/,\
15
               META-INF/,\
16
               plugin.properties,\
16
               plugin.properties,\
17
               full-source-R3_0.zip
17
               full-source-R3_0.zip,\
18
               GenericTypeTest.java
18
src.includes = about.html,\
19
src.includes = about.html,\
19
               .classpath,\
20
               .classpath,\
20
               .cvsignore,\
21
               .cvsignore,\
Lines 26-30 Link Here
26
               local_test.xml,\
27
               local_test.xml,\
27
               plugin.properties,\
28
               plugin.properties,\
28
               src/,\
29
               src/,\
29
               test.xml
30
               test.xml,\
31
               GenericTypeTest.java
30
source.jdtcoretestsperf.jar = src
32
source.jdtcoretestsperf.jar = src

Return to bug 189852