[Test] Add missing disposal for test root disposables
^KT-64099
This commit is contained in:
committed by
Space Team
parent
32fe29b8cc
commit
3497809ebd
+11
-2
@@ -6,6 +6,8 @@
|
||||
package org.jetbrains.kotlin.scripting.compiler.test
|
||||
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.util.Disposer
|
||||
import com.intellij.util.ThrowableRunnable
|
||||
import junit.framework.TestCase
|
||||
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
|
||||
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
|
||||
@@ -20,6 +22,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
|
||||
import org.jetbrains.kotlin.test.ConfigurationKind
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.TestJdkKind
|
||||
import org.jetbrains.kotlin.test.testFramework.RunAll
|
||||
import java.io.File
|
||||
import kotlin.script.experimental.host.ScriptingHostConfiguration
|
||||
import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
|
||||
@@ -27,10 +30,16 @@ import kotlin.script.experimental.jvm.defaultJvmScriptingHostConfiguration
|
||||
private const val testDataPath = "plugins/scripting/scripting-compiler/testData/compiler/collectDependencies"
|
||||
|
||||
class CollectScriptCompilationDependenciesTest : TestCase() {
|
||||
|
||||
protected val testRootDisposable: Disposable =
|
||||
private val testRootDisposable: Disposable =
|
||||
TestDisposable("${CollectScriptCompilationDependenciesTest::class.simpleName}.testRootDisposable")
|
||||
|
||||
override fun tearDown() {
|
||||
RunAll(
|
||||
ThrowableRunnable { Disposer.dispose(testRootDisposable) },
|
||||
ThrowableRunnable { super.tearDown() },
|
||||
)
|
||||
}
|
||||
|
||||
fun testCascadeImport() {
|
||||
runTest("imp_imp_leaf.req1.kts", listOf("imp_leaf.req1.kts", "leaf.req1.kts"))
|
||||
}
|
||||
|
||||
+10
@@ -6,6 +6,8 @@
|
||||
package org.jetbrains.kotlin.scripting.compiler.test
|
||||
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.util.Disposer
|
||||
import com.intellij.util.ThrowableRunnable
|
||||
import junit.framework.TestCase
|
||||
import kotlinx.coroutines.runBlocking
|
||||
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
|
||||
@@ -20,6 +22,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinitionProvider
|
||||
import org.jetbrains.kotlin.test.ConfigurationKind
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.TestJdkKind
|
||||
import org.jetbrains.kotlin.test.testFramework.RunAll
|
||||
import org.junit.Assert
|
||||
import java.io.File
|
||||
import java.nio.file.Files
|
||||
@@ -36,6 +39,13 @@ private const val testDataPath = "plugins/scripting/scripting-compiler/testData/
|
||||
class CompileTimeFibonacciTest : TestCase() {
|
||||
private val testRootDisposable: Disposable = TestDisposable("${CompileTimeFibonacciTest::class.simpleName}.testRootDisposable")
|
||||
|
||||
override fun tearDown() {
|
||||
RunAll(
|
||||
ThrowableRunnable { Disposer.dispose(testRootDisposable) },
|
||||
ThrowableRunnable { super.tearDown() },
|
||||
)
|
||||
}
|
||||
|
||||
fun testFibonacciWithSupportedNumbersImplementsTheCorrectConstants() {
|
||||
val outputLines = runScript("supported.fib.kts")
|
||||
.valueOr { failure ->
|
||||
|
||||
+10
@@ -6,6 +6,8 @@
|
||||
package org.jetbrains.kotlin.scripting.compiler.test
|
||||
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.util.Disposer
|
||||
import com.intellij.util.ThrowableRunnable
|
||||
import junit.framework.TestCase
|
||||
import org.jetbrains.kotlin.cli.common.config.addKotlinSourceRoot
|
||||
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
|
||||
@@ -21,6 +23,7 @@ import org.jetbrains.kotlin.scripting.resolve.getScriptCollectedData
|
||||
import org.jetbrains.kotlin.test.ConfigurationKind
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.TestJdkKind
|
||||
import org.jetbrains.kotlin.test.testFramework.RunAll
|
||||
import java.io.File
|
||||
import kotlin.reflect.KClass
|
||||
import kotlin.script.experimental.api.*
|
||||
@@ -42,6 +45,13 @@ private annotation class AnnotationWithVarArgAndArray(vararg val options: String
|
||||
class ConstructAnnotationTest : TestCase() {
|
||||
private val testRootDisposable: Disposable = TestDisposable("${ConstructAnnotationTest::class.simpleName}.testRootDisposable")
|
||||
|
||||
override fun tearDown() {
|
||||
RunAll(
|
||||
ThrowableRunnable { Disposer.dispose(testRootDisposable) },
|
||||
ThrowableRunnable { super.tearDown() },
|
||||
)
|
||||
}
|
||||
|
||||
fun testAnnotationEmptyVarArg() {
|
||||
val annotations = annotations("TestAnnotationEmptyVarArg.kts", TestAnnotation::class)
|
||||
.valueOrThrow()
|
||||
|
||||
+10
-1
@@ -6,6 +6,8 @@
|
||||
package org.jetbrains.kotlin.scripting.compiler.test
|
||||
|
||||
import com.intellij.openapi.Disposable
|
||||
import com.intellij.openapi.util.Disposer
|
||||
import com.intellij.util.ThrowableRunnable
|
||||
import junit.framework.TestCase
|
||||
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys.MESSAGE_COLLECTOR_KEY
|
||||
import org.jetbrains.kotlin.cli.common.ExitCode
|
||||
@@ -21,6 +23,7 @@ import org.jetbrains.kotlin.scripting.definitions.ScriptDefinition
|
||||
import org.jetbrains.kotlin.test.ConfigurationKind
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||
import org.jetbrains.kotlin.test.TestJdkKind
|
||||
import org.jetbrains.kotlin.test.testFramework.RunAll
|
||||
import org.jetbrains.kotlin.utils.PathUtil
|
||||
import org.junit.Assert
|
||||
import java.io.File
|
||||
@@ -34,8 +37,14 @@ import kotlin.script.experimental.jvm.*
|
||||
private const val testDataPath = "plugins/scripting/scripting-compiler/testData/cliCompilation"
|
||||
|
||||
class ScriptCliCompilationTest : TestCase() {
|
||||
private val testRootDisposable: Disposable = TestDisposable("${ScriptCliCompilationTest::class.simpleName}.testRootDisposable")
|
||||
|
||||
protected val testRootDisposable: Disposable = TestDisposable("${ScriptCliCompilationTest::class.simpleName}.testRootDisposable")
|
||||
override fun tearDown() {
|
||||
RunAll(
|
||||
ThrowableRunnable { Disposer.dispose(testRootDisposable) },
|
||||
ThrowableRunnable { super.tearDown() },
|
||||
)
|
||||
}
|
||||
|
||||
fun testPrerequisites() {
|
||||
Assert.assertTrue(thisClasspath.isNotEmpty())
|
||||
|
||||
Reference in New Issue
Block a user