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

Refactor Android plugin

Browse Source
This commit is contained in:
Yan Zhulanow
2014-12-30 19:18:13 +03:00
parent 4f9aba2cdc
commit 346dbe3f7c
23 changed files with 311 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt
+5 -1
View File
@@ -20,6 +20,7 @@ import org.jetbrains.jet.plugin.PluginTestCaseBase
import kotlin.test.assertTrue
import com.intellij.codeInsight.TargetElementUtilBase
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
import kotlin.test.assertNotNull
public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() {
@@ -32,7 +33,10 @@ public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() {
f.configureFromExistingVirtualFile(virtualFile)
val targetElement = TargetElementUtilBase.findTargetElement(f.getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED or TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED)
val propUsages = f.findUsages(targetElement!!)
assertNotNull(targetElement)
val propUsages = f.findUsages(targetElement)
assertTrue(propUsages.notEmpty)
}
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
+3 -1
View File
@@ -24,6 +24,7 @@ import com.intellij.refactoring.rename.RenameProcessor
import org.jetbrains.jet.plugin.PluginTestCaseBase
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction
import kotlin.test.assertEquals
import kotlin.test.assertTrue
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.psi.JetProperty
@@ -42,9 +43,10 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
val completionEditor = InjectedLanguageUtil.getEditorForInjectedLanguageNoCommit(editor, file)
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)
renameElementWithTextOccurences(element, NEW_NAME)
val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset())
assertEquals("\"@+id/$NEW_NAME\"", resolved?.getText())
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractParserResultEqualityTest.kt
+5 -5
View File
@@ -32,14 +32,14 @@ import com.intellij.openapi.module.ModuleManager
public abstract class AbstractParserResultEqualityTest : KotlinAndroidTestCase() {
public fun doTest(path: String) {
val project = myFixture!!.getProject()
val project = myFixture.getProject()
project.putUserData(TestConst.TESTDATA_PATH, path)
myFixture!!.copyDirectoryToProject(getResDir()!!, "res")
val cliParser = CliAndroidUIXmlProcessor(project, path + getResDir() + "/layout/", path + "../AndroidManifest.xml")
myFixture.copyDirectoryToProject(getResDir(), "res")
val cliParser = CliAndroidUIXmlProcessor(project, path + "../AndroidManifest.xml", path + getResDir() + "/layout/")
val ideParser = IDEAndroidUIXmlProcessor(ModuleManager.getInstance(project).getModules()[0])
val cliResult = cliParser.parseToPsi(project)!!.getText()
val ideResult = ideParser.parseToPsi(project)!!.getText()
val cliResult = cliParser.parseToPsi()!!.getText()
val ideResult = ideParser.parseToPsi()!!.getText()
assertEquals(cliResult, ideResult)
}