From cd18d9d534305ba428ed53f5555a6f8272d9a125 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 29 May 2019 21:16:40 +0300 Subject: [PATCH] 192: Add property accessor for myModule which is removed in 192 --- .../idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java | 5 +++++ .../navigation/AbstractNavigateFromLibrarySourcesTest.kt | 3 +++ .../decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt | 2 ++ .../kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt | 4 ++++ .../kotlin/idea/scratch/AbstractScratchRunActionTest.kt | 2 ++ 5 files changed, 16 insertions(+) diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java index 7f983233c29..1751423e63b 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCaseBase.java @@ -17,6 +17,7 @@ package org.jetbrains.kotlin.idea.test; import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -43,6 +44,10 @@ public abstract class KotlinLightCodeInsightFixtureTestCaseBase extends LightCod return super.getProject(); } + public Module getModule() { + return myModule; + } + @NotNull @Override public Editor getEditor() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt index d7a9b1353a1..364e7beb244 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.decompiler.navigation +import com.intellij.openapi.module.Module import com.intellij.openapi.roots.LibraryOrderEntry import com.intellij.openapi.roots.ModuleRootManager import com.intellij.openapi.roots.OrderRootType @@ -14,6 +15,8 @@ import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase import org.jetbrains.kotlin.utils.sure abstract class AbstractNavigateFromLibrarySourcesTest : LightCodeInsightFixtureTestCase() { + val module: Module get() = myModule + protected fun navigationElementForReferenceInLibrarySource(filePath: String, referenceText: String): PsiElement { val libraryOrderEntry = ModuleRootManager.getInstance(module!!).orderEntries.first { it is LibraryOrderEntry } val libSourcesRoot = libraryOrderEntry.getUrls(OrderRootType.SOURCES)[0] diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt index 978ac733ebd..d83a1baac12 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.idea.decompiler.stubBuilder +import com.intellij.openapi.module.Module import com.intellij.testFramework.LightProjectDescriptor import org.jetbrains.kotlin.idea.decompiler.textBuilder.findTestLibraryRoot import org.jetbrains.kotlin.idea.test.KotlinJdkAndLibraryProjectDescriptor @@ -15,6 +16,7 @@ import java.io.File @RunWith(JUnit3WithIdeaConfigurationRunner::class) class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { + val module: Module get() = myModule fun testPackage() = testStubsForFileWithWrongAbiVersion("Wrong_packageKt") diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt index f6a522bf125..78b9a3c4ca4 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt @@ -7,6 +7,7 @@ package org.jetbrains.kotlin.idea.quickfix import com.intellij.facet.FacetManager import com.intellij.facet.impl.FacetUtil +import com.intellij.openapi.module.Module import com.intellij.openapi.roots.ModuleRootModificationUtil.updateModel import com.intellij.openapi.roots.OrderRootType import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor @@ -32,6 +33,9 @@ import java.io.File @RunWith(JUnit3WithIdeaConfigurationRunner::class) class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase() { + + val module: Module get() = myModule + fun testDisableInlineClasses() { configureRuntime("mockRuntime11") resetProjectSettings(LanguageVersion.KOTLIN_1_3) diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt index e6230125f00..5b1820e6657 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt @@ -9,6 +9,7 @@ import com.intellij.ide.scratch.ScratchFileService import com.intellij.ide.scratch.ScratchRootType import com.intellij.openapi.actionSystem.AnAction import com.intellij.openapi.actionSystem.CommonDataKeys +import com.intellij.openapi.module.Module import com.intellij.openapi.roots.CompilerModuleExtension import com.intellij.openapi.roots.ModuleRootModificationUtil import com.intellij.openapi.util.io.FileUtil @@ -40,6 +41,7 @@ import org.junit.Assert import java.io.File abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { + val module: Module get() = myModule fun doReplTest(fileName: String) { doTest(fileName, true)