azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Android plugin rename tests

Browse Source
This commit is contained in:
Yan Zhulanow
2015-02-17 21:48:14 +03:00
parent c756cfef86
commit b2f323908b
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
+12 -19
View File
@@ -37,35 +37,28 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
f.copyDirectoryToProject(getResDir()!!, "res") f.copyDirectoryToProject(getResDir()!!, "res")
val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt"); val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
f.configureFromExistingVirtualFile(virtualFile) f.configureFromExistingVirtualFile(virtualFile)
val editor = f.getEditor() val editor = f.getEditor()
val file = f.getFile() val file = f.getFile()
val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file) 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) assert(element != null)
assertTrue(element is JetProperty) assertTrue(element is JetProperty)
// rename xml attribute by property RenameProcessor(f.getProject(), element, NEW_NAME, false, true).run()
renameElementWithTextOccurences(element, NEW_NAME)
// Rename xml attribute by property
val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset()) val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset())
assertEquals("\"@+id/$NEW_NAME\"", resolved?.getText()) assertEquals("\"@+id/$NEW_NAME\"", resolved?.getText())
// rename property by attribute // Rename property by attribute
renameElementWithTextOccurences(resolved!!, "@+id/$OLD_NAME") 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()) assertEquals(OLD_NAME, (f.getElementAtCaret() as JetProperty).getName())
} }
private fun renameElementWithTextOccurences(element: PsiElement, newName: String) {
val f = myFixture!!
object : WriteCommandAction.Simple<Unit>(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) + "/" override fun getTestDataPath() = KotlinAndroidTestCaseBase.getPluginTestDataPathBase() + "/rename/" + getTestName(true) + "/"
} }