Backported performance test cases to 3.0
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java
index ad005ff..8e12f40 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests1.java
@@ -50,7 +50,7 @@
}
public void test_1000_10() throws Exception {
- tagAsSummary("Move compilation unit - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Move compilation units - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(1000, 10, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java
index 8797f0d..fef2cd7 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveCompilationUnitPerfTests2.java
@@ -49,7 +49,7 @@
}
public void test_10_1000() throws Exception {
- tagAsSummary("Move compilation units - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Move compilation units - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(10, 1000, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java
index 0d3d6d9..be91d0c 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests1.java
@@ -50,7 +50,7 @@
}
public void test_1000_10() throws Exception {
- tagAsSummary("Move static members - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Move static members - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(1000, 10, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java
index f93372c..7f34891 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/MoveStaticMembersPerfTests2.java
@@ -49,7 +49,7 @@
}
public void test_10_1000() throws Exception {
- tagAsSummary("Move static members - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Move static members - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(10, 1000, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java
index 75e25e8..7bc2458 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests1.java
@@ -50,7 +50,7 @@
}
public void test_1000_10() throws Exception {
- tagAsSummary("Rename method - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename method - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(1000, 10, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java
index f215281..d86f3e5 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameMethodPerfTests2.java
@@ -49,7 +49,7 @@
}
public void test_10_1000() throws Exception {
- tagAsSummary("Rename method - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename method - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(10, 1000, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java
index 0f62f76..a573faf 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests1.java
@@ -50,7 +50,7 @@
}
public void test_1000_10() throws Exception {
- tagAsSummary("Rename package - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename package - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(1000, 10, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java
index 0122fe8..6592f1e 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenamePackagePerfTests2.java
@@ -49,7 +49,7 @@
}
public void test_10_1000() throws Exception {
- tagAsSummary("Rename package - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename package - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(10, 1000, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java
index cd79e8b..e8d35d5 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfAcceptanceTests.java
@@ -63,7 +63,7 @@
}
public void testWarm() throws Exception {
- tagAsSummary("Rename of Control", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename of Control", new Dimension[] {Dimension.ELAPSED_PROCESS});
IType control= fProject.findType("org.eclipse.swt.widgets.Control2");
RenameTypeProcessor processor= new RenameTypeProcessor(control);
processor.setNewElementName("Control");
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java
index 50e6567..b2d6e67 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests1.java
@@ -50,7 +50,7 @@
}
public void test_1000_10() throws Exception {
- tagAsSummary("Rename type - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename type - 1000 CUs, 10 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(1000, 10, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java
index f43f50e..7947ebf 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/RenameTypePerfTests2.java
@@ -49,7 +49,7 @@
}
public void test_10_1000() throws Exception {
- tagAsSummary("Rename method - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Rename method - 10 CUs, 1000 Refs", new Dimension[] {Dimension.ELAPSED_PROCESS});
executeRefactoring(10, 1000, true, 1);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java
index da7e82a..da39528 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfaceHeapAcceptanceTests.java
@@ -21,7 +21,6 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceProcessor;
import org.eclipse.jdt.internal.corext.refactoring.structure.ExtractInterfaceRefactoring;
import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings;
@@ -56,7 +55,7 @@
super.setUp();
fProject= new SWTTestProject();
IType control= fProject.getProject().findType("org.eclipse.swt.widgets.Control");
- fRefactoring= ExtractInterfaceRefactoring.create(control, JavaPreferencesSettings.getCodeGenerationSettings(fProject.getProject()));
+ fRefactoring= ExtractInterfaceRefactoring.create(control, JavaPreferencesSettings.getCodeGenerationSettings());
IMethod[] methods= control.getMethods();
List extractedMembers= new ArrayList();
for (int i= 0; i < methods.length; i++) {
@@ -66,10 +65,9 @@
extractedMembers.add(method);
}
}
- ExtractInterfaceProcessor processor= fRefactoring.getExtractInterfaceProcessor();
- processor.setTypeName("IControl");
- processor.setExtractedMembers((IMember[])extractedMembers.toArray(new IMember[extractedMembers.size()]));
- processor.setReplace(true);
+ fRefactoring.setNewInterfaceName("IControl");
+ fRefactoring.setExtractedMembers((IMember[])extractedMembers.toArray(new IMember[extractedMembers.size()]));
+ fRefactoring.setReplaceOccurrences(true);
}
protected void tearDown() throws Exception {
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
index daf56cb..ffe8e1c 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
+++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/type/ExtractInterfacePerfAcceptanceTests.java
@@ -72,7 +72,7 @@
}
public void testExtractControl() throws Exception {
- tagAsSummary("Extract Interface", new Dimension[] {Dimension.CPU_TIME, Dimension.USED_JAVA_HEAP});
+ tagAsSummary("Extract Interface - Elapsed Process", new Dimension[] {Dimension.CPU_TIME});
executeRefactoring(fRefactoring, true);
}
}
diff --git a/org.eclipse.jdt.ui.tests.refactoring/test.xml b/org.eclipse.jdt.ui.tests.refactoring/test.xml
index 90cf137..c1133c2 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/test.xml
+++ b/org.eclipse.jdt.ui.tests.refactoring/test.xml
@@ -98,6 +98,11 @@
<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.type.ExtractInterfacePerfAcceptanceTests" />
</ant>
+
+ <delete dir="${jdt-ui-refactoring-performance-folder}" quiet="true" />
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="classname" value="org.eclipse.jdt.ui.tests.refactoring.type.ExtractInterfaceHeapAcceptanceTests" />
+ </ant>
</target>
<!-- This target holds code to cleanup the testing environment after -->
