From 6d7aeb8da4c451a090f79ef867f975a4817b73db Mon Sep 17 00:00:00 2001 From: Tobias Widmer Date: Thu, 1 Dec 2005 15:17:27 +0000 Subject: Continued support to script move refactorings Added support for closure change flag --- .../ui/tests/refactoring/ChangeSignatureTests.java | 23 ++++++++++++---------- .../tests/refactoring/MoveInstanceMethodTests.java | 6 +++--- .../jdt/ui/tests/refactoring/MoveMembersTests.java | 3 ++- .../tests/refactoring/RenameParametersTests.java | 5 +++-- .../reorg/AbstractMoveStaticMemberPrefTest.java | 6 +++--- 5 files changed, 24 insertions(+), 19 deletions(-) (limited to 'org.eclipse.jdt.ui.tests.refactoring') diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java index 753b12fd51..dde3d54323 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/ChangeSignatureTests.java @@ -31,6 +31,7 @@ import org.eclipse.jdt.core.dom.Modifier; import org.eclipse.jdt.internal.corext.refactoring.ExceptionInfo; import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo; +import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester; import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeSignatureRefactoring; import org.eclipse.jdt.internal.corext.util.JavaModelUtil; import org.eclipse.jdt.internal.corext.util.JdtFlags; @@ -114,7 +115,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, "A"); IMethod method = classA.getMethod("m", signature); assertTrue("method does not exist", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); addInfos(ref.getParameterInfos(), newParamInfos, newIndices); RefactoringStatus result= performRefactoring(ref); assertEquals("precondition was supposed to pass", null, result); @@ -135,7 +136,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, "A"); IMethod method = classA.getMethod("m", signature); assertTrue("method m does not exist in A", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); ref.setNewMethodName(newMethodName); RefactoringStatus result= performRefactoring(ref); assertEquals("precondition was supposed to pass", null, result); @@ -163,7 +164,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, typeName); IMethod method = classA.getMethod(methodName, signature); assertTrue("method " + methodName +" does not exist", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); if (returnTypeName != null) ref.setNewReturnTypeName(returnTypeName); markAsDeleted(ref.getParameterInfos(), deleted); @@ -198,7 +199,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, "A"); IMethod method = classA.getMethod("m", signature); assertTrue("method does not exist", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); modifyInfos(ref.getParameterInfos(), newOrder, oldNames, newNames); RefactoringStatus result= performRefactoring(ref); assertEquals("precondition was supposed to pass", null, result); @@ -293,7 +294,8 @@ public class ChangeSignatureTests extends RefactoringTest { private void helperFail(String[] newOrder, String[] signature, int expectedSeverity) throws Exception{ IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A"); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(classA.getMethod("m", signature)); + IMethod method= classA.getMethod("m", signature); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); modifyInfos(ref.getParameterInfos(), newOrder, null, null); RefactoringStatus result= performRefactoring(ref); assertNotNull("precondition was supposed to fail", result); @@ -302,7 +304,8 @@ public class ChangeSignatureTests extends RefactoringTest { private void helperAddFail(String[] signature, ParameterInfo[] newParamInfos, int[] newIndices, int expectedSeverity) throws Exception{ IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A"); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(classA.getMethod("m", signature)); + IMethod method= classA.getMethod("m", signature); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); addInfos(ref.getParameterInfos(), newParamInfos, newIndices); RefactoringStatus result= performRefactoring(ref); assertNotNull("precondition was supposed to fail", result); @@ -323,7 +326,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, "A"); IMethod method = classA.getMethod(methodName, signature); assertTrue("method does not exist", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); markAsDeleted(ref.getParameterInfos(), deleted); modifyInfos(ref.getParameterInfos(), newParamInfos, newIndices, oldParamNames, newParamNames, newParameterTypeNames, permutation); if (newVisibility != JdtFlags.VISIBILITY_CODE_INVALID) @@ -351,7 +354,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, typeName); IMethod method = classA.getMethod(methodName, signature); assertTrue("method " + methodName +" does not exist", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); if (returnTypeName != null) ref.setNewReturnTypeName(returnTypeName); markAsDeleted(ref.getParameterInfos(), deleted); @@ -384,7 +387,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(cu, "A"); IMethod method = classA.getMethod("m", signature); assertTrue("method does not exist", method.exists()); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); // from RefactoringTest#performRefactoring(): RefactoringStatus status= ref.checkInitialConditions(new NullProgressMonitor()); @@ -530,7 +533,7 @@ public class ChangeSignatureTests extends RefactoringTest { IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A"); IMethod method= classA.getMethod("name", new String[0]); assertNotNull(method); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); assertNull(ref); } diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java index 483a84a948..1c6d59d0a8 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveInstanceMethodTests.java @@ -105,7 +105,7 @@ public class MoveInstanceMethodTests extends RefactoringTest { ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn); IMethod method= getMethod(selectionCu, selection); assertNotNull(method); - MoveInstanceMethodRefactoring ref= MoveInstanceMethodRefactoring.create(method, JavaPreferencesSettings.getCodeGenerationSettings(selectionCu.getJavaProject())); + MoveInstanceMethodRefactoring ref= new MoveInstanceMethodRefactoring(new MoveInstanceMethodProcessor(method, JavaPreferencesSettings.getCodeGenerationSettings(selectionCu.getJavaProject()))); RefactoringStatus result= ref.checkInitialConditions(new NullProgressMonitor()); if (!result.isOK()) return; @@ -169,7 +169,7 @@ public class MoveInstanceMethodTests extends RefactoringTest { ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn); IMethod method= getMethod(selectionCu, selection); assertNotNull(method); - MoveInstanceMethodRefactoring ref= MoveInstanceMethodRefactoring.create(method, JavaPreferencesSettings.getCodeGenerationSettings(selectionCu.getJavaProject())); + MoveInstanceMethodRefactoring ref= new MoveInstanceMethodRefactoring(new MoveInstanceMethodProcessor(method, JavaPreferencesSettings.getCodeGenerationSettings(selectionCu.getJavaProject()))); assertNotNull("refactoring should be created", ref); RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor()); @@ -206,7 +206,7 @@ public class MoveInstanceMethodTests extends RefactoringTest { ISourceRange selection= TextRangeUtil.getSelection(selectionCu, startLine, startColumn, endLine, endColumn); IMethod method= getMethod(selectionCu, selection); assertNotNull(method); - MoveInstanceMethodRefactoring ref= MoveInstanceMethodRefactoring.create(method, JavaPreferencesSettings.getCodeGenerationSettings(selectionCu.getJavaProject())); + MoveInstanceMethodRefactoring ref= new MoveInstanceMethodRefactoring(new MoveInstanceMethodProcessor(method, JavaPreferencesSettings.getCodeGenerationSettings(selectionCu.getJavaProject()))); assertNotNull("refactoring should be created", ref); RefactoringStatus preconditionResult= ref.checkInitialConditions(new NullProgressMonitor()); diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java index 7c17302071..9d810a2d70 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/MoveMembersTests.java @@ -24,6 +24,7 @@ import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.ui.tests.refactoring.infra.DebugUtils; +import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester; import org.eclipse.jdt.internal.corext.refactoring.structure.MoveStaticMembersProcessor; import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings; @@ -63,7 +64,7 @@ public class MoveMembersTests extends RefactoringTest { IJavaProject project= null; if (members != null && members.length > 0) project= members[0].getJavaProject(); - MoveStaticMembersProcessor processor= MoveStaticMembersProcessor.create(members, JavaPreferencesSettings.getCodeGenerationSettings(project)); + MoveStaticMembersProcessor processor= (RefactoringAvailabilityTester.isMoveStaticMembersAvailable(members) ? new MoveStaticMembersProcessor(members, JavaPreferencesSettings.getCodeGenerationSettings(project)) : null); if (processor == null) return null; processor.setDestinationTypeFullyQualifiedName(destination); diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java index de655a5d21..10c14b7d3f 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/RenameParametersTests.java @@ -22,6 +22,7 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.internal.corext.refactoring.ParameterInfo; +import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester; import org.eclipse.jdt.internal.corext.refactoring.structure.ChangeSignatureRefactoring; import org.eclipse.ltk.core.refactoring.RefactoringStatus; @@ -65,7 +66,7 @@ public class RenameParametersTests extends RefactoringTest{ ICompilationUnit cu= createCUfromTestFile(getPackageP(), true, true); IType classA= getType(cu, "A"); IMethod method= classA.getMethod("m", signature); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); //ref.setUpdateReferences(updateReferences); //ref.setNewParameterNames(newNames); //ref.setNewNames(createRenamings(method, newNames)); @@ -86,7 +87,7 @@ public class RenameParametersTests extends RefactoringTest{ IType classA= getType(createCUfromTestFile(getPackageP(), false, false), "A"); //DebugUtils.dump("classA" + classA); IMethod method= classA.getMethod("m", signature); - ChangeSignatureRefactoring ref= ChangeSignatureRefactoring.create(method); + ChangeSignatureRefactoring ref= (RefactoringAvailabilityTester.isChangeSignatureAvailable(method) ? new ChangeSignatureRefactoring(method) : null); modifyInfos(ref.getParameterInfos(), newNames); RefactoringStatus result= performRefactoring(ref); diff --git a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java index e8577eb0cd..835ed3d9e5 100644 --- a/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java +++ b/org.eclipse.jdt.ui.tests.refactoring/test cases/org/eclipse/jdt/ui/tests/refactoring/reorg/AbstractMoveStaticMemberPrefTest.java @@ -15,6 +15,7 @@ import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.internal.corext.refactoring.RefactoringAvailabilityTester; import org.eclipse.jdt.internal.corext.refactoring.structure.MoveStaticMembersProcessor; import org.eclipse.jdt.internal.ui.preferences.JavaPreferencesSettings; @@ -32,9 +33,8 @@ public class AbstractMoveStaticMemberPrefTest extends RepeatingRefactoringPerfor ICompilationUnit cunit= generateSources(numberOfCus, numberOfRefs); IType type= cunit.findPrimaryType(); IMember member= type.getField("VALUE"); - MoveStaticMembersProcessor processor= MoveStaticMembersProcessor.create( - new IMember[] {member}, - JavaPreferencesSettings.getCodeGenerationSettings(cunit.getJavaProject())); + IMember[] elements= new IMember[] {member}; + MoveStaticMembersProcessor processor= (RefactoringAvailabilityTester.isMoveStaticMembersAvailable(elements) ? new MoveStaticMembersProcessor(elements, JavaPreferencesSettings.getCodeGenerationSettings(cunit.getJavaProject())) : null); IPackageFragment destPack= fTestProject.getSourceFolder().createPackageFragment("destination", false, null); StringBuffer buf= new StringBuffer(); buf.append("package destination;\n"); -- cgit v1.2.3