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

Tests: allow file access to KotlinTestUtils.getHomeDirectory() in AbstractConfigureKotlinTest

Browse Source 
This test configure kotlin standard library, so it should have access to .jar files from project dist directory
This commit is contained in:
Natalia Selezneva
2018-12-06 10:43:01 +03:00
parent abadfbb632
commit 4a2e8849b9
3 changed files with 9 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt
+3 -15
View File
@@ -33,6 +33,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
import org.jetbrains.kotlin.idea.framework.KotlinSdkType
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.nio.file.Path
@@ -41,25 +42,12 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
override fun setUp() {
super.setUp()
val distPaths = with(PathUtil.kotlinPathsForIdeaPlugin) {
listOf(
stdlibPath,
stdlibSourcesPath,
reflectPath,
kotlinTestPath,
jsKotlinTestJarPath,
jsStdLibJarPath,
jsStdLibSrcJarPath
)
}
for (path in distPaths) {
VfsRootAccess.allowRootAccess(testRootDisposable, path.absolutePath)
}
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
}
@Throws(Exception::class)
override fun tearDown() {
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
PathMacros.getInstance().removeMacro(TEMP_DIR_MACRO_KEY)
super.tearDown()
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.173
+3 -15
View File
@@ -33,6 +33,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
import org.jetbrains.kotlin.idea.framework.KotlinSdkType
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.io.IOException
@@ -41,25 +42,12 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
override fun setUp() {
super.setUp()
val distPaths = with(PathUtil.kotlinPathsForIdeaPlugin) {
listOf(
stdlibPath,
stdlibSourcesPath,
reflectPath,
kotlinTestPath,
jsKotlinTestJarPath,
jsStdLibJarPath,
jsStdLibSrcJarPath
)
}
for (path in distPaths) {
VfsRootAccess.allowRootAccess(testRootDisposable, path.absolutePath)
}
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
}
@Throws(Exception::class)
override fun tearDown() {
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
PathMacros.getInstance().removeMacro(TEMP_DIR_MACRO_KEY)
super.tearDown()
idea/tests/org/jetbrains/kotlin/idea/configuration/AbstractConfigureKotlinTest.kt.181
+3 -15
View File
@@ -33,6 +33,7 @@ import junit.framework.TestCase
import org.jetbrains.kotlin.idea.configuration.KotlinWithLibraryConfigurator.FileState
import org.jetbrains.kotlin.idea.framework.KotlinSdkType
import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.utils.PathUtil
import java.io.File
import java.nio.file.Path
@@ -41,25 +42,12 @@ abstract class AbstractConfigureKotlinTest : PlatformTestCase() {
override fun setUp() {
super.setUp()
val distPaths = with(PathUtil.kotlinPathsForIdeaPlugin) {
listOf(
stdlibPath,
stdlibSourcesPath,
reflectPath,
kotlinTestPath,
jsKotlinTestJarPath,
jsStdLibJarPath,
jsStdLibSrcJarPath
)
}
for (path in distPaths) {
VfsRootAccess.allowRootAccess(testRootDisposable, path.absolutePath)
}
VfsRootAccess.allowRootAccess(KotlinTestUtils.getHomeDirectory())
}
@Throws(Exception::class)
override fun tearDown() {
VfsRootAccess.disallowRootAccess(KotlinTestUtils.getHomeDirectory())
PathMacros.getInstance().removeMacro(TEMP_DIR_MACRO_KEY)
super.tearDown()