From b2f323908bdba8c0a6e7569d083f864b384c9134 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Tue, 17 Feb 2015 21:48:14 +0300 Subject: [PATCH] Fix Android plugin rename tests --- .../jet/android/AbstractAndroidRenameTest.kt | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt index 77d004babea..21a13bf77ed 100644 --- a/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt +++ b/plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt @@ -37,35 +37,28 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() { f.copyDirectoryToProject(getResDir()!!, "res") val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt"); f.configureFromExistingVirtualFile(virtualFile) + val editor = f.getEditor() val file = f.getFile() val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file) - val element = TargetElementUtilBase.findTargetElement(completionEditor, TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED) + val element = TargetElementUtilBase.findTargetElement(completionEditor, + TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED or TargetElementUtilBase.ELEMENT_NAME_ACCEPTED) + assert(element != null) assertTrue(element is JetProperty) - // rename xml attribute by property - renameElementWithTextOccurences(element, NEW_NAME) + RenameProcessor(f.getProject(), element, NEW_NAME, false, true).run() + + // Rename xml attribute by property val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset()) assertEquals("\"@+id/$NEW_NAME\"", resolved?.getText()) - // rename property by attribute - renameElementWithTextOccurences(resolved!!, "@+id/$OLD_NAME") + // Rename property by attribute + val attributeElement = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset()) + RenameProcessor(f.getProject(), attributeElement, "@+id/$OLD_NAME", false, true).run() + assertEquals(OLD_NAME, (f.getElementAtCaret() as JetProperty).getName()) } - private fun renameElementWithTextOccurences(element: PsiElement, newName: String) { - val f = myFixture!! - object : WriteCommandAction.Simple(f.getProject()) { - protected override fun run() { - val editor = f.getEditor() - val substitution = RenamePsiElementProcessor.forElement(element).substituteElementToRename(element, editor) - RenameProcessor(f.getProject(), substitution, newName, false, true).run() - } - }.execute().throwException() - } - override fun getTestDataPath() = KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/rename/" + getTestName(true) + "/" -} - - +} \ No newline at end of file