From fe466f3dc6bd36ed155a19da1927e58b3a352522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steven=20Sch=C3=A4fer?= Date: Mon, 14 Sep 2020 15:26:14 +0200 Subject: [PATCH] Android Synthetics: Update test infrastructure --- .../android-extensions-compiler/build.gradle.kts | 1 + .../kotlin/android/synthetic/test/CompilerTestUtils.kt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts index 473fc9bbc6a..dcd12623046 100644 --- a/plugins/android-extensions/android-extensions-compiler/build.gradle.kts +++ b/plugins/android-extensions/android-extensions-compiler/build.gradle.kts @@ -35,6 +35,7 @@ dependencies { testCompile(commonDep("junit:junit")) testRuntime(intellijPluginDep("junit")) + testRuntime(intellijDep()) robolectricClasspath(commonDep("org.robolectric", "robolectric")) robolectricClasspath("org.robolectric:android-all:4.4_r1-robolectric-1") diff --git a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt index fb853a2a196..806f0bf11a1 100755 --- a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt +++ b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/synthetic/test/CompilerTestUtils.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.android.synthetic.test +import com.intellij.mock.MockProject import com.intellij.testFramework.registerServiceInstance import kotlinx.android.extensions.CacheImplementation import org.jetbrains.kotlin.android.synthetic.AndroidConfigurationKeys @@ -37,7 +38,7 @@ fun KtUsefulTestCase.createTestEnvironment(configuration: CompilerConfiguration, val project = myEnvironment.project 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)) IrGenerationExtension.registerExtension(project, CliAndroidIrExtension(true, CacheImplementation.DEFAULT))