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

Fix scripting-compiler tests, add them to the global scriptingTest task

Browse Source
This commit is contained in:
Ilya Chernikov
2019-05-24 12:27:41 +02:00
parent deb74acc88
commit e7c99cd494
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingCompilerPluginTest.kt
+4 -3
View File
@@ -26,6 +26,7 @@ import org.jetbrains.kotlin.scripting.configuration.ScriptingConfigurationKeys
import org.jetbrains.kotlin.scripting.definitions.SCRIPT_DEFINITION_MARKERS_PATH
import org.jetbrains.kotlin.scripting.definitions.discoverScriptTemplatesInClasspath
import org.jetbrains.kotlin.scripting.definitions.loadScriptTemplatesFromClasspath
import org.jetbrains.kotlin.scripting.definitions.reporter
import org.jetbrains.kotlin.test.ConfigurationKind
import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
@@ -115,7 +116,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
loadScriptTemplatesFromClasspath(
listOf("TestScriptWithReceivers", "TestScriptWithSimpleEnvVars"),
listOf(defsOut), emptyList(), this::class.java.classLoader, emptyMap(), messageCollector
listOf(defsOut), emptyList(), this::class.java.classLoader, emptyMap(), messageCollector.reporter
).toList()
for (def in defClasses) {
@@ -141,7 +142,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
listOf(defsOut),
this::class.java.classLoader,
emptyMap(),
messageCollector
messageCollector.reporter
)
assertTrue(messageCollector.messages.isEmpty()) {
@@ -212,7 +213,7 @@ class ScriptingCompilerPluginTest : TestCaseWithTmpdir() {
listOf(defsOut),
this::class.java.classLoader,
emptyMap(),
messageCollector
messageCollector.reporter
).toList()
assertTrue(