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

minor: get rid of the compiler-test dependency in source-sections test

Browse Source
This commit is contained in:
Ilya Chernikov
2017-03-20 21:15:19 +01:00
parent 1eab936618
commit 08f6b6c93c
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/source-sections/source-sections-compiler/source-sections-compiler.iml
-1
View File
@@ -19,6 +19,5 @@
<orderEntry type="module" module-name="util" scope="TEST" /> <orderEntry type="module" module-name="util" scope="TEST" />
<orderEntry type="module" module-name="daemon-client" scope="TEST" /> <orderEntry type="module" module-name="daemon-client" scope="TEST" />
<orderEntry type="module" module-name="daemon-common" scope="TEST" /> <orderEntry type="module" module-name="daemon-common" scope="TEST" />
<orderEntry type="module" module-name="compiler-tests" scope="TEST" />
</component> </component>
</module> </module>
plugins/source-sections/source-sections-compiler/tests/org/jetbrains/kotlin/sourceSections/SourceSectionsTest.kt
+15 -9
View File
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin.sourceSections
import com.intellij.openapi.vfs.StandardFileSystems import com.intellij.openapi.vfs.StandardFileSystems
import junit.framework.TestCase import junit.framework.TestCase
import org.jetbrains.kotlin.cli.AbstractCliTest import org.jetbrains.kotlin.cli.common.CLICompiler
import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
import org.jetbrains.kotlin.cli.common.messages.* import org.jetbrains.kotlin.cli.common.messages.*
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
@@ -154,10 +154,12 @@ class SourceSectionsTest : TestCaseWithTmpdir() {
sourceToOutput.forEach { (source, expectedOutput) -> sourceToOutput.forEach { (source, expectedOutput) ->
val args = listOf(source.canonicalPath, "-d", tmpdir.canonicalPath, val args = arrayOf(source.canonicalPath, "-d", tmpdir.canonicalPath,
"-Xplugin", sourceSectionsPluginJar.canonicalPath, "-Xplugin", sourceSectionsPluginJar.canonicalPath,
"-P", TEST_ALLOWED_SECTIONS.joinToString(",") { "plugin:${SourceSectionsCommandLineProcessor.PLUGIN_ID}:${SourceSectionsCommandLineProcessor.SECTIONS_OPTION.name}=$it" }) "-P", TEST_ALLOWED_SECTIONS.joinToString(",") { "plugin:${SourceSectionsCommandLineProcessor.PLUGIN_ID}:${SourceSectionsCommandLineProcessor.SECTIONS_OPTION.name}=$it" })
val (output, code) = AbstractCliTest.executeCompilerGrabOutput(K2JVMCompiler(), args) val (output, code) = captureOut {
CLICompiler.doMainNoExit(K2JVMCompiler(), args)
}
TestCase.assertEquals("Compilation failed:\n$output", 0, code.code) TestCase.assertEquals("Compilation failed:\n$output", 0, code.code)
@@ -221,7 +223,7 @@ class SourceSectionsTest : TestCaseWithTmpdir() {
private fun verifyScriptOutput(scriptClass: Class<*>?, expectedOutput: File) { private fun verifyScriptOutput(scriptClass: Class<*>?, expectedOutput: File) {
val scriptOut = captureOut { val scriptOut = captureOut {
tryConstructClassFromStringArgs(scriptClass!!, emptyList()) tryConstructClassFromStringArgs(scriptClass!!, emptyList())
} }.first
val expected = expectedOutput.readText() val expected = expectedOutput.readText()
TestCase.assertEquals(expected, scriptOut) TestCase.assertEquals(expected, scriptOut)
@@ -238,18 +240,22 @@ internal inline fun withFlagFile(prefix: String, suffix: String? = null, body: (
} }
} }
internal fun captureOut(body: () -> Unit): String { internal fun<T> captureOut(body: () -> T): Pair<String, T> {
val outStream = ByteArrayOutputStream() val outStream = ByteArrayOutputStream()
val prevOut = System.out val prevOut = System.out
val prevErr = System.err
System.setOut(PrintStream(outStream)) System.setOut(PrintStream(outStream))
try { System.setErr(PrintStream(outStream))
val res =try {
body() body()
} }
finally { finally {
System.out.flush() System.out.flush()
System.setOut(prevOut) System.setOut(prevOut)
System.err.flush()
System.setErr(prevErr)
} }
return outStream.toString() return outStream.toString() to res
} }
class TestMessageCollector : MessageCollector { class TestMessageCollector : MessageCollector {