From 3aaf90f8aad3e225c59581823d1c5895603edbae Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Mon, 25 Nov 2013 21:37:30 +0400 Subject: [PATCH] Test for renaming not base java method with base kotlin method --- .../javaWrapperForOverridenFunctionWithKotlinBase.test | 1 + .../jet/plugin/refactoring/rename/AbstractRenameTest.java | 5 ++++- .../jet/plugin/refactoring/rename/RenameTestGenerated.java | 5 +++++ 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test diff --git a/idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test b/idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test new file mode 100644 index 00000000000..478bf881750 --- /dev/null +++ b/idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test @@ -0,0 +1 @@ +// RENAME: JAVA_METHOD->testing.JavaClient.D->void first()->second \ No newline at end of file diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.java index 0f87f27ebd0..1a3e8727db4 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/AbstractRenameTest.java @@ -142,7 +142,10 @@ public abstract class AbstractRenameTest extends MultiFileTestCase { PsiMethod methodBySignature = aClass.findMethodBySignature(manager.getElementFactory().createMethodFromText(methodSignature + "{}", null), false); assertNotNull("Method with signature '" + methodSignature + "' wasn't found in class " + className, methodBySignature); - new RenameProcessor(myProject, methodBySignature, newName, false, false).run(); + PsiElement substitution = RenamePsiElementProcessor.forElement(methodBySignature).substituteElementToRename(methodBySignature, null); + assert substitution != null; + + new RenameProcessor(myProject, substitution, newName, false, false).run(); PsiDocumentManager.getInstance(myProject).commitAllDocuments(); FileDocumentManager.getInstance().saveAllDocuments(); diff --git a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java index c5411ee879f..8105502c2a5 100644 --- a/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java +++ b/idea/tests/org/jetbrains/jet/plugin/refactoring/rename/RenameTestGenerated.java @@ -53,6 +53,11 @@ public class RenameTestGenerated extends AbstractRenameTest { doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForBaseFunction.test"); } + @TestMetadata("renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test") + public void testRenameKotlinBaseMethod_JavaWrapperForOverridenFunctionWithKotlinBase() throws Exception { + doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/javaWrapperForOverridenFunctionWithKotlinBase.test"); + } + @TestMetadata("renameKotlinBaseMethod/kotlinBaseFunction.test") public void testRenameKotlinBaseMethod_KotlinBaseFunction() throws Exception { doTest("idea/testData/refactoring/rename/renameKotlinBaseMethod/kotlinBaseFunction.test");