diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/LibraryManager.kt b/idea/tests/com/intellij/debugger/streams/kotlin/LibraryUtil.kt similarity index 81% rename from idea/tests/com/intellij/debugger/streams/kotlin/LibraryManager.kt rename to idea/tests/com/intellij/debugger/streams/kotlin/LibraryUtil.kt index 4f7cbb7e2f1..3bbbf9e9f0e 100644 --- a/idea/tests/com/intellij/debugger/streams/kotlin/LibraryManager.kt +++ b/idea/tests/com/intellij/debugger/streams/kotlin/LibraryUtil.kt @@ -6,6 +6,8 @@ import java.io.File /** * @author Vitaliy.Bibaev */ -object LibraryManager { +object LibraryUtil { val LIBRARIES_DIRECTORY: String = File("lib").absolutePath + + val KOTLIN_STD_LIBRARY = "kotlin-stdlib.jar" } \ No newline at end of file diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/exec/KotlinTraceEvaluationTestCase.kt b/idea/tests/com/intellij/debugger/streams/kotlin/exec/KotlinTraceEvaluationTestCase.kt index d1686527029..569ac44e6b5 100644 --- a/idea/tests/com/intellij/debugger/streams/kotlin/exec/KotlinTraceEvaluationTestCase.kt +++ b/idea/tests/com/intellij/debugger/streams/kotlin/exec/KotlinTraceEvaluationTestCase.kt @@ -2,7 +2,7 @@ package com.intellij.debugger.streams.kotlin.exec import com.intellij.debugger.impl.OutputChecker -import com.intellij.debugger.streams.kotlin.LibraryManager +import com.intellij.debugger.streams.kotlin.LibraryUtil import com.intellij.debugger.streams.lib.LibrarySupportProvider import com.intellij.debugger.streams.test.TraceExecutionTestCase import com.intellij.execution.configurations.JavaParameters @@ -34,14 +34,14 @@ abstract class KotlinTraceEvaluationTestCase : TraceExecutionTestCase() { override fun setUpModule() { super.setUpModule() ApplicationManager.getApplication().runWriteAction { - VfsRootAccess.allowRootAccess(LibraryManager.LIBRARIES_DIRECTORY) - PsiTestUtil.addLibrary(myModule, "${LibraryManager.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME") + VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY) + PsiTestUtil.addLibrary(myModule, "${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME") } } override fun createJavaParameters(mainClass: String?): JavaParameters { val javaParameters = super.createJavaParameters(mainClass) - javaParameters.classPath.add("${LibraryManager.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME") + javaParameters.classPath.add("${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME") return javaParameters } diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt index fd7ebe39a23..f4feb0ab21c 100644 --- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt +++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt @@ -2,7 +2,7 @@ package com.intellij.debugger.streams.kotlin.psi.java import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase -import com.intellij.debugger.streams.kotlin.LibraryManager +import com.intellij.debugger.streams.kotlin.LibraryUtil import com.intellij.debugger.streams.kotlin.lib.StreamExLibrarySupportProvider import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.openapi.application.ApplicationManager @@ -18,16 +18,16 @@ class PositiveStreamExTest : KotlinPsiChainBuilderTestCase.Positive("streams/pos override fun setUp() { super.setUp() ApplicationManager.getApplication().runWriteAction { - VfsRootAccess.allowRootAccess(LibraryManager.LIBRARIES_DIRECTORY) + VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY) PsiTestUtil.addLibrary(testRootDisposable, LightPlatformTestCase.getModule(), - "StreamEx", LibraryManager.LIBRARIES_DIRECTORY, "streamex-0.6.5.jar") + "StreamEx", LibraryUtil.LIBRARIES_DIRECTORY, "streamex-0.6.5.jar") } } override fun tearDown() { super.tearDown() ApplicationManager.getApplication().runWriteAction { - VfsRootAccess.disallowRootAccess(LibraryManager.LIBRARIES_DIRECTORY) + VfsRootAccess.disallowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY) } }