Minor: reformat AbstractLookupTrackerTest#runCompiler

Original commit: ab90221a93
This commit is contained in:
Alexey Tsvetkov
2017-06-21 15:51:09 +03:00
parent 519036b28e
commit 1faa21470e
@@ -21,6 +21,7 @@ import com.intellij.testFramework.UsefulTestCase
import com.intellij.util.containers.HashMap import com.intellij.util.containers.HashMap
import com.intellij.util.containers.StringInterner import com.intellij.util.containers.StringInterner
import org.jetbrains.kotlin.TestWithWorkingDir import org.jetbrains.kotlin.TestWithWorkingDir
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
import org.jetbrains.kotlin.compilerRunner.* import org.jetbrains.kotlin.compilerRunner.*
import org.jetbrains.kotlin.config.IncrementalCompilation import org.jetbrains.kotlin.config.IncrementalCompilation
@@ -149,27 +150,31 @@ abstract class AbstractLookupTrackerTest : TestWithWorkingDir() {
private fun runCompiler(filesToCompile: Iterable<File>, env: JpsCompilerEnvironment): Any? { private fun runCompiler(filesToCompile: Iterable<File>, env: JpsCompilerEnvironment): Any? {
val module = makeModuleFile(name = "test", val moduleFile = makeModuleFile(name = "test",
isTest = true, isTest = true,
outputDir = outDir, outputDir = outDir,
sourcesToCompile = filesToCompile.toList(), sourcesToCompile = filesToCompile.toList(),
javaSourceRoots = listOf(srcDir), javaSourceRoots = listOf(srcDir),
classpath = listOf(outDir).filter { it.exists() }, classpath = listOf(outDir).filter { it.exists() },
friendDirs = emptyList()) friendDirs = emptyList())
outDir.mkdirs() outDir.mkdirs()
val args = arrayOf("-module", module.canonicalPath, "-Xreport-output-files") val args = K2JVMCompilerArguments().apply {
buildFile = moduleFile.canonicalPath
reportOutputFiles = true
}
val argsArray = ArgumentUtils.convertArgumentsToStringList(args).toTypedArray()
try { try {
val stream = ByteArrayOutputStream() val stream = ByteArrayOutputStream()
val out = PrintStream(stream) val out = PrintStream(stream)
val exitCode = CompilerRunnerUtil.invokeExecMethod(K2JVMCompiler::class.java.name, args, env, out) val exitCode = CompilerRunnerUtil.invokeExecMethod(K2JVMCompiler::class.java.name, argsArray, env, out)
val reader = BufferedReader(StringReader(stream.toString())) val reader = BufferedReader(StringReader(stream.toString()))
CompilerOutputParser.parseCompilerMessagesFromReader(env.messageCollector, reader, env.outputItemsCollector) CompilerOutputParser.parseCompilerMessagesFromReader(env.messageCollector, reader, env.outputItemsCollector)
return exitCode return exitCode
} }
finally { finally {
module.delete() moduleFile.delete()
} }
} }