diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureBaseTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureBaseTest.java index 98312eee8e8a..c2ba39a70750 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureBaseTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureBaseTest.java @@ -46,28 +46,22 @@ public abstract class ChangeSignatureBaseTest extends LightRefactoringTestCase { @Nullable final String[] parameters, @Nullable final String[] exceptions, boolean delegate) { - GenParams genParams = parameters == null ? new SimpleParameterGen() : new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - ParameterInfoImpl[] parameterInfos = new ParameterInfoImpl[parameters.length]; - for (int i = 0; i < parameters.length; i++) { - PsiType type = myFactory.createTypeFromText(parameters[i], method); - parameterInfos[i] = new ParameterInfoImpl(-1, "p" + (i + 1), type); - } - return parameterInfos; + GenParams genParams = parameters == null ? new SimpleParameterGen() : method -> { + ParameterInfoImpl[] parameterInfos = new ParameterInfoImpl[parameters.length]; + for (int i = 0; i < parameters.length; i++) { + PsiType type = myFactory.createTypeFromText(parameters[i], method); + parameterInfos[i] = new ParameterInfoImpl(-1, "p" + (i + 1), type); } + return parameterInfos; }; - GenExceptions genExceptions = exceptions == null ? new SimpleExceptionsGen() : new GenExceptions() { - @Override - public ThrownExceptionInfo[] genExceptions(PsiMethod method) throws IncorrectOperationException { - ThrownExceptionInfo[] exceptionInfos = new ThrownExceptionInfo[exceptions.length]; - for (int i = 0; i < exceptions.length; i++) { - PsiType type = myFactory.createTypeFromText(exceptions[i], method); - exceptionInfos[i] = new JavaThrownExceptionInfo(-1, (PsiClassType)type); - } - return exceptionInfos; + GenExceptions genExceptions = exceptions == null ? new SimpleExceptionsGen() : method -> { + ThrownExceptionInfo[] exceptionInfos = new ThrownExceptionInfo[exceptions.length]; + for (int i = 0; i < exceptions.length; i++) { + PsiType type = myFactory.createTypeFromText(exceptions[i], method); + exceptionInfos[i] = new JavaThrownExceptionInfo(-1, (PsiClassType)type); } + return exceptionInfos; }; doTest(null, null, returnType, genParams, genExceptions, delegate); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java index f34b14db5cb4..f4647486699d 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureGestureTest.java @@ -102,34 +102,28 @@ public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase } public void testOnAnotherMethod() { - doTest(new Runnable() { - @Override - public void run() { - myFixture.type("int param"); - final int nextMethodOffset = ((PsiJavaFile)myFixture.getFile()).getClasses()[0].getMethods()[1].getTextOffset(); - myFixture.getEditor().getCaretModel().moveToOffset(nextMethodOffset); - } + doTest(() -> { + myFixture.type("int param"); + final int nextMethodOffset = ((PsiJavaFile)myFixture.getFile()).getClasses()[0].getMethods()[1].getTextOffset(); + myFixture.getEditor().getCaretModel().moveToOffset(nextMethodOffset); }, false, ChangeSignatureDetectorAction.CHANGE_SIGNATURE); } public void testAddParamChangeReturnType() { - doTest(new Runnable() { - @Override - public void run() { - myFixture.type("int param"); - CaretModel model = myFixture.getEditor().getCaretModel(); - PsiElement element = myFixture.getElementAtCaret(); - PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false); - assertTrue(method != null); - PsiTypeElement returnTypeElement = method.getReturnTypeElement(); - assertTrue(returnTypeElement != null); - model.moveToOffset(returnTypeElement.getTextRange().getEndOffset()); - int i = returnTypeElement.getTextLength(); - while (i-- > 0) { - myFixture.type('\b'); - } - myFixture.type("boolean"); + doTest(() -> { + myFixture.type("int param"); + CaretModel model = myFixture.getEditor().getCaretModel(); + PsiElement element = myFixture.getElementAtCaret(); + PsiMethod method = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false); + assertTrue(method != null); + PsiTypeElement returnTypeElement = method.getReturnTypeElement(); + assertTrue(returnTypeElement != null); + model.moveToOffset(returnTypeElement.getTextRange().getEndOffset()); + int i = returnTypeElement.getTextLength(); + while (i-- > 0) { + myFixture.type('\b'); } + myFixture.type("boolean"); }, true, ChangeSignatureDetectorAction.CHANGE_SIGNATURE); } @@ -154,12 +148,7 @@ public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase } private void doTypingTest(final String param, final String hint) { - doTest(new Runnable() { - @Override - public void run() { - myFixture.type(param); - } - }, true, hint); + doTest(() -> myFixture.type(param), true, hint); } public void testReturnValue() { @@ -175,12 +164,7 @@ public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase } private void doTypingNoBorderTest(final String param) { - doTest(new Runnable() { - @Override - public void run() { - myFixture.type(param); - } - }, false, ChangeSignatureDetectorAction.CHANGE_SIGNATURE); + doTest(() -> myFixture.type(param), false, ChangeSignatureDetectorAction.CHANGE_SIGNATURE); } public void testDeleteParamInSuperUsed() { @@ -188,17 +172,14 @@ public class ChangeSignatureGestureTest extends LightCodeInsightFixtureTestCase } private void doDeleteTest() { - doTest(new Runnable() { - @Override - public void run() { - final Editor editor = myFixture.getEditor(); - final Document document = editor.getDocument(); - final int selectionStart = editor.getSelectionModel().getSelectionStart(); - final int selectionEnd = editor.getSelectionModel().getSelectionEnd(); - CommandProcessor.getInstance().setCurrentCommandGroupId(EditorActionUtil.DELETE_COMMAND_GROUP); - document.deleteString(selectionStart, selectionEnd); - editor.getCaretModel().moveToOffset(selectionStart); - } + doTest(() -> { + final Editor editor = myFixture.getEditor(); + final Document document = editor.getDocument(); + final int selectionStart = editor.getSelectionModel().getSelectionStart(); + final int selectionEnd = editor.getSelectionModel().getSelectionEnd(); + CommandProcessor.getInstance().setCurrentCommandGroupId(EditorActionUtil.DELETE_COMMAND_GROUP); + document.deleteString(selectionStart, selectionEnd); + editor.getCaretModel().moveToOffset(selectionStart); }, true, ChangeSignatureDetectorAction.CHANGE_SIGNATURE); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java index cf55a99acab0..1417f2a636cd 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignaturePropagationTest.java @@ -34,7 +34,7 @@ public class ChangeSignaturePropagationTest extends LightRefactoringTestCase { public void testParamTypeSubst() throws Exception { final PsiMethod method = getPrimaryMethod(); - final HashSet methods = new HashSet(); + final HashSet methods = new HashSet<>(); for (PsiReference reference : ReferencesSearch.search(method)) { final PsiMethod psiMethod = PsiTreeUtil.getParentOfType(reference.getElement(), PsiMethod.class); if (psiMethod != null) { @@ -63,7 +63,7 @@ public class ChangeSignaturePropagationTest extends LightRefactoringTestCase { } private static HashSet collectNonPhysicalMethodsToPropagate(PsiMethod method) { - final HashSet methodsToPropagate = new HashSet(); + final HashSet methodsToPropagate = new HashSet<>(); final PsiReference[] references = MethodReferencesSearch.search(method, GlobalSearchScope.allScope(getProject()), true).toArray(PsiReference.EMPTY_ARRAY); for (PsiReference reference : references) { @@ -91,7 +91,7 @@ public class ChangeSignaturePropagationTest extends LightRefactoringTestCase { } private static HashSet collectDefaultConstructorsToPropagate(PsiMethod method) { - final HashSet methodsToPropagate = new HashSet(); + final HashSet methodsToPropagate = new HashSet<>(); for (PsiClass inheritor : ClassInheritorsSearch.search(method.getContainingClass())) { methodsToPropagate.add(inheritor.getConstructors()[0]); } @@ -105,7 +105,7 @@ public class ChangeSignaturePropagationTest extends LightRefactoringTestCase { private void parameterPropagationTest(final PsiClassType paramType) throws Exception { final PsiMethod method = getPrimaryMethod(); - parameterPropagationTest(method, new HashSet(Arrays.asList(method.getContainingClass().getMethods())), + parameterPropagationTest(method, new HashSet<>(Arrays.asList(method.getContainingClass().getMethods())), paramType); } @@ -116,7 +116,7 @@ public class ChangeSignaturePropagationTest extends LightRefactoringTestCase { private void exceptionPropagationTest() throws Exception { final PsiMethod method = getPrimaryMethod(); - exceptionPropagationTest(method, new HashSet(Arrays.asList(method.getContainingClass().getMethods()))); + exceptionPropagationTest(method, new HashSet<>(Arrays.asList(method.getContainingClass().getMethods()))); } private void exceptionPropagationTest(final PsiMethod method, final Set methodsToPropagateExceptions) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java index e9882d2c89e2..c0147110faca 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ChangeSignatureTest.java @@ -54,38 +54,23 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { } public void testGenericTypes() { - doTest(null, null, "T", new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(-1, "x", myFactory.createTypeFromText("T", method.getParameterList()), "null"), - new ParameterInfoImpl(-1, "y", myFactory.createTypeFromText("C", method.getParameterList()), "null") - }; - } + doTest(null, null, "T", method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(-1, "x", myFactory.createTypeFromText("T", method.getParameterList()), "null"), + new ParameterInfoImpl(-1, "y", myFactory.createTypeFromText("C", method.getParameterList()), "null") }, false); } public void testGenericTypesInOldParameters() { - doTest(null, null, null, new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(0, "t", myFactory.createTypeFromText("T", method), null) - }; - } + doTest(null, null, null, method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(0, "t", myFactory.createTypeFromText("T", method), null) }, false); } public void testTypeParametersInMethod() { - doTest(null, null, null, new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(-1, "t", myFactory.createTypeFromText("T", method.getParameterList()), "null"), - new ParameterInfoImpl(-1, "u", myFactory.createTypeFromText("U", method.getParameterList()), "null"), - new ParameterInfoImpl(-1, "cu", myFactory.createTypeFromText("C", method.getParameterList()), "null") - }; - } + doTest(null, null, null, method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(-1, "t", myFactory.createTypeFromText("T", method.getParameterList()), "null"), + new ParameterInfoImpl(-1, "u", myFactory.createTypeFromText("U", method.getParameterList()), "null"), + new ParameterInfoImpl(-1, "cu", myFactory.createTypeFromText("C", method.getParameterList()), "null") }, false); } @@ -215,35 +200,20 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { } public void testUseAnyVariable() { - doTest(null, null, null, new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(-1, "l", myFactory.createTypeFromText("List", method), "null", true) - }; - } + doTest(null, null, null, method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(-1, "l", myFactory.createTypeFromText("List", method), "null", true) }, false); } public void testUseThisAsAnyVariable() { - doTest(null, null, null, new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(-1, "l", myFactory.createTypeFromText("List", method), "null", true) - }; - } + doTest(null, null, null, method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(-1, "l", myFactory.createTypeFromText("List", method), "null", true) }, false); } public void testUseAnyVariableAndDefault() { - doTest(null, null, null, new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(-1, "c", myFactory.createTypeFromText("C", method), "null", true) - }; - } + doTest(null, null, null, method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(-1, "c", myFactory.createTypeFromText("C", method), "null", true) }, false); } @@ -282,13 +252,10 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { public void testAlreadyHandled() { doTest(null, null, null, new SimpleParameterGen(new ParameterInfoImpl[0]), - new GenExceptions() { - @Override - public ThrownExceptionInfo[] genExceptions(PsiMethod method) { - return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.lang.Exception", method.getResolveScope())) - }; - } + method -> { + return new ThrownExceptionInfo[]{ + new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.lang.Exception", method.getResolveScope())) + }; }, false ); @@ -296,13 +263,10 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { public void testConstructorException() { doTest(null, null, null, new SimpleParameterGen(new ParameterInfoImpl[0]), - new GenExceptions() { - @Override - public ThrownExceptionInfo[] genExceptions(PsiMethod method) { - return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.io.IOException", method.getResolveScope())) - }; - } + method -> { + return new ThrownExceptionInfo[]{ + new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.io.IOException", method.getResolveScope())) + }; }, false ); @@ -310,13 +274,10 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { public void testAddRuntimeException() { doTest(null, null, null, new SimpleParameterGen(new ParameterInfoImpl[0]), - new GenExceptions() { - @Override - public ThrownExceptionInfo[] genExceptions(PsiMethod method) { - return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.lang.RuntimeException", method.getResolveScope())) - }; - } + method -> { + return new ThrownExceptionInfo[]{ + new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.lang.RuntimeException", method.getResolveScope())) + }; }, false ); @@ -324,13 +285,10 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { public void testAddException() { doTest(null, null, null, new SimpleParameterGen(new ParameterInfoImpl[0]), - new GenExceptions() { - @Override - public ThrownExceptionInfo[] genExceptions(PsiMethod method) { - return new ThrownExceptionInfo[]{ - new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.lang.Exception", method.getResolveScope())) - }; - } + method -> { + return new ThrownExceptionInfo[]{ + new JavaThrownExceptionInfo(-1, myFactory.createTypeByFQClassName("java.lang.Exception", method.getResolveScope())) + }; }, false ); @@ -357,14 +315,9 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { } public void testReplaceVarargWithArray() { - doTest(null, null, null, new GenParams() { - @Override - public ParameterInfoImpl[] genParams(PsiMethod method) throws IncorrectOperationException { - return new ParameterInfoImpl[]{ - new ParameterInfoImpl(1, "l", myFactory.createTypeFromText("List[]", method.getParameterList()), "null", false), - new ParameterInfoImpl(0, "s", myFactory.createTypeFromText("String", method.getParameterList())) - }; - } + doTest(null, null, null, method -> new ParameterInfoImpl[]{ + new ParameterInfoImpl(1, "l", myFactory.createTypeFromText("List[]", method.getParameterList()), "null", false), + new ParameterInfoImpl(0, "s", myFactory.createTypeFromText("String", method.getParameterList())) }, false); } @@ -405,7 +358,7 @@ public class ChangeSignatureTest extends ChangeSignatureBaseTest { final PsiMethod[] callers = containingClass.findMethodsByName("caller", false); assertTrue(callers.length > 0); final PsiMethod caller = callers[0]; - final HashSet propagateParametersMethods = new HashSet(); + final HashSet propagateParametersMethods = new HashSet<>(); propagateParametersMethods.add(caller); final PsiParameter[] parameters = method.getParameterList().getParameters(); new ChangeSignatureProcessor(getProject(), method, false, null, method.getName(), diff --git a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java index 1d0751c4ddcf..4f3b34a328ff 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/CopyClassTest.java @@ -74,16 +74,10 @@ public class CopyClassTest extends CodeInsightTestCase { private PsiElement performAction(final String oldName, final String copyName) throws IncorrectOperationException { final PsiClass oldClass = JavaPsiFacade.getInstance(myProject).findClass(oldName, ProjectScope.getAllScope(myProject)); - return WriteCommandAction.runWriteCommandAction(null, new Computable(){ - @Override - public PsiElement compute() { - return CopyClassesHandler.doCopyClasses( - Collections.singletonMap(oldClass.getNavigationElement().getContainingFile(), new PsiClass[]{oldClass}), copyName, - myPsiManager.findDirectory(myRootDir), - myProject); - - } - }); + return WriteCommandAction.runWriteCommandAction(null, (Computable)() -> CopyClassesHandler.doCopyClasses( + Collections.singletonMap(oldClass.getNavigationElement().getContainingFile(), new PsiClass[]{oldClass}), copyName, + myPsiManager.findDirectory(myRootDir), + myProject)); } public void testPackageLocalClasses() throws Exception { @@ -101,7 +95,7 @@ public class CopyClassTest extends CodeInsightTestCase { PsiTestUtil.removeAllRoots(myModule, IdeaTestUtil.getMockJdk17()); VirtualFile rootDir = PsiTestUtil.createTestProjectStructure(myProject, myModule, rootBefore, myFilesToDelete); - final HashMap map = new HashMap(); + final HashMap map = new HashMap<>(); final VirtualFile sourceDir = rootDir.findChild("p1"); for (VirtualFile file : sourceDir.getChildren()) { final PsiFile psiFile = myPsiManager.findFile(file); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/DndMoveTest.java b/java/java-tests/testSrc/com/intellij/refactoring/DndMoveTest.java index ee971c4e42e2..ebbf7b6ff199 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/DndMoveTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/DndMoveTest.java @@ -36,23 +36,11 @@ public class DndMoveTest extends CodeInsightTestCase { } public void testPublicJavaClass() throws Exception { - doTest("d", new Computable() { - @Nullable - @Override - public PsiElement compute() { - return getJavaFacade().findClass("d.MyClass"); - } - }, true); + doTest("d", () -> getJavaFacade().findClass("d.MyClass"), true); } public void testSecondJavaClass() throws Exception { - doTest("d", new Computable() { - @Nullable - @Override - public PsiElement compute() { - return getJavaFacade().findClass("d.Second"); - } - }, false); + doTest("d", () -> getJavaFacade().findClass("d.Second"), false); } private void doTest(final String targetDirName, final Computable source, final boolean expected) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java index 863e162eff6a..329ab69e9d1d 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/EncapsulateFieldsTest.java @@ -77,15 +77,12 @@ public class EncapsulateFieldsTest extends MultiFileTestCase{ } public void testMoveJavadocToGetter() throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - final PsiClass aClass = myJavaFacade.findClass("A", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Tested class not found", aClass); - final PsiField field = aClass.findFieldByName("i", false); - assertNotNull(field); - doTest(aClass, field, null, true, true); - } + doTest((rootDir, rootAfter) -> { + final PsiClass aClass = myJavaFacade.findClass("A", GlobalSearchScope.projectScope(myProject)); + assertNotNull("Tested class not found", aClass); + final PsiField field = aClass.findFieldByName("i", false); + assertNotNull(field); + doTest(aClass, field, null, true, true); }); } @@ -106,16 +103,13 @@ public class EncapsulateFieldsTest extends MultiFileTestCase{ } private void doTest(final String fieldName, final String className, final String conflicts) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.projectScope(myProject)); - assertNotNull("Tested class not found", aClass); + assertNotNull("Tested class not found", aClass); - doTest(aClass, aClass.findFieldByName(fieldName, false), conflicts, true, true); - } + doTest(aClass, aClass.findFieldByName(fieldName, false), conflicts, true, true); }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractClassTest.java index 812b2ab0646f..e476963b1c3c 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractClassTest.java @@ -67,18 +67,15 @@ public class ExtractClassTest extends MultiFileTestCase{ private void doTestMethod(final String methodName, final String conflicts, final String qualifiedName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass(qualifiedName, GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass(qualifiedName, GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final ArrayList methods = new ArrayList(); - methods.add(aClass.findMethodsByName(methodName, false)[0]); - - doTest(aClass, methods, new ArrayList(), conflicts, false); - } + final ArrayList methods = new ArrayList<>(); + methods.add(aClass.findMethodsByName(methodName, false)[0]); + + doTest(aClass, methods, new ArrayList<>(), conflicts, false); }); } @@ -151,21 +148,18 @@ public class ExtractClassTest extends MultiFileTestCase{ } private void doTestFieldAndMethod(final String methodName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final ArrayList methods = new ArrayList(); - methods.add(aClass.findMethodsByName(methodName, false)[0]); + final ArrayList methods = new ArrayList<>(); + methods.add(aClass.findMethodsByName(methodName, false)[0]); - final ArrayList fields = new ArrayList(); - fields.add(aClass.findFieldByName("myT", false)); + final ArrayList fields = new ArrayList<>(); + fields.add(aClass.findFieldByName("myT", false)); - doTest(aClass, methods, fields, null, false); - } + doTest(aClass, methods, fields, null, false); }); } @@ -174,27 +168,24 @@ public class ExtractClassTest extends MultiFileTestCase{ } private void doTestField(final String conflicts, final boolean generateGettersSetters) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final ArrayList methods = new ArrayList(); + final ArrayList methods = new ArrayList<>(); - final ArrayList fields = new ArrayList(); - fields.add(aClass.findFieldByName("myT", false)); + final ArrayList fields = new ArrayList<>(); + fields.add(aClass.findFieldByName("myT", false)); - doTest(aClass, methods, fields, conflicts, generateGettersSetters); - } + doTest(aClass, methods, fields, conflicts, generateGettersSetters); }); } private static void doTest(final PsiClass aClass, final ArrayList methods, final ArrayList fields, final String conflicts, boolean generateGettersSetters) { try { - ExtractClassProcessor processor = new ExtractClassProcessor(aClass, fields, methods, new ArrayList(), StringUtil.getPackageName(aClass.getQualifiedName()), null, + ExtractClassProcessor processor = new ExtractClassProcessor(aClass, fields, methods, new ArrayList<>(), StringUtil.getPackageName(aClass.getQualifiedName()), null, "Extracted", null, generateGettersSetters, Collections.emptyList()); processor.run(); LocalFileSystem.getInstance().refresh(false); @@ -233,39 +224,33 @@ public class ExtractClassTest extends MultiFileTestCase{ } public void testPublicFieldDelegation() throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final ArrayList fields = new ArrayList(); - fields.add(aClass.findFieldByName("myT", false)); + final ArrayList fields = new ArrayList<>(); + fields.add(aClass.findFieldByName("myT", false)); - ExtractClassProcessor processor = new ExtractClassProcessor(aClass, fields, new ArrayList(), new ArrayList(), "", "Extracted"); - processor.run(); - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); - } + ExtractClassProcessor processor = new ExtractClassProcessor(aClass, fields, new ArrayList<>(), new ArrayList<>(), "", "Extracted"); + processor.run(); + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); }); } private void doTestInnerClass() throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final ArrayList classes = new ArrayList(); - classes.add(aClass.findInnerClassByName("Inner", false)); - ExtractClassProcessor processor = new ExtractClassProcessor(aClass, new ArrayList(), new ArrayList(), classes, "", "Extracted"); - processor.run(); - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); - } + final ArrayList classes = new ArrayList<>(); + classes.add(aClass.findInnerClassByName("Inner", false)); + ExtractClassProcessor processor = new ExtractClassProcessor(aClass, new ArrayList<>(), new ArrayList<>(), classes, "", "Extracted"); + processor.run(); + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); }); } @@ -302,25 +287,22 @@ public class ExtractClassTest extends MultiFileTestCase{ } public void testPublicVisibility() throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final ArrayList methods = new ArrayList(); - methods.add(aClass.findMethodsByName("foos", false)[0]); + final ArrayList methods = new ArrayList<>(); + methods.add(aClass.findMethodsByName("foos", false)[0]); - final ArrayList fields = new ArrayList(); - fields.add(aClass.findFieldByName("myT", false)); + final ArrayList fields = new ArrayList<>(); + fields.add(aClass.findFieldByName("myT", false)); - final ExtractClassProcessor processor = - new ExtractClassProcessor(aClass, fields, methods, new ArrayList(), "", null, "Extracted", PsiModifier.PUBLIC, false, Collections.emptyList()); - processor.run(); - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); - } + final ExtractClassProcessor processor = + new ExtractClassProcessor(aClass, fields, methods, new ArrayList<>(), "", null, "Extracted", PsiModifier.PUBLIC, false, Collections.emptyList()); + processor.run(); + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); }); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java index c6b811c693ba..174e6c554053 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractEnumTest.java @@ -144,53 +144,50 @@ public class ExtractEnumTest extends MultiFileTestCase { private void doTest(final String conflicts, final boolean generateAccessors, final RefactoringTestUtil.MemberDescriptor... memberDescriptors) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - final PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); - assertNotNull("Class Test not found", aClass); + doTest((rootDir, rootAfter) -> { + final PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(myProject)); + assertNotNull("Class Test not found", aClass); - final ArrayList fields = new ArrayList(); - final ArrayList methods = new ArrayList(); - final List enumConstants = new ArrayList(); - for (MemberInfo memberInfo : RefactoringTestUtil.findMembers(aClass, memberDescriptors)) { - final PsiMember member = memberInfo.getMember(); - if (member instanceof PsiField) { - fields.add((PsiField)member); - if (member.hasModifierProperty(PsiModifier.STATIC) && member.hasModifierProperty(PsiModifier.FINAL) && ((PsiField)member).hasInitializer()) { - if (memberInfo.isToAbstract()) { - enumConstants.add(memberInfo); - memberInfo.setChecked(true); - } + final ArrayList fields = new ArrayList<>(); + final ArrayList methods = new ArrayList<>(); + final List enumConstants = new ArrayList<>(); + for (MemberInfo memberInfo : RefactoringTestUtil.findMembers(aClass, memberDescriptors)) { + final PsiMember member = memberInfo.getMember(); + if (member instanceof PsiField) { + fields.add((PsiField)member); + if (member.hasModifierProperty(PsiModifier.STATIC) && member.hasModifierProperty(PsiModifier.FINAL) && ((PsiField)member).hasInitializer()) { + if (memberInfo.isToAbstract()) { + enumConstants.add(memberInfo); + memberInfo.setChecked(true); } } - else if (member instanceof PsiMethod) { - methods.add((PsiMethod)member); - } } - try { - final ExtractClassProcessor processor = - new ExtractClassProcessor(aClass, fields, methods, new ArrayList(), "", null, "EEnum", - null, generateAccessors, enumConstants); + else if (member instanceof PsiMethod) { + methods.add((PsiMethod)member); + } + } + try { + final ExtractClassProcessor processor = + new ExtractClassProcessor(aClass, fields, methods, new ArrayList<>(), "", null, "EEnum", + null, generateAccessors, enumConstants); - processor.run(); - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); - } - catch (BaseRefactoringProcessor.ConflictsInTestsException e) { - if (conflicts != null) { - TreeSet expectedConflictsSet = new TreeSet(Arrays.asList(conflicts.split("\n"))); - TreeSet actualConflictsSet = new TreeSet(Arrays.asList(e.getMessage().split("\n"))); - Assert.assertEquals(expectedConflictsSet, actualConflictsSet); - return; - } - else { - fail(e.getMessage()); - } - } + processor.run(); + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); + } + catch (BaseRefactoringProcessor.ConflictsInTestsException e) { if (conflicts != null) { - fail("Conflicts were not detected: " + conflicts); + TreeSet expectedConflictsSet = new TreeSet(Arrays.asList(conflicts.split("\n"))); + TreeSet actualConflictsSet = new TreeSet(Arrays.asList(e.getMessage().split("\n"))); + Assert.assertEquals(expectedConflictsSet, actualConflictsSet); + return; } + else { + fail(e.getMessage()); + } + } + if (conflicts != null) { + fail("Conflicts were not detected: " + conflicts); } }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java index 994c4b66a211..e638a6207263 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectTest.java @@ -41,10 +41,8 @@ public class ExtractMethodObjectTest extends LightRefactoringTestCase { extractProcessor.prepare(); extractProcessor.testPrepare(); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); - } + ApplicationManager.getApplication().runWriteAction(() -> { + ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); }); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java index 0f1dd9f14b61..36af78daa0f6 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractMethodObjectWithMultipleExitPointsTest.java @@ -48,10 +48,8 @@ public class ExtractMethodObjectWithMultipleExitPointsTest extends LightRefactor processor.setCreateInnerClass(createInnerClass); - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); - } + ApplicationManager.getApplication().runWriteAction(() -> { + ExtractMethodObjectHandler.run(getProject(), getEditor(), processor, extractProcessor); }); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java index 2d89d8cf4106..11a198d021e5 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ExtractSuperClassTest.java @@ -174,7 +174,7 @@ public class ExtractSuperClassTest extends RefactoringTestCase { newClassName, psiClass, members, false, - new DocCommentPolicy(DocCommentPolicy.ASIS)); + new DocCommentPolicy<>(DocCommentPolicy.ASIS)); final PsiPackage targetPackage; if (targetDirectory != null) { targetPackage = JavaDirectoryService.getInstance().getPackage(targetDirectory); @@ -184,18 +184,14 @@ public class ExtractSuperClassTest extends RefactoringTestCase { } final PsiClass superClass = psiClass.getExtendsListTypes().length > 0 ? psiClass.getSuperClass() : null; final MultiMap conflictsMap = - PullUpConflictsUtil.checkConflicts(members, psiClass, superClass, targetPackage, targetDirectory, new InterfaceContainmentVerifier() { - @Override - public boolean checkedInterfacesContain(PsiMethod psiMethod) { - return PullUpProcessor.checkedInterfacesContain(Arrays.asList(members), psiMethod); - } - }, false); + PullUpConflictsUtil.checkConflicts(members, psiClass, superClass, targetPackage, targetDirectory, + psiMethod -> PullUpProcessor.checkedInterfacesContain(Arrays.asList(members), psiMethod), false); if (conflicts != null) { if (conflictsMap.isEmpty()) { fail("Conflicts were not detected"); } - final HashSet expectedConflicts = new HashSet(Arrays.asList(conflicts)); - final HashSet actualConflicts = new HashSet(conflictsMap.values()); + final HashSet expectedConflicts = new HashSet<>(Arrays.asList(conflicts)); + final HashSet actualConflicts = new HashSet<>(conflictsMap.values()); assertEquals(expectedConflicts.size(), actualConflicts.size()); for (String actualConflict : actualConflicts) { if (!expectedConflicts.contains(actualConflict)) { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/FixMethodJavadocTest.java b/java/java-tests/testSrc/com/intellij/refactoring/FixMethodJavadocTest.java index 0a8937f7bcb0..80f3f498dea8 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/FixMethodJavadocTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/FixMethodJavadocTest.java @@ -32,7 +32,7 @@ public abstract class FixMethodJavadocTest extends FileSetTestCase { final PsiManager manager = PsiManager.getInstance(myProject); final PsiElementFactory factory = JavaPsiFacade.getInstance(manager.getProject()).getElementFactory(); final PsiMethod method = factory.createMethodFromText(data[0], null); - final HashSet newParameters = new HashSet(); + final HashSet newParameters = new HashSet<>(); if (data.length == 2) { final String[] strings = data[1].split("\\s+"); collectNewParameters(method, strings, newParameters); @@ -42,7 +42,7 @@ public abstract class FixMethodJavadocTest extends FileSetTestCase { } private void collectNewParameters(PsiMethod method, String[] names, Set newParameters) { - Set newNames = new HashSet(Arrays.asList(names)); + Set newNames = new HashSet<>(Arrays.asList(names)); final PsiParameter[] parameters = method.getParameterList().getParameters(); for (int i = 0; i < parameters.length; i++) { PsiParameter parameter = parameters[i]; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java index 01068325c9ee..0734348941b6 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InheritanceToDelegationTest.java @@ -139,30 +139,27 @@ public class InheritanceToDelegationTest extends MultiFileTestCase { final String className, final String fieldName, final String innerClassName, final String baseClassName, final int[] methodIndices, final String[] delegatedInterfaceNames, final boolean delegateOtherMembers, final boolean generateGetter) { - return new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); - assertNotNull("Class " + className + " not found", aClass); - PsiClass baseClass = myJavaFacade.findClass(baseClassName, GlobalSearchScope.allScope(getProject())); - assertNotNull("Base class " + baseClassName + " not found", baseClass); - final PsiMethod[] methods = baseClass.getMethods(); - final PsiMethod[] delegatedMethods = new PsiMethod[methodIndices.length]; - for (int i = 0; i < methodIndices.length; i++) { - delegatedMethods[i] = methods[methodIndices[i]]; - } - final PsiClass[] delegatedInterfaces = new PsiClass[delegatedInterfaceNames.length]; - for (int i = 0; i < delegatedInterfaceNames.length; i++) { - String delegatedInterfaceName = delegatedInterfaceNames[i]; - PsiClass anInterface = myJavaFacade.findClass(delegatedInterfaceName, GlobalSearchScope.allScope(getProject())); - assertNotNull(anInterface); - delegatedInterfaces[i] = anInterface; - } - new InheritanceToDelegationProcessor( - myProject, - aClass, baseClass, fieldName, innerClassName, delegatedInterfaces, delegatedMethods, delegateOtherMembers, - generateGetter).run(); + return (rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); + assertNotNull("Class " + className + " not found", aClass); + PsiClass baseClass = myJavaFacade.findClass(baseClassName, GlobalSearchScope.allScope(getProject())); + assertNotNull("Base class " + baseClassName + " not found", baseClass); + final PsiMethod[] methods = baseClass.getMethods(); + final PsiMethod[] delegatedMethods = new PsiMethod[methodIndices.length]; + for (int i = 0; i < methodIndices.length; i++) { + delegatedMethods[i] = methods[methodIndices[i]]; } + final PsiClass[] delegatedInterfaces = new PsiClass[delegatedInterfaceNames.length]; + for (int i = 0; i < delegatedInterfaceNames.length; i++) { + String delegatedInterfaceName = delegatedInterfaceNames[i]; + PsiClass anInterface = myJavaFacade.findClass(delegatedInterfaceName, GlobalSearchScope.allScope(getProject())); + assertNotNull(anInterface); + delegatedInterfaces[i] = anInterface; + } + new InheritanceToDelegationProcessor( + myProject, + aClass, baseClass, fieldName, innerClassName, delegatedInterfaces, delegatedMethods, delegateOtherMembers, + generateGetter).run(); }; } @@ -170,34 +167,31 @@ public class InheritanceToDelegationTest extends MultiFileTestCase { final String className, final String fieldName, final String innerClassName, final String baseClassName, final String[] methodNames, final String[] delegatedInterfaceNames, final boolean delegateOtherMembers, final boolean generateGetter) { - return new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); - assertNotNull("Class " + className + " not found", aClass); - PsiClass baseClass = myJavaFacade.findClass(baseClassName, GlobalSearchScope.allScope(getProject())); - assertNotNull("Base class " + baseClassName + " not found", baseClass); - final PsiMethod[] delegatedMethods; - final List methodsList = new ArrayList(); - for (String name : methodNames) { - final PsiMethod[] methodsByName = baseClass.findMethodsByName(name, false); - ContainerUtil.addAll(methodsList, methodsByName); - } - delegatedMethods = methodsList.toArray(new PsiMethod[methodsList.size()]); - - final PsiClass[] delegatedInterfaces = new PsiClass[delegatedInterfaceNames.length]; - for (int i = 0; i < delegatedInterfaceNames.length; i++) { - String delegatedInterfaceName = delegatedInterfaceNames[i]; - PsiClass anInterface = myJavaFacade.findClass(delegatedInterfaceName, GlobalSearchScope.allScope(getProject())); - assertNotNull(anInterface); - delegatedInterfaces[i] = anInterface; - } - new InheritanceToDelegationProcessor( - myProject, - aClass, baseClass, fieldName, innerClassName, delegatedInterfaces, delegatedMethods, delegateOtherMembers, - generateGetter).run(); - //FileDocumentManager.getInstance().saveAllDocuments(); + return (rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); + assertNotNull("Class " + className + " not found", aClass); + PsiClass baseClass = myJavaFacade.findClass(baseClassName, GlobalSearchScope.allScope(getProject())); + assertNotNull("Base class " + baseClassName + " not found", baseClass); + final PsiMethod[] delegatedMethods; + final List methodsList = new ArrayList<>(); + for (String name : methodNames) { + final PsiMethod[] methodsByName = baseClass.findMethodsByName(name, false); + ContainerUtil.addAll(methodsList, methodsByName); } + delegatedMethods = methodsList.toArray(new PsiMethod[methodsList.size()]); + + final PsiClass[] delegatedInterfaces = new PsiClass[delegatedInterfaceNames.length]; + for (int i = 0; i < delegatedInterfaceNames.length; i++) { + String delegatedInterfaceName = delegatedInterfaceNames[i]; + PsiClass anInterface = myJavaFacade.findClass(delegatedInterfaceName, GlobalSearchScope.allScope(getProject())); + assertNotNull(anInterface); + delegatedInterfaces[i] = anInterface; + } + new InheritanceToDelegationProcessor( + myProject, + aClass, baseClass, fieldName, innerClassName, delegatedInterfaces, delegatedMethods, delegateOtherMembers, + generateGetter).run(); + //FileDocumentManager.getInstance().saveAllDocuments(); }; } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java index 701a967ad2a5..658f41934f9d 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/InlineSuperClassTest.java @@ -77,18 +77,15 @@ public class InlineSuperClassTest extends MultiFileTestCase { private void doTest(boolean fail, final boolean inlineOne) { try { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - GlobalSearchScope scope = GlobalSearchScope.allScope(myProject); - PsiClass aClass = myJavaFacade.findClass("Test", scope); - if (aClass == null) aClass = myJavaFacade.findClass("p.Test", scope); - assertNotNull("Class Test not found", aClass); - PsiClass superClass = myJavaFacade.findClass("Super", scope); - if (superClass == null) superClass = myJavaFacade.findClass("p1.Super", scope); - assertNotNull("Class Super not found", superClass); - new InlineSuperClassRefactoringProcessor(myProject, inlineOne ? aClass : null, superClass, DocCommentPolicy.ASIS, aClass).run(); - } + doTest((rootDir, rootAfter) -> { + GlobalSearchScope scope = GlobalSearchScope.allScope(myProject); + PsiClass aClass = myJavaFacade.findClass("Test", scope); + if (aClass == null) aClass = myJavaFacade.findClass("p.Test", scope); + assertNotNull("Class Test not found", aClass); + PsiClass superClass = myJavaFacade.findClass("Super", scope); + if (superClass == null) superClass = myJavaFacade.findClass("p1.Super", scope); + assertNotNull("Class Super not found", superClass); + new InlineSuperClassRefactoringProcessor(myProject, inlineOne ? aClass : null, superClass, DocCommentPolicy.ASIS, aClass).run(); }); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { @@ -105,17 +102,14 @@ public class InlineSuperClassTest extends MultiFileTestCase { } private void doTestMultipleSubclasses() { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - GlobalSearchScope scope = GlobalSearchScope.allScope(myProject); - PsiClass superClass = myJavaFacade.findClass("Super", scope); - if (superClass == null) superClass = myJavaFacade.findClass("p1.Super", scope); - assertNotNull("Class Super not found", superClass); - PsiClass target1 = myJavaFacade.findClass("Test", scope); - PsiClass target2 = myJavaFacade.findClass("Test1", scope); - new InlineSuperClassRefactoringProcessor(myProject, null, superClass, DocCommentPolicy.ASIS, target1, target2).run(); - } + doTest((rootDir, rootAfter) -> { + GlobalSearchScope scope = GlobalSearchScope.allScope(myProject); + PsiClass superClass = myJavaFacade.findClass("Super", scope); + if (superClass == null) superClass = myJavaFacade.findClass("p1.Super", scope); + assertNotNull("Class Super not found", superClass); + PsiClass target1 = myJavaFacade.findClass("Test", scope); + PsiClass target2 = myJavaFacade.findClass("Test1", scope); + new InlineSuperClassRefactoringProcessor(myProject, null, superClass, DocCommentPolicy.ASIS, target1, target2).run(); }); } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java index 387424a4ffd3..5496b11074e9 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceParameterObjectTest.java @@ -23,7 +23,6 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.vfs.LocalFileSystem; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.introduceparameterobject.IntroduceParameterObjectProcessor; @@ -48,31 +47,23 @@ public class IntroduceParameterObjectTest extends MultiFileTestCase{ } private void doTest(final boolean delegate, final boolean createInner) throws Exception { - doTest(delegate, createInner, new Function() { - @Override - public VariableData[] fun(PsiMethod psiMethod) { - return generateParams(psiMethod); - } - }); + doTest(delegate, createInner, IntroduceParameterObjectTest::generateParams); } private void doTest(final boolean delegate, final boolean createInner, final Function function) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); - assertNotNull("Class Test not found", aClass); + assertNotNull("Class Test not found", aClass); - final PsiMethod method = aClass.findMethodsByName("foo", false)[0]; - final VariableData[] datas = function.fun(method); + final PsiMethod method = aClass.findMethodsByName("foo", false)[0]; + final VariableData[] datas = function.fun(method); - IntroduceParameterObjectProcessor processor = new IntroduceParameterObjectProcessor("Param", "", null, method, datas, delegate, false, - createInner, null, false); - processor.run(); - } + IntroduceParameterObjectProcessor processor = new IntroduceParameterObjectProcessor("Param", "", null, method, datas, delegate, false, + createInner, null, false); + processor.run(); }); } @@ -134,53 +125,44 @@ public class IntroduceParameterObjectTest extends MultiFileTestCase{ } public void testSameTypeAndVarargs() throws Exception { - doTest(false, false, new Function() { - @Override - public VariableData[] fun(PsiMethod method) { - final PsiParameter[] parameters = method.getParameterList().getParameters(); + doTest(false, false, method -> { + final PsiParameter[] parameters = method.getParameterList().getParameters(); - final VariableData[] datas = new VariableData[parameters.length - 1]; - for (int i = 0; i < parameters.length - 1; i++) { - PsiParameter parameter = parameters[i]; - datas[i] = new VariableData(parameter); - datas[i].name = parameter.getName(); - datas[i].passAsParameter = true; - } - return datas; + final VariableData[] datas = new VariableData[parameters.length - 1]; + for (int i = 0; i < parameters.length - 1; i++) { + PsiParameter parameter = parameters[i]; + datas[i] = new VariableData(parameter); + datas[i].name = parameter.getName(); + datas[i].passAsParameter = true; } + return datas; }); } public void testCopyJavadoc1() throws Exception { - doTest(false, true, new Function() { - @Override - public VariableData[] fun(PsiMethod method) { - final PsiParameter[] parameters = method.getParameterList().getParameters(); + doTest(false, true, method -> { + final PsiParameter[] parameters = method.getParameterList().getParameters(); - final VariableData[] datas = new VariableData[parameters.length - 1]; - for (int i = 0; i < parameters.length - 1; i++) { - PsiParameter parameter = parameters[i]; - datas[i] = new VariableData(parameter); - datas[i].name = parameter.getName(); - datas[i].passAsParameter = true; - } - return datas; + final VariableData[] datas = new VariableData[parameters.length - 1]; + for (int i = 0; i < parameters.length - 1; i++) { + PsiParameter parameter = parameters[i]; + datas[i] = new VariableData(parameter); + datas[i].name = parameter.getName(); + datas[i].passAsParameter = true; } + return datas; }); } public void testTypeParametersWithChosenSubtype() throws Exception { - doTest(false, true, new Function() { - @Override - public VariableData[] fun(PsiMethod psiMethod) { - final PsiParameter parameter = psiMethod.getParameterList().getParameters()[0]; - final PsiClass collectionClass = getJavaFacade().findClass(CommonClassNames.JAVA_UTIL_COLLECTION); - final VariableData variableData = - new VariableData(parameter, JavaPsiFacade.getElementFactory(getProject()).createType(collectionClass)); - variableData.name = parameter.getName(); - variableData.passAsParameter = true; - return new VariableData[]{variableData}; - } + doTest(false, true, psiMethod -> { + final PsiParameter parameter = psiMethod.getParameterList().getParameters()[0]; + final PsiClass collectionClass = getJavaFacade().findClass(CommonClassNames.JAVA_UTIL_COLLECTION); + final VariableData variableData = + new VariableData(parameter, JavaPsiFacade.getElementFactory(getProject()).createType(collectionClass)); + variableData.name = parameter.getName(); + variableData.passAsParameter = true; + return new VariableData[]{variableData}; }); } @@ -198,23 +180,20 @@ public class IntroduceParameterObjectTest extends MultiFileTestCase{ private void doTestExistingClass(final String existingClassName, final String existingClassPackage, final boolean generateAccessors, final String newVisibility) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); - if (aClass == null) { - aClass = myJavaFacade.findClass("p2.Test", GlobalSearchScope.projectScope(getProject())); - } - assertNotNull("Class Test not found", aClass); - - final PsiMethod method = aClass.findMethodsByName("foo", false)[0]; - IntroduceParameterObjectProcessor processor = new IntroduceParameterObjectProcessor(existingClassName, existingClassPackage, null, method, - generateParams(method), false, true, - false, newVisibility, generateAccessors); - processor.run(); - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); + if (aClass == null) { + aClass = myJavaFacade.findClass("p2.Test", GlobalSearchScope.projectScope(getProject())); } + assertNotNull("Class Test not found", aClass); + + final PsiMethod method = aClass.findMethodsByName("foo", false)[0]; + IntroduceParameterObjectProcessor processor = new IntroduceParameterObjectProcessor(existingClassName, existingClassPackage, null, method, + generateParams(method), false, true, + false, newVisibility, generateAccessors); + processor.run(); + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableMultifileTest.java index b200906a58ef..74f7496ce24f 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/IntroduceVariableMultifileTest.java @@ -94,20 +94,17 @@ public class IntroduceVariableMultifileTest extends MultiFileTestCase { } PerformAction createAction(final String className, final IntroduceVariableBase testMe) { - return new PerformAction() { - @Override - public void performAction(VirtualFile vroot, VirtualFile rootAfter) { - final JavaPsiFacade psiManager = getJavaFacade(); - final PsiClass aClass = psiManager.findClass(className, GlobalSearchScope.allScope(myProject)); - assertTrue(className + " class not found", aClass != null); - final PsiFile containingFile = aClass.getContainingFile(); - final VirtualFile virtualFile = containingFile.getVirtualFile(); - assertTrue(virtualFile != null); - final Editor editor = createEditor(virtualFile); - setupCursorAndSelection(editor); - testMe.invoke(myProject, editor, containingFile, null); - FileDocumentManager.getInstance().saveAllDocuments(); - } + return (vroot, rootAfter) -> { + final JavaPsiFacade psiManager = getJavaFacade(); + final PsiClass aClass = psiManager.findClass(className, GlobalSearchScope.allScope(myProject)); + assertTrue(className + " class not found", aClass != null); + final PsiFile containingFile = aClass.getContainingFile(); + final VirtualFile virtualFile = containingFile.getVirtualFile(); + assertTrue(virtualFile != null); + final Editor editor = createEditor(virtualFile); + setupCursorAndSelection(editor); + testMe.invoke(myProject, editor, containingFile, null); + FileDocumentManager.getInstance().saveAllDocuments(); }; } } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/LightRefactoringParameterizedTestCase.java b/java/java-tests/testSrc/com/intellij/refactoring/LightRefactoringParameterizedTestCase.java index b822a6684373..8802f68156c4 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/LightRefactoringParameterizedTestCase.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/LightRefactoringParameterizedTestCase.java @@ -51,57 +51,44 @@ public abstract class LightRefactoringParameterizedTestCase extends LightRefacto public void runSingle() throws Throwable { final Throwable[] throwables = new Throwable[1]; - final Runnable runnable = new Runnable() { - @Override - public void run() { + final Runnable runnable = () -> { + try { + final String filePath = getBeforeFile(myFileSuffix); + configureByFile(filePath); + + final File testDir = new File(getTestDataPath(), filePath).getParentFile(); + final String afterName = getAfterFile(myFileSuffix); + final boolean conflictShouldBeFound = !new File(testDir, afterName).exists(); try { - final String filePath = getBeforeFile(myFileSuffix); - configureByFile(filePath); - - final File testDir = new File(getTestDataPath(), filePath).getParentFile(); - final String afterName = getAfterFile(myFileSuffix); - final boolean conflictShouldBeFound = !new File(testDir, afterName).exists(); - try { - perform(); - if (conflictShouldBeFound) { - fail("Conflict expected."); - } + perform(); + if (conflictShouldBeFound) { + fail("Conflict expected."); } - catch (BaseRefactoringProcessor.ConflictsInTestsException exception) { - if (!conflictShouldBeFound) { - fail("Conflict not expected"); - } else { - final File conflicts = new File(testDir, FileUtilRt.getNameWithoutExtension(myFileSuffix) + CONFLICTS_SUFFIX); - if (!conflicts.exists()) { - fail("Conflict file " + conflicts.getPath() + " not found"); - } - final VirtualFile conflictsFile = VfsUtil.findFileByIoFile(conflicts, false); - assertNotNull(conflictsFile); - assertEquals(LoadTextUtil.loadText(conflictsFile).toString(), exception.getMessage()); - } - } - + } + catch (BaseRefactoringProcessor.ConflictsInTestsException exception) { if (!conflictShouldBeFound) { - checkResultByFile(getAfterFile(myFileSuffix)); + fail("Conflict not expected"); + } else { + final File conflicts = new File(testDir, FileUtilRt.getNameWithoutExtension(myFileSuffix) + CONFLICTS_SUFFIX); + if (!conflicts.exists()) { + fail("Conflict file " + conflicts.getPath() + " not found"); + } + final VirtualFile conflictsFile = VfsUtil.findFileByIoFile(conflicts, false); + assertNotNull(conflictsFile); + assertEquals(LoadTextUtil.loadText(conflictsFile).toString(), exception.getMessage()); } } - catch (Throwable e) { - throwables[0] = e; + + if (!conflictShouldBeFound) { + checkResultByFile(getAfterFile(myFileSuffix)); } } + catch (Throwable e) { + throwables[0] = e; + } }; - invokeTestRunnable(new Runnable() { - @Override - public void run() { - CommandProcessor.getInstance().executeCommand(getProject(), new Runnable() { - @Override - public void run() { - runnable.run(); - } - }, "", null); - } - }); + invokeTestRunnable(() -> CommandProcessor.getInstance().executeCommand(getProject(), runnable::run, "", null)); if (throwables[0] != null) { throw throwables[0]; diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java index e9b48dffb6ea..ba225e2ab864 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java @@ -83,7 +83,7 @@ public class MakeClassStaticTest extends LightRefactoringTestCase { PsiElement element = TargetElementUtil.findTargetElement(myEditor, TargetElementUtil.ELEMENT_NAME_ACCEPTED); assertTrue(element instanceof PsiClass); PsiClass aClass = (PsiClass)element; - final ArrayList parametersForFields = new ArrayList(); + final ArrayList parametersForFields = new ArrayList<>(); final boolean addClassParameter = MakeStaticUtil.buildVariableData(aClass, parametersForFields); new MakeClassStaticProcessor( diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MakeMethodStaticTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MakeMethodStaticTest.java index eb82932852c3..77ef51199ab3 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MakeMethodStaticTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MakeMethodStaticTest.java @@ -248,7 +248,7 @@ public class MakeMethodStaticTest extends LightRefactoringTestCase { PsiElement element = TargetElementUtil.findTargetElement(myEditor, TargetElementUtil.ELEMENT_NAME_ACCEPTED); assertTrue(element instanceof PsiMethod); PsiMethod method = (PsiMethod) element; - final ArrayList parametersForFields = new ArrayList(); + final ArrayList parametersForFields = new ArrayList<>(); final boolean addClassParameter = MakeStaticUtil.buildVariableData(method, parametersForFields); new MakeMethodStaticProcessor( diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java index b34486fcf110..e1e66c483fc4 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MoveMembersTest.java @@ -222,11 +222,8 @@ public class MoveMembersTest extends MultiFileTestCase { final String defaultVisibility, final int... memberIndices) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - MoveMembersTest.this.performAction(sourceClassName, targetClassName, memberIndices, defaultVisibility); - } + doTest((rootDir, rootAfter) -> { + MoveMembersTest.this.performAction(sourceClassName, targetClassName, memberIndices, defaultVisibility); }, lowercaseFirstLetter); } @@ -237,14 +234,14 @@ public class MoveMembersTest extends MultiFileTestCase { assertNotNull("Class " + targetClassName + " not found", targetClass); PsiElement[] children = sourceClass.getChildren(); - ArrayList members = new ArrayList(); + ArrayList members = new ArrayList<>(); for (PsiElement child : children) { if (child instanceof PsiMember) { members.add(((PsiMember) child)); } } - LinkedHashSet memberSet = new LinkedHashSet(); + LinkedHashSet memberSet = new LinkedHashSet<>(); for (int index : memberIndices) { PsiMember member = members.get(index); assertTrue(member.hasModifierProperty(PsiModifier.STATIC)); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java index 63e92871ccf5..3e611124a549 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageAsDirectoryTest.java @@ -52,16 +52,13 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase { } public void testRenamePackage() throws Exception { - final PerformAction action = new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject); - final PsiPackage sourcePackage = psiFacade.findPackage("pack1"); - assertNotNull(sourcePackage); - - RenamePsiPackageProcessor.createRenameMoveProcessor("pack1.pack2", sourcePackage, false, false).run(); - FileDocumentManager.getInstance().saveAllDocuments(); - } + final PerformAction action = (rootDir, rootAfter) -> { + final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject); + final PsiPackage sourcePackage = psiFacade.findPackage("pack1"); + assertNotNull(sourcePackage); + + RenamePsiPackageProcessor.createRenameMoveProcessor("pack1.pack2", sourcePackage, false, false).run(); + FileDocumentManager.getInstance().saveAllDocuments(); }; doTest(action); } @@ -105,21 +102,15 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase { protected void preprocessSrcDir(PsiDirectory srcDirectory) { final PsiFile empty = srcDirectory.findFile(EMPTY_TXT); assert empty != null; - WriteCommandAction.runWriteCommandAction(null, new Runnable() { - public void run() { - empty.delete(); - } - }); + WriteCommandAction.runWriteCommandAction(null, empty::delete); } @Override protected void postProcessTargetDir(PsiDirectory targetDirectory) { final PsiDirectory subdirectory = targetDirectory.findSubdirectory(packageName); assert subdirectory != null; - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - subdirectory.createFile(EMPTY_TXT); - } + ApplicationManager.getApplication().runWriteAction(() -> { + subdirectory.createFile(EMPTY_TXT); }); } }); @@ -133,11 +124,7 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase { protected void preprocessSrcDir(PsiDirectory srcDirectory) { final PsiClass empty = JavaPsiFacade.getInstance(getProject()).findClass(FOO, GlobalSearchScope.projectScope(getProject())); assert empty != null; - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - empty.delete(); - } - }); + ApplicationManager.getApplication().runWriteAction(empty::delete); } @Override @@ -146,10 +133,8 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase { assert subdirectory != null; final PsiDirectory emptyDir = subdirectory.findSubdirectory("subPack"); assert emptyDir != null; - ApplicationManager.getApplication().runWriteAction(new Runnable() { - public void run() { - emptyDir.createFile(EMPTY_TXT); - } + ApplicationManager.getApplication().runWriteAction(() -> { + emptyDir.createFile(EMPTY_TXT); }); } }); @@ -182,12 +167,8 @@ public class MovePackageAsDirectoryTest extends MultiFileTestCase { @Override public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(myProject); - final Comparator directoryComparator = new Comparator() { - @Override - public int compare(PsiDirectory o1, PsiDirectory o2) { - return o1.getVirtualFile().getPresentableUrl().compareTo(o2.getVirtualFile().getPresentableUrl()); - } - }; + final Comparator directoryComparator = + (o1, o2) -> o1.getVirtualFile().getPresentableUrl().compareTo(o2.getVirtualFile().getPresentableUrl()); final PsiPackage sourcePackage = psiFacade.findPackage(myPackageName); assertNotNull(sourcePackage); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageMultirootTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageMultirootTest.java index 1ae0af9a8016..15083af219bb 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageMultirootTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageMultirootTest.java @@ -51,23 +51,20 @@ public class MovePackageMultirootTest extends MultiFileTestCase { } private PerformAction createAction(final String[] packageNames, final String targetPackageName) { - return new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - final PsiManager manager = PsiManager.getInstance(myProject); - PsiPackage[] sourcePackages = new PsiPackage[packageNames.length]; - for (int i = 0; i < packageNames.length; i++) { - String packageName = packageNames[i]; - sourcePackages[i] = JavaPsiFacade.getInstance(manager.getProject()).findPackage(packageName); - assertNotNull(sourcePackages[i]); - } - PsiPackage targetPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(targetPackageName); - assertNotNull(targetPackage); - new MoveClassesOrPackagesProcessor(myProject, sourcePackages, - new MultipleRootsMoveDestination(new PackageWrapper(targetPackage)), - true, true, null).run(); - FileDocumentManager.getInstance().saveAllDocuments(); + return (rootDir, rootAfter) -> { + final PsiManager manager = PsiManager.getInstance(myProject); + PsiPackage[] sourcePackages = new PsiPackage[packageNames.length]; + for (int i = 0; i < packageNames.length; i++) { + String packageName = packageNames[i]; + sourcePackages[i] = JavaPsiFacade.getInstance(manager.getProject()).findPackage(packageName); + assertNotNull(sourcePackages[i]); } + PsiPackage targetPackage = JavaPsiFacade.getInstance(manager.getProject()).findPackage(targetPackageName); + assertNotNull(targetPackage); + new MoveClassesOrPackagesProcessor(myProject, sourcePackages, + new MultipleRootsMoveDestination(new PackageWrapper(targetPackage)), + true, true, null).run(); + FileDocumentManager.getInstance().saveAllDocuments(); }; } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java index 19296b0152d9..cdcec6de4806 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/MovePackageTest.java @@ -56,12 +56,7 @@ public class MovePackageTest extends MultiFileTestCase { } private void doTest(final String[] packageNames, final String newPackageName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - MovePackageTest.this.performAction(packageNames, newPackageName); - } - }); + doTest((rootDir, rootAfter) -> MovePackageTest.this.performAction(packageNames, newPackageName)); } private void performAction(String[] packageNames, String newPackageName) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java index 195f91ad62a5..a4961a253095 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PullUpMultifileTest.java @@ -21,13 +21,11 @@ package com.intellij.refactoring; import com.intellij.JavaTestUtil; -import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.refactoring.memberPullUp.PullUpConflictsUtil; import com.intellij.refactoring.memberPullUp.PullUpProcessor; import com.intellij.refactoring.util.DocCommentPolicy; -import com.intellij.refactoring.util.classMembers.InterfaceContainmentVerifier; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; @@ -49,42 +47,35 @@ public class PullUpMultifileTest extends MultiFileTestCase { } private void doTest(final String... conflicts) throws Exception { - final MultiMap conflictsMap = new MultiMap(); - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - final PsiClass srcClass = myJavaFacade.findClass("a.A", GlobalSearchScope.allScope(myProject)); - assertTrue("Source class not found", srcClass != null); + final MultiMap conflictsMap = new MultiMap<>(); + doTest((rootDir, rootAfter) -> { + final PsiClass srcClass = myJavaFacade.findClass("a.A", GlobalSearchScope.allScope(myProject)); + assertTrue("Source class not found", srcClass != null); - final PsiClass targetClass = myJavaFacade.findClass("b.B", GlobalSearchScope.allScope(myProject)); - assertTrue("Target class not found", targetClass != null); + final PsiClass targetClass = myJavaFacade.findClass("b.B", GlobalSearchScope.allScope(myProject)); + assertTrue("Target class not found", targetClass != null); - final PsiMethod[] methods = srcClass.getMethods(); - assertTrue("No methods found", methods.length > 0); - final MemberInfo[] membersToMove = new MemberInfo[1]; - final MemberInfo memberInfo = new MemberInfo(methods[0]); - memberInfo.setChecked(true); - membersToMove[0] = memberInfo; + final PsiMethod[] methods = srcClass.getMethods(); + assertTrue("No methods found", methods.length > 0); + final MemberInfo[] membersToMove = new MemberInfo[1]; + final MemberInfo memberInfo = new MemberInfo(methods[0]); + memberInfo.setChecked(true); + membersToMove[0] = memberInfo; - final PsiDirectory targetDirectory = targetClass.getContainingFile().getContainingDirectory(); - final PsiPackage targetPackage = targetDirectory != null ? JavaDirectoryService.getInstance().getPackage(targetDirectory) : null; - conflictsMap.putAllValues( - PullUpConflictsUtil.checkConflicts(membersToMove, srcClass, targetClass, targetPackage, targetDirectory, new InterfaceContainmentVerifier() { - @Override - public boolean checkedInterfacesContain(PsiMethod psiMethod) { - return PullUpProcessor.checkedInterfacesContain(Arrays.asList(membersToMove), psiMethod); - } - })); + final PsiDirectory targetDirectory = targetClass.getContainingFile().getContainingDirectory(); + final PsiPackage targetPackage = targetDirectory != null ? JavaDirectoryService.getInstance().getPackage(targetDirectory) : null; + conflictsMap.putAllValues( + PullUpConflictsUtil.checkConflicts(membersToMove, srcClass, targetClass, targetPackage, targetDirectory, + psiMethod -> PullUpProcessor.checkedInterfacesContain(Arrays.asList(membersToMove), psiMethod))); - new PullUpProcessor(srcClass, targetClass, membersToMove, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); - } + new PullUpProcessor(srcClass, targetClass, membersToMove, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); }); if (conflicts.length != 0 && conflictsMap.isEmpty()) { fail("Conflict was not detected"); } - final HashSet values = new HashSet(conflictsMap.values()); - final HashSet expected = new HashSet(Arrays.asList(conflicts)); + final HashSet values = new HashSet<>(conflictsMap.values()); + final HashSet expected = new HashSet<>(Arrays.asList(conflicts)); assertEquals(expected.size(), values.size()); for (String value : values) { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java index a4060729835e..df5f293dc6d3 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PullUpTest.java @@ -189,7 +189,7 @@ public class PullUpTest extends LightRefactoringTestCase { private void doTest(final boolean checkMembersMovedCount, String conflictMessage, RefactoringTestUtil.MemberDescriptor... membersToFind) { - final MultiMap conflictsMap = new MultiMap(); + final MultiMap conflictsMap = new MultiMap<>(); configureByFile(BASE_PATH + getTestName(false) + ".java"); PsiElement elementAt = getFile().findElementAt(getEditor().getCaretModel().getOffset()); final PsiClass sourceClass = PsiTreeUtil.getParentOfType(elementAt, PsiClass.class); @@ -206,24 +206,17 @@ public class PullUpTest extends LightRefactoringTestCase { final MemberInfo[] infos = RefactoringTestUtil.findMembers(sourceClass, membersToFind); final int[] countMoved = {0}; - final MoveMemberListener listener = new MoveMemberListener() { - @Override - public void memberMoved(PsiClass aClass, PsiMember member) { - assertEquals(sourceClass, aClass); - countMoved[0]++; - } + final MoveMemberListener listener = (aClass, member) -> { + assertEquals(sourceClass, aClass); + countMoved[0]++; }; JavaRefactoringListenerManager.getInstance(getProject()).addMoveMembersListener(listener); final PsiDirectory targetDirectory = targetClass.getContainingFile().getContainingDirectory(); final PsiPackage targetPackage = targetDirectory != null ? JavaDirectoryService.getInstance().getPackage(targetDirectory) : null; conflictsMap.putAllValues( PullUpConflictsUtil - .checkConflicts(infos, sourceClass, targetClass, targetPackage, targetDirectory, new InterfaceContainmentVerifier() { - @Override - public boolean checkedInterfacesContain(PsiMethod psiMethod) { - return PullUpProcessor.checkedInterfacesContain(Arrays.asList(infos), psiMethod); - } - }) + .checkConflicts(infos, sourceClass, targetClass, targetPackage, targetDirectory, + psiMethod -> PullUpProcessor.checkedInterfacesContain(Arrays.asList(infos), psiMethod)) ); final PullUpProcessor helper = new PullUpProcessor(sourceClass, targetClass, infos, new DocCommentPolicy(DocCommentPolicy.ASIS)); helper.run(); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java index 1119144e887b..d046e5932cbb 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PushDownMultifileTest.java @@ -54,28 +54,25 @@ public class PushDownMultifileTest extends MultiFileTestCase { private void doTest(final boolean fail, final String sourceClassName, final String targetClassName) throws Exception { try { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - final PsiClass srcClass = myJavaFacade.findClass(sourceClassName, GlobalSearchScope.allScope(myProject)); - assertTrue("Source class not found", srcClass != null); + doTest((rootDir, rootAfter) -> { + final PsiClass srcClass = myJavaFacade.findClass(sourceClassName, GlobalSearchScope.allScope(myProject)); + assertTrue("Source class not found", srcClass != null); - final PsiClass targetClass = myJavaFacade.findClass(targetClassName, GlobalSearchScope.allScope(myProject)); - assertTrue("Target class not found", targetClass != null); + final PsiClass targetClass = myJavaFacade.findClass(targetClassName, GlobalSearchScope.allScope(myProject)); + assertTrue("Target class not found", targetClass != null); - final PsiMethod[] methods = srcClass.getMethods(); - assertTrue("No methods found", methods.length > 0); - final MemberInfo[] membersToMove = new MemberInfo[1]; - final MemberInfo memberInfo = new MemberInfo(methods[0]); - memberInfo.setChecked(true); - membersToMove[0] = memberInfo; + final PsiMethod[] methods = srcClass.getMethods(); + assertTrue("No methods found", methods.length > 0); + final MemberInfo[] membersToMove = new MemberInfo[1]; + final MemberInfo memberInfo = new MemberInfo(methods[0]); + memberInfo.setChecked(true); + membersToMove[0] = memberInfo; - new PushDownProcessor(getProject(), membersToMove, srcClass, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); + new PushDownProcessor(getProject(), membersToMove, srcClass, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); - //LocalFileSystem.getInstance().refresh(false); - //FileDocumentManager.getInstance().saveAllDocuments(); - } + //LocalFileSystem.getInstance().refresh(false); + //FileDocumentManager.getInstance().saveAllDocuments(); }); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { @@ -110,28 +107,25 @@ public class PushDownMultifileTest extends MultiFileTestCase { public void testUsagesInXml() throws Exception { try { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - final PsiClass srcClass = myJavaFacade.findClass("a.A", GlobalSearchScope.allScope(myProject)); - assertTrue("Source class not found", srcClass != null); + doTest((rootDir, rootAfter) -> { + final PsiClass srcClass = myJavaFacade.findClass("a.A", GlobalSearchScope.allScope(myProject)); + assertTrue("Source class not found", srcClass != null); - final PsiClass targetClass = myJavaFacade.findClass("b.B", GlobalSearchScope.allScope(myProject)); - assertTrue("Target class not found", targetClass != null); + final PsiClass targetClass = myJavaFacade.findClass("b.B", GlobalSearchScope.allScope(myProject)); + assertTrue("Target class not found", targetClass != null); - final PsiField[] fields = srcClass.getFields(); - assertTrue("No methods found", fields.length > 0); - final MemberInfo[] membersToMove = new MemberInfo[1]; - final MemberInfo memberInfo = new MemberInfo(fields[0]); - memberInfo.setChecked(true); - membersToMove[0] = memberInfo; + final PsiField[] fields = srcClass.getFields(); + assertTrue("No methods found", fields.length > 0); + final MemberInfo[] membersToMove = new MemberInfo[1]; + final MemberInfo memberInfo = new MemberInfo(fields[0]); + memberInfo.setChecked(true); + membersToMove[0] = memberInfo; - new PushDownProcessor(getProject(), membersToMove, srcClass, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); + new PushDownProcessor(getProject(), membersToMove, srcClass, new DocCommentPolicy(DocCommentPolicy.ASIS)).run(); - //LocalFileSystem.getInstance().refresh(false); - //FileDocumentManager.getInstance().saveAllDocuments(); - } + //LocalFileSystem.getInstance().refresh(false); + //FileDocumentManager.getInstance().saveAllDocuments(); }); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java b/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java index ed6cc2cbb1db..c828fffffd9f 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/PushDownTest.java @@ -78,7 +78,7 @@ public class PushDownTest extends LightRefactoringTestCase { assert currentClass != null; - final List membersToMove = new ArrayList(); + final List membersToMove = new ArrayList<>(); final PsiField fieldByName = currentClass.findFieldByName("fieldToMove", false); if (fieldByName != null) { @@ -109,12 +109,7 @@ public class PushDownTest extends LightRefactoringTestCase { configureByFile(BASE_PATH + getTestName(false) + ".java"); PsiClass currentClass = JavaPsiFacade.getInstance(getProject()).findClass("Test", GlobalSearchScope.projectScope(getProject())); - MemberInfoStorage memberInfoStorage = new MemberInfoStorage(currentClass, new MemberInfo.Filter() { - @Override - public boolean includeMember(PsiMember element) { - return true; - } - }); + MemberInfoStorage memberInfoStorage = new MemberInfoStorage(currentClass, element -> true); List members = memberInfoStorage.getClassMemberInfos(currentClass); for (MemberInfo member : members) { member.setChecked(true); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RemoveMiddleManTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RemoveMiddleManTest.java index 8966302e9898..e44d0051d445 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RemoveMiddleManTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RemoveMiddleManTest.java @@ -50,34 +50,31 @@ public class RemoveMiddleManTest extends MultiFileTestCase{ } private void doTest(final String conflict) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.allScope(getProject())); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.allScope(getProject())); - if (aClass == null) aClass = myJavaFacade.findClass("p.Test", GlobalSearchScope.allScope(getProject())); - assertNotNull("Class Test not found", aClass); + if (aClass == null) aClass = myJavaFacade.findClass("p.Test", GlobalSearchScope.allScope(getProject())); + assertNotNull("Class Test not found", aClass); - final PsiField field = aClass.findFieldByName("myField", false); - final Set methods = DelegationUtils.getDelegatingMethodsForField(field); - List infos = new ArrayList(); - for (PsiMethod method : methods) { - final MemberInfo info = new MemberInfo(method); - info.setChecked(true); - info.setToAbstract(true); - infos.add(info); - } - try { - RemoveMiddlemanProcessor processor = new RemoveMiddlemanProcessor(field, infos); - processor.run(); - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); - if (conflict != null) fail("Conflict expected"); - } - catch (BaseRefactoringProcessor.ConflictsInTestsException e) { - if (conflict == null) throw e; - assertEquals(conflict, e.getMessage()); - } + final PsiField field = aClass.findFieldByName("myField", false); + final Set methods = DelegationUtils.getDelegatingMethodsForField(field); + List infos = new ArrayList<>(); + for (PsiMethod method : methods) { + final MemberInfo info = new MemberInfo(method); + info.setChecked(true); + info.setToAbstract(true); + infos.add(info); + } + try { + RemoveMiddlemanProcessor processor = new RemoveMiddlemanProcessor(field, infos); + processor.run(); + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); + if (conflict != null) fail("Conflict expected"); + } + catch (BaseRefactoringProcessor.ConflictsInTestsException e) { + if (conflict == null) throw e; + assertEquals(conflict, e.getMessage()); } }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java index 272b8d6e7918..dd50af9065a6 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameClassTest.java @@ -75,20 +75,17 @@ public class RenameClassTest extends MultiFileTestCase { } private void doRenameClass(final String className, final String newName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); - assertNotNull("Class XX not found", aClass); + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass(className, GlobalSearchScope.allScope(getProject())); + assertNotNull("Class XX not found", aClass); - final RenameProcessor processor = new RenameProcessor(myProject, aClass, newName, true, true); - for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) { - processor.addRenamerFactory(factory); - } - processor.run(); - PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - FileDocumentManager.getInstance().saveAllDocuments(); + final RenameProcessor processor = new RenameProcessor(myProject, aClass, newName, true, true); + for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) { + processor.addRenamerFactory(factory); } + processor.run(); + PsiDocumentManager.getInstance(myProject).commitAllDocuments(); + FileDocumentManager.getInstance().saveAllDocuments(); }); } @@ -101,12 +98,7 @@ public class RenameClassTest extends MultiFileTestCase { } private void doTest(@NonNls final String qClassName, @NonNls final String newName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - RenameClassTest.this.performAction(qClassName, newName); - } - }); + doTest((rootDir, rootAfter) -> RenameClassTest.this.performAction(qClassName, newName)); } private void performAction(String qClassName, String newName) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java index 46c79e410e73..ff25480f187a 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameCollisionsTest.java @@ -283,7 +283,7 @@ public class RenameCollisionsTest extends LightRefactoringTestCase { PsiElement element = TargetElementUtil .findTargetElement(myEditor, TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED); assertNotNull(element); - final UsageInfo[] usageInfos = RenameUtil.findUsages(element, "newName", true, true, new HashMap()); + final UsageInfo[] usageInfos = RenameUtil.findUsages(element, "newName", true, true, new HashMap<>()); assertSize(1, usageInfos); for (UsageInfo usageInfo : usageInfos) { assertTrue(usageInfo instanceof MoveRenameUsageInfo); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameLocalTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameLocalTest.java index c8c0f781582f..590c2e41f1d4 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameLocalTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameLocalTest.java @@ -62,7 +62,7 @@ public class RenameLocalTest extends LightRefactoringTestCase { PsiElement element = TargetElementUtil .findTargetElement(myEditor, TargetElementUtil.ELEMENT_NAME_ACCEPTED | TargetElementUtil.REFERENCED_ELEMENT_ACCEPTED); assertNotNull(element); - final HashSet result = new HashSet(); + final HashSet result = new HashSet<>(); new JavaNameSuggestionProvider().getSuggestedNames(element, getFile(), result); assertTrue(result.toString(), result.contains("window")); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameMembersInplaceTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameMembersInplaceTest.java index 937fee47025f..952b410d9661 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameMembersInplaceTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameMembersInplaceTest.java @@ -90,7 +90,7 @@ public class RenameMembersInplaceTest extends LightCodeInsightTestCase { final PsiElement element = TargetElementUtil.findTargetElement(myEditor, TargetElementUtil.getInstance().getAllAccepted()); assertNotNull(element); - final Set result = new LinkedHashSet(); + final Set result = new LinkedHashSet<>(); new JavaNameSuggestionProvider().getSuggestedNames(element, getFile(), result); CodeInsightTestUtil.doInlineRename(new MemberInplaceRenameHandler(), result.iterator().next(), getEditor(), element); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java b/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java index 0bd3fc0ff24c..3befcf254d24 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/RenameMethodMultiTest.java @@ -99,41 +99,35 @@ public class RenameMethodMultiTest extends MultiFileTestCase { } private void doTest(final String className, final String methodSignature, final String newName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - final JavaPsiFacade manager = getJavaFacade(); - final PsiClass aClass = manager.findClass(className, GlobalSearchScope.moduleScope(myModule)); - assertNotNull(aClass); - final PsiMethod methodBySignature = aClass.findMethodBySignature(manager.getElementFactory().createMethodFromText( - methodSignature + "{}", null), false); - assertNotNull(methodBySignature); - final RenameProcessor renameProcessor = new RenameProcessor(myProject, methodBySignature, newName, false, false); - renameProcessor.run(); - FileDocumentManager.getInstance().saveAllDocuments(); - } + doTest((rootDir, rootAfter) -> { + final JavaPsiFacade manager = getJavaFacade(); + final PsiClass aClass = manager.findClass(className, GlobalSearchScope.moduleScope(myModule)); + assertNotNull(aClass); + final PsiMethod methodBySignature = aClass.findMethodBySignature(manager.getElementFactory().createMethodFromText( + methodSignature + "{}", null), false); + assertNotNull(methodBySignature); + final RenameProcessor renameProcessor = new RenameProcessor(myProject, methodBySignature, newName, false, false); + renameProcessor.run(); + FileDocumentManager.getInstance().saveAllDocuments(); }); } private void doAutomaticRenameMethod(final String className, final String methodSignature, final String newName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - final JavaPsiFacade manager = getJavaFacade(); - final PsiClass aClass = manager.findClass(className, GlobalSearchScope.moduleScope(myModule)); - assertNotNull(aClass); - final PsiMethod methodBySignature = aClass.findMethodBySignature(manager.getElementFactory().createMethodFromText( - methodSignature + "{}", null), false); - assertNotNull(methodBySignature); + doTest((rootDir, rootAfter) -> { + final JavaPsiFacade manager = getJavaFacade(); + final PsiClass aClass = manager.findClass(className, GlobalSearchScope.moduleScope(myModule)); + assertNotNull(aClass); + final PsiMethod methodBySignature = aClass.findMethodBySignature(manager.getElementFactory().createMethodFromText( + methodSignature + "{}", null), false); + assertNotNull(methodBySignature); - final RenameProcessor processor = new RenameProcessor(myProject, methodBySignature, newName, false, false); - for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) { - processor.addRenamerFactory(factory); - } - processor.run(); - PsiDocumentManager.getInstance(myProject).commitAllDocuments(); - FileDocumentManager.getInstance().saveAllDocuments(); + final RenameProcessor processor = new RenameProcessor(myProject, methodBySignature, newName, false, false); + for (AutomaticRenamerFactory factory : Extensions.getExtensions(AutomaticRenamerFactory.EP_NAME)) { + processor.addRenamerFactory(factory); } + processor.run(); + PsiDocumentManager.getInstance(myProject).commitAllDocuments(); + FileDocumentManager.getInstance().saveAllDocuments(); }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java index 8ecd54441f6a..8c4be9cd0ec8 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/ReplaceConstructorWithBuilderTest.java @@ -62,13 +62,13 @@ public class ReplaceConstructorWithBuilderTest extends MultiFileTestCase { } public void testConstructorChain() throws Exception { - final HashMap defaults = new HashMap(); + final HashMap defaults = new HashMap<>(); defaults.put("i", "2"); doTest(true, defaults); } public void testConstructorChainWithoutDefaults() throws Exception { - final HashMap defaults = new HashMap(); + final HashMap defaults = new HashMap<>(); defaults.put("i", "2"); defaults.put("j", null); doTest(true, defaults); @@ -102,39 +102,36 @@ public class ReplaceConstructorWithBuilderTest extends MultiFileTestCase { final Map expectedDefaults, final String conflicts, final String packageName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) throws Exception { - final PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); - assertNotNull("Class Test not found", aClass); + doTest((rootDir, rootAfter) -> { + final PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); + assertNotNull("Class Test not found", aClass); - final LinkedHashMap map = new LinkedHashMap(); - final PsiMethod[] constructors = aClass.getConstructors(); - for (PsiMethod constructor : constructors) { - ParameterData.createFromConstructor(constructor, "set", map); - } - if (expectedDefaults != null) { - for (Map.Entry entry : expectedDefaults.entrySet()) { - final ParameterData parameterData = map.get(entry.getKey()); - assertNotNull(parameterData); - assertEquals(entry.getValue(), parameterData.getDefaultValue()); - } - } - try { - new ReplaceConstructorWithBuilderProcessor(getProject(), constructors, map, "Builder", packageName, null, createNewBuilderClass).run(); - if (conflicts != null) { - fail("Conflicts were not detected:" + conflicts); - } - } - catch (BaseRefactoringProcessor.ConflictsInTestsException e) { - - if (conflicts == null) { - fail("Conflict detected:" + e.getMessage()); - } - } - LocalFileSystem.getInstance().refresh(false); - FileDocumentManager.getInstance().saveAllDocuments(); + final LinkedHashMap map = new LinkedHashMap<>(); + final PsiMethod[] constructors = aClass.getConstructors(); + for (PsiMethod constructor : constructors) { + ParameterData.createFromConstructor(constructor, "set", map); } + if (expectedDefaults != null) { + for (Map.Entry entry : expectedDefaults.entrySet()) { + final ParameterData parameterData = map.get(entry.getKey()); + assertNotNull(parameterData); + assertEquals(entry.getValue(), parameterData.getDefaultValue()); + } + } + try { + new ReplaceConstructorWithBuilderProcessor(getProject(), constructors, map, "Builder", packageName, null, createNewBuilderClass).run(); + if (conflicts != null) { + fail("Conflicts were not detected:" + conflicts); + } + } + catch (BaseRefactoringProcessor.ConflictsInTestsException e) { + + if (conflicts == null) { + fail("Conflict detected:" + e.getMessage()); + } + } + LocalFileSystem.getInstance().refresh(false); + FileDocumentManager.getInstance().saveAllDocuments(); }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java index 98a72b4e989e..f9a4701a02c6 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/SafeDeleteTest.java @@ -278,11 +278,8 @@ public class SafeDeleteTest extends MultiFileTestCase { } private void doTest(@NonNls final String qClassName) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - SafeDeleteTest.this.performAction(qClassName); - } + doTest((rootDir, rootAfter) -> { + SafeDeleteTest.this.performAction(qClassName); }); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java index 7fef2e73b6cc..017f5a7e1a72 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/TurnRefsToSuperTest.java @@ -67,11 +67,8 @@ public class TurnRefsToSuperTest extends MultiFileTestCase { //public void testForEach2() throws Exception { doTest("Test.MyIterableImpl", "Test.MyIterable", false); } private void doTest(@NonNls final String className, @NonNls final String superClassName, final boolean replaceInstanceOf) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - TurnRefsToSuperTest.this.performAction(className, superClassName, replaceInstanceOf); - } + doTest((rootDir, rootAfter) -> { + TurnRefsToSuperTest.this.performAction(className, superClassName, replaceInstanceOf); }, true); } diff --git a/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java b/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java index 5cfefaa3a065..861c5ef62b1d 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/TypeCookTest.java @@ -672,12 +672,7 @@ public class TypeCookTest extends MultiFileTestCase { } public void start(final boolean cookObjects) throws Exception { - doTest(new PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - TypeCookTest.this.performAction("Test", rootDir.getName(), cookObjects); - } - }); + doTest((rootDir, rootAfter) -> TypeCookTest.this.performAction("Test", rootDir.getName(), cookObjects)); } private void performAction(String className, String rootDir, final boolean cookObjects) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java b/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java index a6e362073bb9..c189f9bb850a 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/WrapReturnValueTest.java @@ -70,18 +70,15 @@ public class WrapReturnValueTest extends MultiFileTestCase { private void doTest(final boolean existing, String exceptionMessage, final boolean createInnerClass) { try { - doTest(new PerformAction() { - @Override - public void performAction(final VirtualFile rootDir, final VirtualFile rootAfter) { - PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); - assertNotNull("Class Test not found", aClass); - PsiMethod method = aClass.findMethodsByName("foo", false)[0]; - String wrapperClassName = "Wrapper"; - PsiClass wrapperClass = myJavaFacade.findClass(wrapperClassName, GlobalSearchScope.projectScope(getProject())); - assertTrue(!existing || wrapperClass != null); - PsiField delegateField = existing ? wrapperClass.findFieldByName("myField", false) : null; - new WrapReturnValueProcessor(wrapperClassName, "", null, method, existing, createInnerClass, delegateField).run(); - } + doTest((rootDir, rootAfter) -> { + PsiClass aClass = myJavaFacade.findClass("Test", GlobalSearchScope.projectScope(getProject())); + assertNotNull("Class Test not found", aClass); + PsiMethod method = aClass.findMethodsByName("foo", false)[0]; + String wrapperClassName = "Wrapper"; + PsiClass wrapperClass = myJavaFacade.findClass(wrapperClassName, GlobalSearchScope.projectScope(getProject())); + assertTrue(!existing || wrapperClass != null); + PsiField delegateField = existing ? wrapperClass.findFieldByName("myField", false) : null; + new WrapReturnValueProcessor(wrapperClassName, "", null, method, existing, createInnerClass, delegateField).run(); }); } catch (BaseRefactoringProcessor.ConflictsInTestsException e) { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java b/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java index 9bc39948badf..3a2ee0b0e318 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureTest.java @@ -22,120 +22,65 @@ public class ChangeClassSignatureTest extends LightRefactoringTestCase { } public void testNoParams() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "T", "java.lang.String") - }; - } + doTest(aClass -> new TypeParameterInfo[]{ + new TypeParameterInfo(aClass, "T", "java.lang.String") }); } public void testInstanceOf() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "T", "java.lang.String") - }; - } + doTest(aClass -> new TypeParameterInfo[]{ + new TypeParameterInfo(aClass, "T", "java.lang.String") }); } public void testSubstituteParamInsideClass() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[0]; - } - }); + doTest(aClass -> new TypeParameterInfo[0]); } public void testRemoveAllParams() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) { - return new TypeParameterInfo[0]; - } - }); + doTest(aClass -> new TypeParameterInfo[0]); } public void testReorderParams() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) { - return new TypeParameterInfo[] { - new TypeParameterInfo(1), - new TypeParameterInfo(0) - }; - } + doTest(aClass -> new TypeParameterInfo[] { + new TypeParameterInfo(1), + new TypeParameterInfo(0) }); } public void testAddParam() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[] { - new TypeParameterInfo(0), - new TypeParameterInfo(aClass, "E", "L") - }; - } + doTest(aClass -> new TypeParameterInfo[] { + new TypeParameterInfo(0), + new TypeParameterInfo(aClass, "E", "L") }); } public void testAddParamDiamond() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[] { - new TypeParameterInfo(0), - new TypeParameterInfo(aClass, "I", "Integer") - }; - } + doTest(aClass -> new TypeParameterInfo[] { + new TypeParameterInfo(0), + new TypeParameterInfo(aClass, "I", "Integer") }); } public void testAddOneFirst() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "T", "java.lang.String") - }; - } + doTest(aClass -> new TypeParameterInfo[]{ + new TypeParameterInfo(aClass, "T", "java.lang.String") }, "Zero.java", "OneString.java"); } public void testAddManyFirst() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[]{ - new TypeParameterInfo(aClass, "U", "SubjectFace"), - new TypeParameterInfo(aClass, "V", "java.util.Set") - }; - } + doTest(aClass -> new TypeParameterInfo[]{ + new TypeParameterInfo(aClass, "U", "SubjectFace"), + new TypeParameterInfo(aClass, "V", "java.util.Set") }, "Zero.java", "TwoSubjectFaceSetObject.java"); } public void testRemoveOneLast() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[0]; - } - }, "OneString.java", "Zero.java"); + doTest(aClass -> new TypeParameterInfo[0], "OneString.java", "Zero.java"); } public void testRemoveManyLast() throws Exception { - doTest(new GenParams() { - @Override - public TypeParameterInfo[] gen(PsiClass aClass) throws IncorrectOperationException { - return new TypeParameterInfo[0]; - } - }, "TwoSubjectFaceSetObject.java", "Zero.java"); + doTest(aClass -> new TypeParameterInfo[0], "TwoSubjectFaceSetObject.java", "Zero.java"); } private void doTest(GenParams gen) throws Exception { diff --git a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java index 541d75d42109..65cd549ecd3f 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/inline/InlineLibraryMethodTest.java @@ -51,14 +51,12 @@ public class InlineLibraryMethodTest extends RefactoringTestCase { PsiClass fileClass = getJavaFacade().findClass("mycompany.File"); assertNotNull(fileClass); final PsiFile file = fileClass.getContainingFile(); - WriteCommandAction.runWriteCommandAction(null, new Runnable() { - public void run() { - try { - ((VirtualFileSystemEntry)file.getVirtualFile()).setWritable(false); - } - catch (IOException e) { - throw new RuntimeException(e); - } + WriteCommandAction.runWriteCommandAction(null, () -> { + try { + ((VirtualFileSystemEntry)file.getVirtualFile()).setWritable(false); + } + catch (IOException e) { + throw new RuntimeException(e); } }); diff --git a/java/java-tests/testSrc/com/intellij/refactoring/migration/MigrationTest.java b/java/java-tests/testSrc/com/intellij/refactoring/migration/MigrationTest.java index 91349d6f3fec..76488a4f7780 100644 --- a/java/java-tests/testSrc/com/intellij/refactoring/migration/MigrationTest.java +++ b/java/java-tests/testSrc/com/intellij/refactoring/migration/MigrationTest.java @@ -57,12 +57,9 @@ public class MigrationTest extends MultiFileTestCase { } private MultiFileTestCase.PerformAction createAction(final MigrationMap migrationMap) { - return new MultiFileTestCase.PerformAction() { - @Override - public void performAction(VirtualFile rootDir, VirtualFile rootAfter) throws Exception { - new MigrationProcessor(myProject, migrationMap).run(); - FileDocumentManager.getInstance().saveAllDocuments(); - } + return (rootDir, rootAfter) -> { + new MigrationProcessor(myProject, migrationMap).run(); + FileDocumentManager.getInstance().saveAllDocuments(); }; }