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

Minor: rename LibraryManager -> LibraryUtil

Browse Source
This commit is contained in:
Vitaliy.Bibaev
2017-10-27 13:13:18 +03:00
committed by Yan Zhulanow
parent e15f3624cf
commit 5502d62471
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/com/intellij/debugger/streams/kotlin/LibraryManager.kt → idea/tests/com/intellij/debugger/streams/kotlin/LibraryUtil.kt
+3 -1
View File
@@ -6,6 +6,8 @@ import java.io.File
/** /**
* @author Vitaliy.Bibaev * @author Vitaliy.Bibaev
*/ */
object LibraryManager { object LibraryUtil {
val LIBRARIES_DIRECTORY: String = File("lib").absolutePath val LIBRARIES_DIRECTORY: String = File("lib").absolutePath
val KOTLIN_STD_LIBRARY = "kotlin-stdlib.jar"
} }
idea/tests/com/intellij/debugger/streams/kotlin/exec/KotlinTraceEvaluationTestCase.kt
+4 -4
View File
@@ -2,7 +2,7 @@
package com.intellij.debugger.streams.kotlin.exec package com.intellij.debugger.streams.kotlin.exec
import com.intellij.debugger.impl.OutputChecker 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.lib.LibrarySupportProvider
import com.intellij.debugger.streams.test.TraceExecutionTestCase import com.intellij.debugger.streams.test.TraceExecutionTestCase
import com.intellij.execution.configurations.JavaParameters import com.intellij.execution.configurations.JavaParameters
@@ -34,14 +34,14 @@ abstract class KotlinTraceEvaluationTestCase : TraceExecutionTestCase() {
override fun setUpModule() { override fun setUpModule() {
super.setUpModule() super.setUpModule()
ApplicationManager.getApplication().runWriteAction { ApplicationManager.getApplication().runWriteAction {
VfsRootAccess.allowRootAccess(LibraryManager.LIBRARIES_DIRECTORY) VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
PsiTestUtil.addLibrary(myModule, "${LibraryManager.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME") PsiTestUtil.addLibrary(myModule, "${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME")
} }
} }
override fun createJavaParameters(mainClass: String?): JavaParameters { override fun createJavaParameters(mainClass: String?): JavaParameters {
val javaParameters = super.createJavaParameters(mainClass) 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 return javaParameters
} }
idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt
+4 -4
View File
@@ -2,7 +2,7 @@
package com.intellij.debugger.streams.kotlin.psi.java package com.intellij.debugger.streams.kotlin.psi.java
import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase 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.kotlin.lib.StreamExLibrarySupportProvider
import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.debugger.streams.wrapper.StreamChainBuilder
import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.ApplicationManager
@@ -18,16 +18,16 @@ class PositiveStreamExTest : KotlinPsiChainBuilderTestCase.Positive("streams/pos
override fun setUp() { override fun setUp() {
super.setUp() super.setUp()
ApplicationManager.getApplication().runWriteAction { ApplicationManager.getApplication().runWriteAction {
VfsRootAccess.allowRootAccess(LibraryManager.LIBRARIES_DIRECTORY) VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
PsiTestUtil.addLibrary(testRootDisposable, LightPlatformTestCase.getModule(), 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() { override fun tearDown() {
super.tearDown() super.tearDown()
ApplicationManager.getApplication().runWriteAction { ApplicationManager.getApplication().runWriteAction {
VfsRootAccess.disallowRootAccess(LibraryManager.LIBRARIES_DIRECTORY) VfsRootAccess.disallowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
} }
} }