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

Clear application in CompilerApiTest

Browse Source
This commit is contained in:
Nikolay Krasko
2017-08-07 20:07:13 +03:00
parent 4e190248cd
commit e35b262827
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/kotlin/daemon/CompilerApiTest.kt
+15 -7
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.daemon package org.jetbrains.kotlin.daemon
import com.intellij.openapi.application.ApplicationManager
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
@@ -29,6 +30,7 @@ import org.jetbrains.kotlin.daemon.common.*
import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase import org.jetbrains.kotlin.integration.KotlinIntegrationTestBase
import org.jetbrains.kotlin.scripts.captureOut import org.jetbrains.kotlin.scripts.captureOut
import org.jetbrains.kotlin.test.KotlinTestUtils import org.jetbrains.kotlin.test.KotlinTestUtils
import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase
import org.junit.Assert import org.junit.Assert
import java.io.File import java.io.File
import java.net.URLClassLoader import java.net.URLClassLoader
@@ -45,15 +47,21 @@ class CompilerApiTest : KotlinIntegrationTestBase() {
val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) } val compilerId by lazy(LazyThreadSafetyMode.NONE) { CompilerId.makeCompilerId(compilerClassPath) }
private fun compileLocally(messageCollector: TestMessageCollector, vararg args: String): Pair<Int, Collection<OutputMessageUtil.Output>> { private fun compileLocally(messageCollector: TestMessageCollector, vararg args: String): Pair<Int, Collection<OutputMessageUtil.Output>> {
val code = K2JVMCompiler().exec(messageCollector, val application = ApplicationManager.getApplication()
Services.EMPTY, try {
K2JVMCompilerArguments().apply { K2JVMCompiler().parseArguments(args, this) }).code val code = K2JVMCompiler().exec(messageCollector,
val outputs = messageCollector.messages.filter { it.severity == CompilerMessageSeverity.OUTPUT }.mapNotNull { Services.EMPTY,
OutputMessageUtil.parseOutputMessage(it.message)?.let { outs -> K2JVMCompilerArguments().apply { K2JVMCompiler().parseArguments(args, this) }).code
outs.outputFile?.let { OutputMessageUtil.Output(outs.sourceFiles, it) } val outputs = messageCollector.messages.filter { it.severity == CompilerMessageSeverity.OUTPUT }.mapNotNull {
OutputMessageUtil.parseOutputMessage(it.message)?.let { outs ->
outs.outputFile?.let { OutputMessageUtil.Output(outs.sourceFiles, it) }
}
} }
return code to outputs
}
finally {
KtUsefulTestCase.resetApplicationToNull(application)
} }
return code to outputs
} }
private fun compileOnDaemon(clientAliveFile: File, compilerId: CompilerId, daemonJVMOptions: DaemonJVMOptions, daemonOptions: DaemonOptions, private fun compileOnDaemon(clientAliveFile: File, compilerId: CompilerId, daemonJVMOptions: DaemonJVMOptions, daemonOptions: DaemonOptions,