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

Android Synthetics: Update test infrastructure

Browse Source
This commit is contained in:
Steven Schäfer
2020-09-14 15:26:14 +02:00
committed by Alexander Udalov
parent fb183ec3f8
commit fe466f3dc6
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android-extensions/android-extensions-compiler/build.gradle.kts
+1
View File
@@ -35,6 +35,7 @@ dependencies {
testCompile(commonDep("junit:junit")) testCompile(commonDep("junit:junit"))
testRuntime(intellijPluginDep("junit")) testRuntime(intellijPluginDep("junit"))
testRuntime(intellijDep())
robolectricClasspath(commonDep("org.robolectric", "robolectric")) robolectricClasspath(commonDep("org.robolectric", "robolectric"))
robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1") robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1")
plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt
+2 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.android.synthetic.test package org.jetbrains.kotlin.android.synthetic.test
import com.intellij.mock.MockProject
import com.intellij.testFramework.registerServiceInstance import com.intellij.testFramework.registerServiceInstance
import kotlinx.android.extensions.CacheImplementation import kotlinx.android.extensions.CacheImplementation
import org.jetbrains.kotlin.android.synthetic.AndroidConfigurationKeys import org.jetbrains.kotlin.android.synthetic.AndroidConfigurationKeys
@@ -37,7 +38,7 @@ fun KtUsefulTestCase.createTestEnvironment(configuration: CompilerConfiguration,
val project = myEnvironment.project val project = myEnvironment.project
val variants = listOf(AndroidVariant.createMainVariant(resDirectories)) val variants = listOf(AndroidVariant.createMainVariant(resDirectories))
project.registerServiceInstance(AndroidLayoutXmlFileManager::class.java, CliAndroidLayoutXmlFileManager(project, "test", variants)) (project as MockProject).registerService(AndroidLayoutXmlFileManager::class.java, CliAndroidLayoutXmlFileManager(project, "test", variants))
ExpressionCodegenExtension.registerExtension(project, CliAndroidExtensionsExpressionCodegenExtension(true, CacheImplementation.DEFAULT)) ExpressionCodegenExtension.registerExtension(project, CliAndroidExtensionsExpressionCodegenExtension(true, CacheImplementation.DEFAULT))
IrGenerationExtension.registerExtension(project, CliAndroidIrExtension(true, CacheImplementation.DEFAULT)) IrGenerationExtension.registerExtension(project, CliAndroidIrExtension(true, CacheImplementation.DEFAULT))