Refactor embeddable compiler client tests:

- move from the legacy location to the project dir - move testdata from resources to the separate folder (fixes global compileTestKotlin build) - fix classpaths handling
2019-10-02 09:43:50 +02:00
parent 07e067102b
commit cd4cce3f9f
3 changed files with 18 additions and 24 deletions
@@ -1,127 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.compiler.client
-
-import org.junit.Rule
-import org.junit.Test
-import org.junit.rules.TemporaryFolder
-import java.io.File
-import java.io.FileNotFoundException
-import kotlin.test.assertEquals
-import org.jetbrains.kotlin.daemon.client.*
-import org.jetbrains.kotlin.daemon.common.*
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageLocation
-import org.jetbrains.kotlin.cli.common.messages.CompilerMessageSeverity
-import org.jetbrains.kotlin.cli.common.messages.MessageCollector
-import java.io.ByteArrayOutputStream
-import java.io.PrintStream
-
-
-class CompilerClientIT {
-
-    @JvmField
-    @Rule
-    val workingDir = TemporaryFolder()
-
-    private val compilerClasspath: List<File> by lazy {
-        listOf(fileFromProp("compilerJar", "kotlin-compiler.jar"))
-    }
-
-    private val compilationClasspath: List<File> by lazy {
-        listOf(fileFromProp("stdlibJar", "kotlin-stdlib.jar"),
-               fileFromProp("scriptRuntimeJar", "kotlin-script-runtime.jar"))
-    }
-
-    private val clientAliveFile by lazy {
-        createTempFile("client", ".alive").apply {
-            deleteOnExit()
-        }
-    }
-
-    private fun fileFromProp(propName: String, defaultPath: String) =
-            File((System.getProperty(propName) ?: defaultPath)).apply {
-                if (!exists())
-                    throw FileNotFoundException("cannot find $defaultPath ($this)")
-            }
-
-    private val compilerService: CompileService by lazy {
-        val compilerId = CompilerId.makeCompilerId(compilerClasspath)
-        val daemonOptions = DaemonOptions(runFilesPath = File(workingDir.root, "daemonRunPath").absolutePath, verbose = true, reportPerf = true)
-        val daemonJVMOptions = org.jetbrains.kotlin.daemon.common.DaemonJVMOptions()
-        val daemonReportMessages = arrayListOf<DaemonReportMessage>()
-
-        KotlinCompilerClient.connectToCompileService(compilerId, clientAliveFile, daemonJVMOptions, daemonOptions,
-                DaemonReportingTargets(messages = daemonReportMessages), true)
-                ?: throw IllegalStateException("Unable to connect to compiler daemon:" + daemonReportMessages.joinToString("\n  ", prefix = "\n  ") { "${it.category.name} ${it.message}" })
-    }
-
-    private val myMessageCollector = TestMessageCollector()
-
-    @Test
-    fun testSimpleScript() {
-        val (out, code) = runCompiler(
-                "-cp", compilationClasspath.joinToString(File.pathSeparator) { it.canonicalPath },
-                File("../src/test/resources/scripts/simpleHelloWorld.kts").canonicalPath)
-        assertEquals(0, code, "compilation failed:\n" + out + "\n")
-    }
-
-    private fun runCompiler(vararg args: String): Pair<String, Int> {
-
-        var code = -1
-        myMessageCollector.clear()
-        val out = captureOutAndErr {
-            code = KotlinCompilerClient.compile(compilerService, CompileService.NO_SESSION, CompileService.TargetPlatform.JVM, args, myMessageCollector,
-                    reportSeverity = ReportSeverity.DEBUG)
-        }
-        return myMessageCollector.messages.joinToString("\n") { it.message } + "\n" + out to code
-    }
-}
-
-internal fun captureOutAndErr(body: () -> Unit): String {
-    val outStream = ByteArrayOutputStream()
-    val prevOut = System.out
-    val prevErr = System.err
-    System.setOut(PrintStream(outStream))
-    System.setErr(PrintStream(outStream))
-    try {
-        body()
-    }
-    finally {
-        System.out.flush()
-        System.setOut(prevOut)
-        System.err.flush()
-        System.setErr(prevErr)
-    }
-    return outStream.toString()
-}
-
-class TestMessageCollector : MessageCollector {
-
-    data class Message(val severity: CompilerMessageSeverity, val message: String, val location: CompilerMessageLocation?)
-
-    val messages = arrayListOf<Message>()
-
-    override fun clear() {
-        messages.clear()
-    }
-
-    override fun report(severity: CompilerMessageSeverity, message: String, location: CompilerMessageLocation?) {
-        messages.add(Message(severity, message, location))
-    }
-
-    override fun hasErrors(): Boolean = messages.any { it.severity == CompilerMessageSeverity.EXCEPTION || it.severity == CompilerMessageSeverity.ERROR }
-}
@@ -1,2 +0,0 @@
-
-println("Hello, World!")