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

Fix IDEA tests in Android plugin

Browse Source
This commit is contained in:
Yan Zhulanow
2014-12-25 17:02:23 +03:00
parent 4180cf4d53
commit cb0d0543fd
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidCompletionTest.kt
+4 -3
View File
@@ -56,11 +56,12 @@ public abstract class AbstractAndroidCompletionTest : KotlinAndroidTestCase() {
private fun completionType() = CompletionType.BASIC private fun completionType() = CompletionType.BASIC
fun doTest(testPath: String?) { fun doTest(testPath: String?) {
myFixture!!.copyDirectoryToProject(getResDir()!!, "res") myFixture.copyDirectoryToProject(getResDir()!!, "res")
myFixture!!.configureByFile(testPath!! + getTestName(true) + ".kt"); val virtualFile = myFixture.copyFileToProject(testPath + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
myFixture.configureFromExistingVirtualFile(virtualFile)
val fileText = FileUtil.loadFile(File(testPath + getTestName(true) + ".kt"), true) val fileText = FileUtil.loadFile(File(testPath + getTestName(true) + ".kt"), true)
testCompletion(fileText, TargetPlatform.JVM, { testCompletion(fileText, TargetPlatform.JVM, {
count -> myFixture!!.complete(completionType()) count -> myFixture.complete(completionType())
}) })
} }
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidFindUsagesTest.kt
+2 -1
View File
@@ -28,7 +28,8 @@ public abstract class AbstractAndroidFindUsagesTest : KotlinAndroidTestCase() {
public fun doTest(path: String) { public fun doTest(path: String) {
val f = myFixture!! val f = myFixture!!
f.copyDirectoryToProject(getResDir()!!, "res") f.copyDirectoryToProject(getResDir()!!, "res")
f.configureByFile(path + getTestName(true) + ".kt") val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
f.configureFromExistingVirtualFile(virtualFile)
val targetElement = TargetElementUtilBase.findTargetElement(f.getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED or TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED) val targetElement = TargetElementUtilBase.findTargetElement(f.getEditor(), TargetElementUtilBase.ELEMENT_NAME_ACCEPTED or TargetElementUtilBase.REFERENCED_ELEMENT_ACCEPTED)
val propUsages = f.findUsages(targetElement!!) val propUsages = f.findUsages(targetElement!!)
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidGotoTest.kt
+2 -1
View File
@@ -33,7 +33,8 @@ public abstract class AbstractAndroidGotoTest : KotlinAndroidTestCase() {
public fun doTest(path: String) { public fun doTest(path: String) {
val f = myFixture!! val f = myFixture!!
f.copyDirectoryToProject(getResDir()!!, "res") f.copyDirectoryToProject(getResDir()!!, "res")
f.configureByFile(path + getTestName(true) + ".kt"); val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
f.configureFromExistingVirtualFile(virtualFile)
val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset()) val resolved = GotoDeclarationAction.findTargetElement(f.getProject(), f.getEditor(), f.getCaretOffset())
if (f.getElementAtCaret() !is JetProperty) fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}") if (f.getElementAtCaret() !is JetProperty) fail("element at caret must be a property, not a ${f.getElementAtCaret().javaClass}")
plugins/android-idea-plugin/tests/org/jetbrains/jet/android/AbstractAndroidRenameTest.kt
+2 -1
View File
@@ -35,7 +35,8 @@ public abstract class AbstractAndroidRenameTest : KotlinAndroidTestCase() {
public fun doTest(path: String) { public fun doTest(path: String) {
val f = myFixture!! val f = myFixture!!
f.copyDirectoryToProject(getResDir()!!, "res") f.copyDirectoryToProject(getResDir()!!, "res")
f.configureByFile(path + getTestName(true) + ".kt") val virtualFile = f.copyFileToProject(path + getTestName(true) + ".kt", "src/" + getTestName(true) + ".kt");
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)