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

Use mock JDK instead of full in IDEA plugin tests

Browse Source
This commit is contained in:
Alexander Udalov
2015-04-02 04:50:04 +03:00
parent 72aa3d1465
commit 5b2ffd50d3
7 changed files with 105 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/inspections/unusedSymbol/class/unusedButEntryPointApplet.kt
+3 -1
View File
@@ -1,5 +1,7 @@
// WITH_RUNTIME // WITH_RUNTIME
// FULL_JDK
open class A: java.applet.Applet() open class A: java.applet.Applet()
class B: A() class B: A()
idea/tests/org/jetbrains/kotlin/idea/codeInsight/AbstractJetInspectionTest.kt
+20 -26
View File
@@ -16,25 +16,23 @@
package org.jetbrains.kotlin.idea.codeInsight package org.jetbrains.kotlin.idea.codeInsight
import java.io.File
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import com.intellij.openapi.util.io.FileUtil
import com.intellij.codeInspection.LocalInspectionTool
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import com.intellij.testFramework.LightProjectDescriptor
import org.jetbrains.kotlin.idea.JetLightProjectDescriptor
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper
import com.intellij.analysis.AnalysisScope import com.intellij.analysis.AnalysisScope
import com.intellij.codeInspection.ex.InspectionManagerEx
import com.intellij.testFramework.InspectionTestUtil
import com.intellij.codeInspection.InspectionManager import com.intellij.codeInspection.InspectionManager
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl import com.intellij.codeInspection.LocalInspectionTool
import org.jetbrains.kotlin.test.ConfigLibraryUtil import com.intellij.codeInspection.ex.InspectionManagerEx
import com.intellij.codeInspection.ex.LocalInspectionToolWrapper
import com.intellij.openapi.util.io.FileUtil
import com.intellij.testFramework.IdeaTestUtil import com.intellij.testFramework.IdeaTestUtil
import com.intellij.openapi.projectRoots.JavaSdk import com.intellij.testFramework.InspectionTestUtil
import com.intellij.openapi.projectRoots.Sdk import com.intellij.testFramework.LightProjectDescriptor
import org.apache.commons.lang.SystemUtils; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import org.jetbrains.kotlin.idea.JetLightProjectDescriptor
import org.jetbrains.kotlin.idea.PluginTestCaseBase
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils import org.jetbrains.kotlin.test.JetTestUtils
import java.io.File
public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase() { public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE override fun getProjectDescriptor(): LightProjectDescriptor = JetLightProjectDescriptor.INSTANCE
@@ -65,13 +63,15 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
configureByText(file.getName(), fileText)!! configureByText(file.getName(), fileText)!!
} }
val isWithRuntime = psiFiles.any({ file -> val isWithRuntime = psiFiles.any { InTextDirectivesUtils.findStringWithPrefixes(it.getText(), "// WITH_RUNTIME") != null }
InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null val fullJdk = psiFiles.any { InTextDirectivesUtils.findStringWithPrefixes(it.getText(), "// FULL_JDK") != null }
})
try { try {
if (isWithRuntime) { if (isWithRuntime) {
ConfigLibraryUtil.configureKotlinRuntime(myFixture.getModule(), getFullJavaJDK()); ConfigLibraryUtil.configureKotlinRuntime(
myFixture.getModule(),
if (fullJdk) PluginTestCaseBase.fullJdk() else PluginTestCaseBase.jdkFromIdeaHome()
)
} }
val scope = AnalysisScope(getProject(), psiFiles.map { it.getVirtualFile()!! }) val scope = AnalysisScope(getProject(), psiFiles.map { it.getVirtualFile()!! })
@@ -85,15 +85,9 @@ public abstract class AbstractJetInspectionTest: LightCodeInsightFixtureTestCase
} }
finally { finally {
if (isWithRuntime) { if (isWithRuntime) {
ConfigLibraryUtil.unConfigureKotlinRuntime(myFixture.getModule(), IdeaTestUtil.getMockJdk17()); ConfigLibraryUtil.unConfigureKotlinRuntime(myFixture.getModule(), IdeaTestUtil.getMockJdk17())
} }
} }
} }
} }
protected fun getFullJavaJDK(): Sdk {
val javaPath = checkNotNull(SystemUtils.getJavaHome()?.getAbsolutePath(), "JDK Path must not be null")
val jdk = JavaSdk.getInstance()?.createJdk("JDK", javaPath);
return checkNotNull(jdk, "Could not obtain JDK instance")
}
} }
idea/tests/org/jetbrains/kotlin/idea/intentions/AbstractIntentionTest.java
+1 -6
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.intentions;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.IntentionAction;
import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.ide.startup.impl.StartupManagerImpl;
import com.intellij.openapi.projectRoots.Sdk;
import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
@@ -118,7 +117,7 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase {
try { try {
if (isWithRuntime) { if (isWithRuntime) {
ConfigLibraryUtil.configureKotlinRuntime(getModule(), getFullJavaJDK()); ConfigLibraryUtil.configureKotlinRuntime(getModule(), PluginTestCaseBase.jdkFromIdeaHome());
} }
DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) getFile()); DirectiveBasedActionUtils.checkForUnexpectedErrors((JetFile) getFile());
@@ -193,8 +192,4 @@ public abstract class AbstractIntentionTest extends KotlinCodeInsightTestCase {
protected String getTestDataPath() { protected String getTestDataPath() {
return ""; return "";
} }
protected static Sdk getFullJavaJDK() {
return PluginTestCaseBase.fullJdk();
}
} }
idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixMultiFileTest.java
+2 -3
View File
@@ -41,7 +41,6 @@ import org.jetbrains.kotlin.test.JetTestUtils;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@@ -75,7 +74,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
boolean withRuntime = InTextDirectivesUtils.isDirectiveDefined(originalFileText, "// WITH_RUNTIME"); boolean withRuntime = InTextDirectivesUtils.isDirectiveDefined(originalFileText, "// WITH_RUNTIME");
if (withRuntime) { if (withRuntime) {
ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk()); ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome());
} }
try { try {
@@ -143,7 +142,7 @@ public abstract class AbstractQuickFixMultiFileTest extends KotlinDaemonAnalyzer
} }
finally { finally {
if (withRuntime) { if (withRuntime) {
ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk()); ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome());
} }
} }
} }
idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/AbstractJetExtractionTest.kt
+23 -24
View File
@@ -18,32 +18,31 @@ package org.jetbrains.kotlin.idea.refactoring.introduce
import com.intellij.ide.DataManager import com.intellij.ide.DataManager
import com.intellij.openapi.util.io.FileUtil import com.intellij.openapi.util.io.FileUtil
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler
import java.io.File
import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
import com.intellij.psi.PsiComment import com.intellij.psi.PsiComment
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.test.JetTestUtils
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import kotlin.test.assertEquals
import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.idea.PluginTestCaseBase
import org.jetbrains.kotlin.psi.JetDeclaration
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiWhiteSpace
import org.jetbrains.kotlin.psi.JetPackageDirective import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.utils.emptyOrSingletonList import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.JetLightCodeInsightFixtureTestCase
import org.jetbrains.kotlin.idea.PluginTestCaseBase
import org.jetbrains.kotlin.idea.refactoring.introduce.extractFunction.ExtractKotlinFunctionHandler
import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.* import org.jetbrains.kotlin.idea.refactoring.introduce.extractionEngine.*
import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler
import org.jetbrains.kotlin.idea.refactoring.introduce.introduceProperty.KotlinIntroducePropertyHandler import org.jetbrains.kotlin.idea.refactoring.introduce.introduceProperty.KotlinIntroducePropertyHandler
import java.util.* import org.jetbrains.kotlin.idea.refactoring.introduce.introduceVariable.KotlinIntroduceVariableHandler
import kotlin.test.assertTrue import org.jetbrains.kotlin.psi.JetDeclaration
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetPackageDirective
import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
import org.jetbrains.kotlin.renderer.DescriptorRenderer
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.test.InTextDirectivesUtils
import org.jetbrains.kotlin.test.JetTestUtils
import org.jetbrains.kotlin.utils.emptyOrSingletonList
import java.io.File
import java.util.Collections
import kotlin.test.assertEquals
public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTestCase() { public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTestCase() {
override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST
@@ -186,7 +185,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null val addKotlinRuntime = InTextDirectivesUtils.findStringWithPrefixes(file.getText(), "// WITH_RUNTIME") != null
if (addKotlinRuntime) { if (addKotlinRuntime) {
ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk()) ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
} }
try { try {
@@ -201,7 +200,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
} }
finally { finally {
if (addKotlinRuntime) { if (addKotlinRuntime) {
ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk()) ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
} }
} }
} }
idea/tests/org/jetbrains/kotlin/idea/refactoring/move/AbstractJetMoveTest.kt
+24 -31
View File
@@ -16,48 +16,41 @@
package org.jetbrains.kotlin.idea.refactoring.move package org.jetbrains.kotlin.idea.refactoring.move
import com.intellij.openapi.util.io.FileUtil
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.idea.PluginTestCaseBase
import java.io.File
import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor
import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import com.intellij.psi.PsiMember
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
import com.google.gson.JsonObject import com.google.gson.JsonObject
import com.intellij.refactoring.MultiFileTestCase
import com.intellij.openapi.vfs.VirtualFile
import com.google.gson.JsonParser import com.google.gson.JsonParser
import com.intellij.codeInsight.TargetElementUtilBase import com.intellij.codeInsight.TargetElementUtilBase
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.editor.EditorFactory
import com.intellij.openapi.editor.Document import com.intellij.openapi.editor.Document
import com.intellij.openapi.editor.EditorFactory
import com.intellij.openapi.fileEditor.FileDocumentManager
import com.intellij.openapi.util.io.FileUtil
import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VfsUtil
import com.intellij.psi.PsiDocumentManager import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.kotlin.test.JetTestUtils import com.intellij.psi.*
import com.intellij.refactoring.BaseRefactoringProcessor.ConflictsInTestsException
import com.intellij.refactoring.PackageWrapper
import com.intellij.refactoring.move.MoveHandler
import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor
import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassesOrPackagesProcessor
import com.intellij.refactoring.move.moveClassesOrPackages.MultipleRootsMoveDestination import com.intellij.refactoring.move.moveClassesOrPackages.MultipleRootsMoveDestination
import com.intellij.refactoring.PackageWrapper
import com.intellij.psi.JavaPsiFacade
import com.intellij.psi.PsiClass
import com.intellij.refactoring.move.moveInner.MoveInnerProcessor
import com.intellij.refactoring.move.moveClassesOrPackages.MoveClassToInnerProcessor
import com.intellij.psi.PsiFile
import com.intellij.psi.PsiManager
import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor import com.intellij.refactoring.move.moveFilesOrDirectories.MoveFilesOrDirectoriesProcessor
import com.intellij.refactoring.move.MoveHandler import com.intellij.refactoring.move.moveInner.MoveInnerProcessor
import com.intellij.refactoring.move.moveMembers.MockMoveMembersOptions
import com.intellij.refactoring.move.moveMembers.MoveMembersProcessor
import com.intellij.util.ActionRunner import com.intellij.util.ActionRunner
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor import org.jetbrains.kotlin.idea.KotlinMultiFileTestCase
import org.jetbrains.kotlin.psi.JetNamedDeclaration import org.jetbrains.kotlin.idea.PluginTestCaseBase
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveDestinationKotlinMoveTarget
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsOptions
import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.JetFileKotlinMoveTarget import org.jetbrains.kotlin.idea.refactoring.move.moveTopLevelDeclarations.MoveKotlinTopLevelDeclarationsProcessor
import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.idea.search.allScope import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.idea.KotlinMultiFileTestCase import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.psi.JetNamedDeclaration
import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.test.JetTestUtils
import java.io.File
public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() { public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() {
protected fun doTest(path: String) { protected fun doTest(path: String) {
@@ -87,7 +80,7 @@ public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() {
val withRuntime = config["withRuntime"]?.getAsBoolean() ?: false val withRuntime = config["withRuntime"]?.getAsBoolean() ?: false
if (withRuntime) { if (withRuntime) {
ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk()) ConfigLibraryUtil.configureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
} }
doTest({ rootDir, rootAfter -> doTest({ rootDir, rootAfter ->
@@ -121,7 +114,7 @@ public abstract class AbstractJetMoveTest : KotlinMultiFileTestCase() {
EditorFactory.getInstance()!!.releaseEditor(editor) EditorFactory.getInstance()!!.releaseEditor(editor)
if (withRuntime) { if (withRuntime) {
ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.fullJdk()) ConfigLibraryUtil.unConfigureKotlinRuntime(myModule, PluginTestCaseBase.jdkFromIdeaHome())
} }
} }
}, },
idea/tests/org/jetbrains/kotlin/idea/run/RunConfigurationTest.kt
+32 -30
View File
@@ -16,38 +16,40 @@
package org.jetbrains.kotlin.idea.run package org.jetbrains.kotlin.idea.run
import com.intellij.testFramework.PlatformTestCase
import com.intellij.codeInsight.CodeInsightTestCase import com.intellij.codeInsight.CodeInsightTestCase
import com.intellij.testFramework.PsiTestUtil
import com.intellij.psi.PsiDocumentManager
import org.jetbrains.kotlin.idea.PluginTestCaseBase
import com.intellij.testFramework.MapDataContext
import com.intellij.execution.actions.ConfigurationContext
import com.intellij.execution.PsiLocation
import com.intellij.execution.Location
import com.intellij.execution.configurations.RunConfiguration
import com.intellij.execution.executors.DefaultRunExecutor
import com.intellij.execution.Executor import com.intellij.execution.Executor
import com.intellij.execution.configurations.RunProfile import com.intellij.execution.Location
import com.intellij.execution.runners.ExecutionEnvironment import com.intellij.execution.PsiLocation
import com.intellij.execution.configurations.JavaParameters import com.intellij.execution.actions.ConfigurationContext
import org.junit.Assert
import com.intellij.execution.configurations.JavaCommandLine import com.intellij.execution.configurations.JavaCommandLine
import com.intellij.openapi.vfs.VirtualFile import com.intellij.execution.configurations.JavaParameters
import com.intellij.execution.configurations.RunConfiguration
import com.intellij.execution.configurations.RunProfile
import com.intellij.execution.executors.DefaultRunExecutor
import com.intellij.execution.runners.ExecutionEnvironment
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import java.io.File
import com.intellij.openapi.roots.ModuleRootModificationUtil
import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex
import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
import org.jetbrains.kotlin.psi.JetNamedDeclaration
import java.util.ArrayList
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiManager
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import com.intellij.openapi.projectRoots.Sdk import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ModuleRootModificationUtil
import com.intellij.openapi.vfs.VirtualFile
import com.intellij.psi.PsiComment
import com.intellij.psi.PsiDocumentManager
import com.intellij.psi.PsiManager
import com.intellij.testFramework.MapDataContext
import com.intellij.testFramework.PlatformTestCase
import com.intellij.testFramework.PsiTestUtil
import org.jetbrains.kotlin.idea.PluginTestCaseBase
import org.jetbrains.kotlin.idea.search.allScope
import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex
import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.psi.JetNamedDeclaration
import org.jetbrains.kotlin.psi.JetTreeVisitorVoid
import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType
import org.jetbrains.kotlin.test.ConfigLibraryUtil
import org.jetbrains.kotlin.test.ConfigLibraryUtil.configureKotlinJsRuntime
import org.jetbrains.kotlin.test.ConfigLibraryUtil.configureKotlinRuntime
import org.junit.Assert
import java.io.File
import java.util.ArrayList
private val RUN_PREFIX = "// RUN:" private val RUN_PREFIX = "// RUN:"
@@ -100,13 +102,13 @@ class RunConfigurationTest: CodeInsightTestCase() {
val createModuleResult = configureModule(moduleDirPath("module"), baseDir) val createModuleResult = configureModule(moduleDirPath("module"), baseDir)
val srcDir = createModuleResult.srcDir val srcDir = createModuleResult.srcDir
configureRuntime(createModuleResult.module, PluginTestCaseBase.fullJdk()) configureRuntime(createModuleResult.module, PluginTestCaseBase.jdkFromIdeaHome())
try { try {
val expectedClasses = ArrayList<String>() val expectedClasses = ArrayList<String>()
val actualClasses = ArrayList<String>() val actualClasses = ArrayList<String>()
val testFile = PsiManager.getInstance(getTestProject()).findFile(srcDir.findFileByRelativePath("test.kt")) val testFile = PsiManager.getInstance(getTestProject()).findFile(srcDir.findFileByRelativePath("test.kt")!!)!!
testFile.accept( testFile.accept(
object : JetTreeVisitorVoid() { object : JetTreeVisitorVoid() {
override fun visitComment(comment: PsiComment) { override fun visitComment(comment: PsiComment) {
@@ -130,7 +132,7 @@ class RunConfigurationTest: CodeInsightTestCase() {
Assert.assertEquals(expectedClasses, actualClasses) Assert.assertEquals(expectedClasses, actualClasses)
} }
finally { finally {
ConfigLibraryUtil.unConfigureKotlinRuntime(createModuleResult.module, PluginTestCaseBase.fullJdk()) ConfigLibraryUtil.unConfigureKotlinRuntime(createModuleResult.module, PluginTestCaseBase.jdkFromIdeaHome())
} }
} }