From f044d654f0dfc04dbad7650d0b88d288dd28d1d7 Mon Sep 17 00:00:00 2001 From: Igor Yakovlev Date: Mon, 20 May 2019 15:53:40 +0300 Subject: [PATCH] Fix KotlinLintTest.parcel test Added plugin classpath of android compiler extensions to module facet --- .../kotlin/android/lint/AbstractKotlinLintTest.kt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt b/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt index b85ee638965..41994477466 100644 --- a/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt +++ b/idea/idea-android/tests/org/jetbrains/kotlin/android/lint/AbstractKotlinLintTest.kt @@ -17,10 +17,14 @@ package org.jetbrains.kotlin.android.lint import com.intellij.codeInspection.InspectionProfileEntry +import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProviderImpl import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl import com.intellij.util.PathUtil import org.jetbrains.android.inspections.lint.AndroidLintInspectionBase import org.jetbrains.kotlin.android.KotlinAndroidTestCase +import org.jetbrains.kotlin.cli.common.arguments.CommonCompilerArguments +import org.jetbrains.kotlin.idea.facet.getOrCreateFacet +import org.jetbrains.kotlin.idea.facet.initializeIfNeeded import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil import org.jetbrains.kotlin.test.InTextDirectivesUtils import org.jetbrains.kotlin.test.InTextDirectivesUtils.findStringWithPrefixes @@ -34,6 +38,16 @@ abstract class AbstractKotlinLintTest : KotlinAndroidTestCase() { (myFixture as CodeInsightTestFixtureImpl).setVirtualFileFilter { false } // Allow access to tree elements. ConfigLibraryUtil.configureKotlinRuntime(myModule) ConfigLibraryUtil.addLibrary(myModule, "androidExtensionsRuntime", "dist/kotlinc/lib", arrayOf("android-extensions-runtime.jar")) + + val facet = myModule.getOrCreateFacet(IdeModifiableModelsProviderImpl(project), useProjectSettings = false, commitModel = true) + + facet.configuration.settings.apply { + initializeIfNeeded(myModule, null) + + val arguments = CommonCompilerArguments.DummyImpl() + arguments.pluginClasspaths = arrayOf("kotlin-android-extensions.jar") + compilerArguments = arguments + } } override fun tearDown() {