Do not use MockLibraryUtil in AbstractTopLevelMembersInvocationTest
MockLibraryUtil runs the compiler in the new class loader, which is useful for IDE tests to avoid loading KotlinCoreEnvironment, but is not needed and is suboptimal for compiler tests. Also use another method in AbstractForeignAnnotationsTest to assert that there are no files in the compiled libraries
This commit is contained in:
@@ -18,7 +18,9 @@ package org.jetbrains.kotlin.test
|
||||
|
||||
import org.jetbrains.kotlin.cli.common.CLITool
|
||||
import org.jetbrains.kotlin.cli.common.ExitCode
|
||||
import org.jetbrains.kotlin.cli.jvm.K2JVMCompiler
|
||||
import java.io.ByteArrayOutputStream
|
||||
import java.io.File
|
||||
import java.io.PrintStream
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
@@ -42,4 +44,27 @@ object CompilerTestUtil {
|
||||
System.setErr(origErr)
|
||||
}
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
@JvmOverloads
|
||||
fun compileJvmLibrary(
|
||||
src: File,
|
||||
libraryName: String = "library",
|
||||
extraOptions: List<String> = emptyList(),
|
||||
extraClasspath: List<File> = emptyList()
|
||||
): File {
|
||||
val destination = File(KotlinTestUtils.tmpDir("testLibrary"), "$libraryName.jar")
|
||||
val args = mutableListOf<String>().apply {
|
||||
add(src.path)
|
||||
add("-d")
|
||||
add(destination.path)
|
||||
if (extraClasspath.isNotEmpty()) {
|
||||
add("-cp")
|
||||
add(extraClasspath.joinToString(":") { it.path })
|
||||
}
|
||||
addAll(extraOptions)
|
||||
}
|
||||
executeCompilerAssertSuccessful(K2JVMCompiler(), args)
|
||||
return destination
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() {
|
||||
}
|
||||
|
||||
protected fun compileTestAnnotations(extraClassPath: List<File>): List<File> =
|
||||
listOf(MockLibraryUtil.compileJvmLibraryToJar(
|
||||
listOf(MockLibraryUtil.compileJavaFilesLibraryToJar(
|
||||
TEST_ANNOTATIONS_SOURCE_PATH,
|
||||
"test-foreign-annotations",
|
||||
extraOptions = listOf("-Xallow-kotlin-package"),
|
||||
@@ -48,7 +48,7 @@ abstract class AbstractForeignAnnotationsTest : AbstractDiagnosticsTest() {
|
||||
))
|
||||
|
||||
protected fun createJarWithForeignAnnotations(): List<File> = listOf(
|
||||
MockLibraryUtil.compileJvmLibraryToJar(annotationsPath, "foreign-annotations"),
|
||||
MockLibraryUtil.compileJavaFilesLibraryToJar(annotationsPath, "foreign-annotations"),
|
||||
ForTestCompileRuntime.jvmAnnotationsForTests()
|
||||
)
|
||||
|
||||
|
||||
+2
-2
@@ -22,9 +22,9 @@ import kotlin.collections.CollectionsKt;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles;
|
||||
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment;
|
||||
import org.jetbrains.kotlin.test.CompilerTestUtil;
|
||||
import org.jetbrains.kotlin.test.ConfigurationKind;
|
||||
import org.jetbrains.kotlin.test.KotlinTestUtils;
|
||||
import org.jetbrains.kotlin.test.MockLibraryUtil;
|
||||
import org.jetbrains.kotlin.test.TestJdkKind;
|
||||
|
||||
import java.io.File;
|
||||
@@ -52,7 +52,7 @@ public abstract class AbstractTopLevelMembersInvocationTest extends AbstractByte
|
||||
File library = new File(root, LIBRARY);
|
||||
List<File> classPath =
|
||||
library.exists()
|
||||
? Collections.singletonList(MockLibraryUtil.compileJvmLibraryToJar(library.getPath(), LIBRARY))
|
||||
? Collections.singletonList(CompilerTestUtil.compileJvmLibrary(library))
|
||||
: Collections.emptyList();
|
||||
|
||||
assert !sourceFiles.isEmpty() : getTestName(true) + " should contain at least one .kt file";
|
||||
Reference in New Issue
Block a user