From cf1e1e3a0c2a8d5593624d2735cfa2f3280a9b02 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Wed, 29 May 2019 20:26:50 +0300 Subject: [PATCH] 192: Fix accessors to module & project in tests --- .../idea/liveTemplates/LiveTemplatesTest.kt | 2 +- .../KotlinLightCodeInsightFixtureTestCase.kt | 2 -- .../idea/actions/AbstractNavigationTest.kt | 4 ++-- .../idea/caches/KotlinShortNamesCacheTest.kt | 6 +++--- .../codeInsight/AbstractLineMarkersTest.kt | 2 +- .../generate/AbstractCodeInsightActionTest.kt | 4 ++-- ...ractGenerateTestSupportMethodActionTest.kt | 1 - .../AbstractInternalCompiledClassesTest.kt | 2 +- .../AbstractNavigateFromLibrarySourcesTest.kt | 2 +- .../ClsStubForWrongAbiVersionTest.kt | 2 +- ...bstractDecompiledTextFromJsMetadataTest.kt | 2 +- .../textBuilder/AbstractDecompiledTextTest.kt | 2 +- .../DecompiledTextForWrongAbiVersionTest.kt | 2 +- .../idea/editor/LazyElementTypeTestBase.kt | 2 +- .../idea/intentions/AbstractIntentionTest.kt | 4 ++-- .../idea/quickfix/AbstractQuickFixTest.kt | 2 +- .../UpdateConfigurationQuickFixTest.kt | 20 +++++++++---------- .../introduce/AbstractExtractionTest.kt | 6 +++--- .../refactoring/rename/AbstractRenameTest.kt | 2 +- .../repl/AbstractIdeReplCompletionTest.kt | 2 +- .../scratch/AbstractScratchRunActionTest.kt | 4 ++-- ...tractJavaToKotlinConverterMultiFileTest.kt | 1 - ...ractJavaToKotlinConverterSingleFileTest.kt | 1 - 23 files changed, 36 insertions(+), 41 deletions(-) diff --git a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt index f2c08e0dbb4..1d76d6f6c0d 100644 --- a/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt +++ b/idea/idea-live-templates/tests/org/jetbrains/kotlin/idea/liveTemplates/LiveTemplatesTest.kt @@ -28,7 +28,7 @@ class LiveTemplatesTest : KotlinLightCodeInsightFixtureTestCase() { override fun setUp() { super.setUp() myFixture.testDataPath = File(TEST_DATA_BASE_PATH).path + File.separator - TemplateManagerImpl.setTemplateTesting(myModule.project, testRootDisposable) + TemplateManagerImpl.setTemplateTesting(module.project, testRootDisposable) } fun testSout() { diff --git a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt index 7395c64df6e..3ef66c19f07 100644 --- a/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt +++ b/idea/idea-test-framework/test/org/jetbrains/kotlin/idea/test/KotlinLightCodeInsightFixtureTestCase.kt @@ -60,8 +60,6 @@ import kotlin.reflect.full.findAnnotation abstract class KotlinLightCodeInsightFixtureTestCase : KotlinLightCodeInsightFixtureTestCaseBase() { private val exceptions = ArrayList() - protected val module: Module get() = myFixture.module - protected open val captureExceptions = true override fun setUp() { diff --git a/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt index 18037154e3c..2910f5b7014 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/actions/AbstractNavigationTest.kt @@ -31,7 +31,7 @@ abstract class AbstractNavigationTest : KotlinLightCodeInsightFixtureTestCase() val fileText = FileUtil.loadFile(mainFile, true) try { - ConfigLibraryUtil.configureLibrariesByDirective(myModule, PlatformTestUtil.getCommunityPath(), fileText) + ConfigLibraryUtil.configureLibrariesByDirective(module, PlatformTestUtil.getCommunityPath(), fileText) myFixture.testDataPath = "${KotlinTestUtils.getHomeDirectory()}/${mainFile.parent}" @@ -48,7 +48,7 @@ abstract class AbstractNavigationTest : KotlinLightCodeInsightFixtureTestCase() NavigationTestUtils.assertGotoDataMatching(editor, getSourceAndTargetElements(editor, file)) } finally { - ConfigLibraryUtil.unconfigureLibrariesByDirective(myModule, fileText) + ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText) } } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt index e4c12864a6d..83f797ef19a 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/KotlinShortNamesCacheTest.kt @@ -186,7 +186,7 @@ class KotlinShortNamesCacheTest : KotlinLightCodeInsightFixtureTestCase() { fun testGetMethodsByNameWithFunctions() { myFixture.configureByFile("kotlinShortNamesCacheTestDataMethods.kt") - val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule) + val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module) checkIsSingleMethodFound(scope, "KotlinShortNamesCacheTestDataMethodsKt.topLevelFunction", true) checkIsSingleMethodFound(scope, "B1.staticMethodOfObject", true) checkIsSingleMethodFound(scope, "B1.nonStaticMethodOfObject", false) @@ -197,7 +197,7 @@ class KotlinShortNamesCacheTest : KotlinLightCodeInsightFixtureTestCase() { fun doTestGetMethodsByNameWithAccessors(file: String) { myFixture.configureByFile(file) - val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule) + val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module) checkIsVarAccessorsFound(scope, "topLevelVar", "KotlinShortNameCacheTestData.getTopLevelVar", "KotlinShortNameCacheTestData.setTopLevelVar", true) @@ -238,7 +238,7 @@ class KotlinShortNamesCacheTest : KotlinLightCodeInsightFixtureTestCase() { fun testGetFieldsByName() { myFixture.configureByFile("kotlinShortNamesCacheTestDataFields.kt") - val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(myModule) + val scope = GlobalSearchScope.moduleWithDependenciesAndLibrariesScope(module) checkIsSingleFieldFound(scope, "KotlinShortNamesCacheTestDataFieldsKt.topLevelVar", true) checkIsSingleFieldFound(scope, "B1.objectVar", true) checkIsSingleFieldFound(scope, "C1.classVar", false) diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt index b2220aec758..41ec6286c35 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractLineMarkersTest.kt @@ -99,7 +99,7 @@ abstract class AbstractLineMarkersTest : KotlinLightCodeInsightFixtureTestCase() } catch (exc: Exception) { throw RuntimeException(exc) } finally { - ConfigLibraryUtil.unconfigureLibrariesByDirective(myModule, fileText) + ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText) DaemonCodeAnalyzerSettings.getInstance().SHOW_METHOD_SEPARATORS = false } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt index ef8f434fda1..610cdc4eaa7 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractCodeInsightActionTest.kt @@ -58,7 +58,7 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest var mainPsiFile: KtFile? = null try { - ConfigLibraryUtil.configureLibrariesByDirective(myModule, PlatformTestUtil.getCommunityPath(), fileText) + ConfigLibraryUtil.configureLibrariesByDirective(module, PlatformTestUtil.getCommunityPath(), fileText) val mainFile = File(path) val mainFileName = mainFile.name @@ -112,7 +112,7 @@ abstract class AbstractCodeInsightActionTest : KotlinLightCodeInsightFixtureTest } finally { mainPsiFile?.forcedTargetPlatform = null - ConfigLibraryUtil.unconfigureLibrariesByDirective(myModule, fileText) + ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt index 1b5ce7c2cc6..8bc834f9baa 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/codeInsight/generate/AbstractGenerateTestSupportMethodActionTest.kt @@ -12,7 +12,6 @@ import org.jetbrains.kotlin.test.InTextDirectivesUtils abstract class AbstractGenerateTestSupportMethodActionTest : AbstractCodeInsightActionTest() { private fun setUpTestSourceRoot() { - val module = myModule val model = ModuleRootManager.getInstance(module).modifiableModel val entry = model.contentEntries.single() val sourceFolderFile = entry.sourceFolderFiles.single() diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt index e37bd9e987b..619dd517212 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/AbstractInternalCompiledClassesTest.kt @@ -39,7 +39,7 @@ abstract class AbstractInternalCompiledClassesTest : KotlinLightCodeInsightFixtu } protected fun doTest(fileKind: String, acceptFile: VirtualFile.() -> Boolean, performTest: VirtualFile.() -> Unit) { - val root = findTestLibraryRoot(myModule!!)!! + val root = findTestLibraryRoot(module!!)!! var foundAtLeastOneFile = false root.checkRecursively { if (acceptFile()) { 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 4ef310e8725..d7a9b1353a1 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/navigation/AbstractNavigateFromLibrarySourcesTest.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.utils.sure abstract class AbstractNavigateFromLibrarySourcesTest : LightCodeInsightFixtureTestCase() { protected fun navigationElementForReferenceInLibrarySource(filePath: String, referenceText: String): PsiElement { - val libraryOrderEntry = ModuleRootManager.getInstance(myModule!!).orderEntries.first { it is LibraryOrderEntry } + val libraryOrderEntry = ModuleRootManager.getInstance(module!!).orderEntries.first { it is LibraryOrderEntry } val libSourcesRoot = libraryOrderEntry.getUrls(OrderRootType.SOURCES)[0] val libUrl = "$libSourcesRoot/$filePath" val vf = VirtualFileManager.getInstance().refreshAndFindFileByUrl(libUrl) 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 48f84c3435b..978ac733ebd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClsStubForWrongAbiVersionTest.kt @@ -21,7 +21,7 @@ class ClsStubBuilderForWrongAbiVersionTest : AbstractClsStubBuilderTest() { fun testClass() = testStubsForFileWithWrongAbiVersion("ClassWithWrongAbiVersion") private fun testStubsForFileWithWrongAbiVersion(className: String) { - val root = findTestLibraryRoot(myModule!!)!! + val root = findTestLibraryRoot(module!!)!! val result = root.findClassFileByName(className) testClsStubsForFile(result, null) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt index 51f32b72d48..a985a9eaddd 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextFromJsMetadataTest.kt @@ -27,7 +27,7 @@ private const val CHECK_PACKAGE_DIRECTIVE = "CHECK_PACKAGE" abstract class AbstractDecompiledTextFromJsMetadataTest(baseDirectory: String) : AbstractDecompiledTextBaseTest(baseDirectory, true, withRuntime = true) { - override fun getFileToDecompile(): VirtualFile = getKjsmFile(TEST_PACKAGE, myModule!!) + override fun getFileToDecompile(): VirtualFile = getKjsmFile(TEST_PACKAGE, module!!) override fun checkPsiFile(psiFile: PsiFile) = assertTrue(psiFile is KtDecompiledFile, "Expecting decompiled kotlin javascript file, was: " + psiFile::class.java) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 657bd58303f..76a370a48f0 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -22,7 +22,7 @@ import kotlin.test.assertTrue abstract class AbstractDecompiledTextTest(baseDirectory: String, allowKotlinPackage: Boolean) : AbstractDecompiledTextBaseTest(baseDirectory, allowKotlinPackage = allowKotlinPackage) { - override fun getFileToDecompile(): VirtualFile = getClassFile(TEST_PACKAGE, getTestName(false), myModule!!) + override fun getFileToDecompile(): VirtualFile = getClassFile(TEST_PACKAGE, getTestName(false), module!!) override fun checkStubConsistency(file: VirtualFile, decompiledText: String) { val fileWithDecompiledText = KtPsiFactory(project).createFile(decompiledText) diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt index bcd70fd1c52..d75d3460356 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/DecompiledTextForWrongAbiVersionTest.kt @@ -32,7 +32,7 @@ class DecompiledTextForWrongAbiVersionTest : AbstractInternalCompiledClassesTest fun testPackagePartWithWrongAbiVersion() = doTest("Wrong_packageKt") fun doTest(name: String) { - val root = findTestLibraryRoot(myModule!!)!! + val root = findTestLibraryRoot(module!!)!! checkFileWithWrongAbiVersion(root.findClassFileByName(name)) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTestBase.kt b/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTestBase.kt index 0a47ead3e3a..1139d3c0d74 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTestBase.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/editor/LazyElementTypeTestBase.kt @@ -26,7 +26,7 @@ abstract class LazyElementTypeTestBase(private val lazyElementClass: Class val expressionBefore = PsiTreeUtil.findChildOfType(file, lazyElementClass) performTypingAction(myFixture.editor, char) - PsiDocumentManager.getInstance(LightPlatformTestCase.getProject()).commitDocument(myFixture.getDocument(file)) + PsiDocumentManager.getInstance(project).commitDocument(myFixture.getDocument(file)) val expressionAfter = PsiTreeUtil.findChildOfType(file, lazyElementClass) diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt index 7712061d4d2..47bf0965665 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.kt @@ -95,7 +95,7 @@ abstract class AbstractIntentionTest : KotlinLightCodeInsightFixtureTestCase() { val fileText = FileUtil.loadFile(mainFile, true) val configured = configureCompilerOptions(fileText, project, module) - ConfigLibraryUtil.configureLibrariesByDirective(myModule, PlatformTestUtil.getCommunityPath(), fileText) + ConfigLibraryUtil.configureLibrariesByDirective(module, PlatformTestUtil.getCommunityPath(), fileText) try { TestCase.assertTrue("\"\" is missing in file \"$mainFile\"", fileText.contains("")) @@ -113,7 +113,7 @@ abstract class AbstractIntentionTest : KotlinLightCodeInsightFixtureTestCase() { DirectiveBasedActionUtils.checkForUnexpectedErrors(file as KtFile) } } finally { - ConfigLibraryUtil.unconfigureLibrariesByDirective(myModule, fileText) + ConfigLibraryUtil.unconfigureLibrariesByDirective(module, fileText) if (configured) { rollbackCompilerOptions(project, module) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt index e5a5704f9d2..e798457fadc 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.kt @@ -109,7 +109,7 @@ abstract class AbstractQuickFixTest : KotlinLightCodeInsightFixtureTestCase(), Q fixtureClasses = InTextDirectivesUtils.findListWithPrefixes(fileText, "// FIXTURE_CLASS: ") for (fixtureClass in fixtureClasses) { - TestFixtureExtension.loadFixture(fixtureClass, LightPlatformTestCase.getModule()) + TestFixtureExtension.loadFixture(fixtureClass, module) } expectedErrorMessage = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// SHOULD_FAIL_WITH: ") diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt index 5790c2e9e43..f6a522bf125 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/UpdateConfigurationQuickFixTest.kt @@ -66,7 +66,7 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( fun testEnableCoroutinesFacet() { configureRuntime("mockRuntime11") - val facet = configureKotlinFacet(myModule) { + val facet = configureKotlinFacet(module) { settings.languageLevel = LanguageVersion.KOTLIN_1_1 } resetProjectSettings(LanguageVersion.KOTLIN_1_1) @@ -102,15 +102,15 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( fun testIncreaseLangLevelFacet() { configureRuntime("mockRuntime11") resetProjectSettings(LanguageVersion.KOTLIN_1_0) - configureKotlinFacet(myModule) { + configureKotlinFacet(module) { settings.languageLevel = LanguageVersion.KOTLIN_1_0 settings.apiLevel = LanguageVersion.KOTLIN_1_0 } myFixture.configureByText("foo.kt", "val x get() = 1") - assertEquals(LanguageVersion.KOTLIN_1_0, myModule.languageVersionSettings.languageVersion) + assertEquals(LanguageVersion.KOTLIN_1_0, module.languageVersionSettings.languageVersion) myFixture.launchAction(myFixture.findSingleIntention("Set module language version to 1.1")) - assertEquals(LanguageVersion.KOTLIN_1_1, myModule.languageVersionSettings.languageVersion) + assertEquals(LanguageVersion.KOTLIN_1_1, module.languageVersionSettings.languageVersion) } fun testIncreaseLangAndApiLevel() { @@ -140,15 +140,15 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( fun testIncreaseLangLevelFacet_10() { configureRuntime("mockRuntime106") resetProjectSettings(LanguageVersion.KOTLIN_1_0) - configureKotlinFacet(myModule) { + configureKotlinFacet(module) { settings.languageLevel = LanguageVersion.KOTLIN_1_0 settings.apiLevel = LanguageVersion.KOTLIN_1_0 } myFixture.configureByText("foo.kt", "val x = \"s\"::length") - assertEquals(LanguageVersion.KOTLIN_1_0, myModule.languageVersionSettings.languageVersion) + assertEquals(LanguageVersion.KOTLIN_1_0, module.languageVersionSettings.languageVersion) myFixture.launchAction(myFixture.findSingleIntention("Set module language version to 1.1")) - assertEquals(LanguageVersion.KOTLIN_1_1, myModule.languageVersionSettings.languageVersion) + assertEquals(LanguageVersion.KOTLIN_1_1, module.languageVersionSettings.languageVersion) assertEquals(bundledRuntimeVersion(), getRuntimeLibraryVersion(myFixture.module)) } @@ -162,7 +162,7 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( fun y01() = Foo::prop.getter """) myFixture.launchAction(myFixture.findSingleIntention("Add kotlin-reflect.jar to the classpath")) - val kotlinRuntime = KotlinJavaModuleConfigurator.instance.getKotlinLibrary(myModule)!! + val kotlinRuntime = KotlinJavaModuleConfigurator.instance.getKotlinLibrary(module)!! val classes = kotlinRuntime.getFiles(OrderRootType.CLASSES).map { it.name } assertContainsElements(classes, "kotlin-reflect.jar") val sources = kotlinRuntime.getFiles(OrderRootType.SOURCES) @@ -200,10 +200,10 @@ class UpdateConfigurationQuickFixTest : LightPlatformCodeInsightFixtureTestCase( get() = project.getLanguageVersionSettings().getFeatureSupport(LanguageFeature.InlineClasses) override fun tearDown() { - FacetManager.getInstance(myModule).getFacetByType(KotlinFacetType.TYPE_ID)?.let { + FacetManager.getInstance(module).getFacetByType(KotlinFacetType.TYPE_ID)?.let { FacetUtil.deleteFacet(it) } - ConfigLibraryUtil.removeLibrary(myModule, "KotlinJavaRuntime") + ConfigLibraryUtil.removeLibrary(module, "KotlinJavaRuntime") super.tearDown() } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt index 63735923b6a..cd50ae192bf 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractExtractionTest.kt @@ -341,11 +341,11 @@ abstract class AbstractExtractionTest : KotlinLightCodeInsightFixtureTestCase() val fileText = FileUtil.loadFile(File(path), true) val configured = configureCompilerOptions(fileText, project, module) - ConfigLibraryUtil.configureLibrariesByDirective(myModule, PlatformTestUtil.getCommunityPath(), fileText) + ConfigLibraryUtil.configureLibrariesByDirective(module, PlatformTestUtil.getCommunityPath(), fileText) val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(fileText, "// WITH_RUNTIME") != null if (addKotlinRuntime) { - ConfigLibraryUtil.configureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.configureKotlinRuntimeAndSdk(module, PluginTestCaseBase.mockJdk()) } try { @@ -353,7 +353,7 @@ abstract class AbstractExtractionTest : KotlinLightCodeInsightFixtureTestCase() } finally { if (addKotlinRuntime) { - ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(myModule, PluginTestCaseBase.mockJdk()) + ConfigLibraryUtil.unConfigureKotlinRuntimeAndSdk(module, PluginTestCaseBase.mockJdk()) } if (configured) { rollbackCompilerOptions(project, module) diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt index 8de37c71487..68aeed8dd83 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/rename/AbstractRenameTest.kt @@ -140,7 +140,7 @@ abstract class AbstractRenameTest : KotlinLightCodeInsightFixtureTestCase() { } } - for (sourceRoot in ModuleRootManager.getInstance(myModule).sourceRoots) { + for (sourceRoot in ModuleRootManager.getInstance(module).sourceRoots) { VfsUtilCore.visitChildrenRecursively(sourceRoot, visitor) } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt index fbcfb3179f0..ab4940bb704 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/repl/AbstractIdeReplCompletionTest.kt @@ -26,7 +26,7 @@ abstract class AbstractIdeReplCompletionTest : KotlinFixtureCompletionBaseTestCa override fun setUp() { super.setUp() - consoleRunner = KotlinConsoleKeeper.getInstance(project).run(myModule)!! + consoleRunner = KotlinConsoleKeeper.getInstance(project).run(module)!! VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory()) } diff --git a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt index f2a4fbf48fa..e6230125f00 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt @@ -72,13 +72,13 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() { MockLibraryUtil.compileKotlin(baseDir.path, outputDir) - PsiTestUtil.setCompilerOutputPath(myModule, outputDir.path, false) + PsiTestUtil.setCompilerOutputPath(module, outputDir.path, false) val mainFileName = "$dirName/${getTestName(true)}.kts" doCompilingTest(mainFileName) doReplTest(mainFileName) - ModuleRootModificationUtil.updateModel(myModule) { model -> + ModuleRootModificationUtil.updateModel(module) { model -> model.getModuleExtension(CompilerModuleExtension::class.java).inheritCompilerOutputPath(true) } } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt index 56e41f7e74c..37808a07691 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterMultiFileTest.kt @@ -33,7 +33,6 @@ import java.util.* abstract class AbstractJavaToKotlinConverterMultiFileTest : AbstractJavaToKotlinConverterTest() { fun doTest(dirPath: String) { - val project = LightPlatformTestCase.getProject()!! val psiManager = PsiManager.getInstance(project) val filesToConvert = File(dirPath).listFiles { _, name -> name.endsWith(".java") } diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt index b99b28e6097..74d87be6922 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt +++ b/j2k/tests/org/jetbrains/kotlin/j2k/AbstractJavaToKotlinConverterSingleFileTest.kt @@ -35,7 +35,6 @@ abstract class AbstractJavaToKotlinConverterSingleFileTest : AbstractJavaToKotli val testHeaderPattern = Pattern.compile("//(element|expression|statement|method|class|file|comp)\n") open fun doTest(javaPath: String) { - val project = LightPlatformTestCase.getProject()!! val javaFile = File(javaPath) val fileContents = FileUtil.loadFile(javaFile, true) val matcher = testHeaderPattern.matcher(fileContents)