Minor. Reformat AbstractCompileKotlinAgainstJavaTest
This commit is contained in:
+29
-27
@@ -17,26 +17,27 @@
|
|||||||
package org.jetbrains.kotlin.jvm.compiler
|
package org.jetbrains.kotlin.jvm.compiler
|
||||||
|
|
||||||
import com.intellij.openapi.Disposable
|
import com.intellij.openapi.Disposable
|
||||||
import org.jetbrains.kotlin.javac.JavacWrapper
|
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
|
import org.jetbrains.kotlin.cli.jvm.compiler.EnvironmentConfigFiles
|
||||||
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
|
import org.jetbrains.kotlin.cli.jvm.compiler.KotlinCoreEnvironment
|
||||||
import org.jetbrains.kotlin.config.JVMConfigurationKeys
|
import org.jetbrains.kotlin.config.JVMConfigurationKeys
|
||||||
|
import org.jetbrains.kotlin.javac.JavacWrapper
|
||||||
import org.jetbrains.kotlin.name.FqName
|
import org.jetbrains.kotlin.name.FqName
|
||||||
import org.jetbrains.kotlin.renderer.*
|
import org.jetbrains.kotlin.renderer.AnnotationArgumentsRenderingPolicy
|
||||||
|
import org.jetbrains.kotlin.renderer.DescriptorRenderer
|
||||||
|
import org.jetbrains.kotlin.renderer.DescriptorRendererModifier
|
||||||
|
import org.jetbrains.kotlin.renderer.ParameterNameRenderingPolicy
|
||||||
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
|
import org.jetbrains.kotlin.resolve.lazy.JvmResolveUtil
|
||||||
import org.jetbrains.kotlin.test.ConfigurationKind
|
import org.jetbrains.kotlin.test.ConfigurationKind
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils
|
import org.jetbrains.kotlin.test.KotlinTestUtils
|
||||||
|
import org.jetbrains.kotlin.test.KotlinTestUtils.*
|
||||||
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
|
import org.jetbrains.kotlin.test.TestCaseWithTmpdir
|
||||||
import org.jetbrains.kotlin.test.TestJdkKind
|
import org.jetbrains.kotlin.test.TestJdkKind
|
||||||
|
import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile
|
||||||
import org.junit.Assert
|
import org.junit.Assert
|
||||||
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.io.IOException
|
import java.io.IOException
|
||||||
import java.lang.annotation.Retention
|
import java.lang.annotation.Retention
|
||||||
|
|
||||||
import org.jetbrains.kotlin.test.KotlinTestUtils.*
|
|
||||||
import org.jetbrains.kotlin.test.util.RecursiveDescriptorComparator.validateAndCompareDescriptorWithFile
|
|
||||||
|
|
||||||
abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
|
abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
|
||||||
|
|
||||||
@Throws(IOException::class)
|
@Throws(IOException::class)
|
||||||
@@ -46,15 +47,17 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
|
|||||||
val javaFile = File(ktFilePath.replaceFirst("\\.kt$".toRegex(), ".java"))
|
val javaFile = File(ktFilePath.replaceFirst("\\.kt$".toRegex(), ".java"))
|
||||||
val out = File(tmpdir, "out")
|
val out = File(tmpdir, "out")
|
||||||
|
|
||||||
val compiledSuccessfully = compileKotlinWithJava(listOf(javaFile),
|
val compiledSuccessfully = compileKotlinWithJava(
|
||||||
listOf(ktFile),
|
listOf(javaFile),
|
||||||
out, testRootDisposable)
|
listOf(ktFile),
|
||||||
|
out, testRootDisposable
|
||||||
|
)
|
||||||
if (!compiledSuccessfully) return
|
if (!compiledSuccessfully) return
|
||||||
|
|
||||||
val environment = KotlinCoreEnvironment.createForTests(
|
val environment = KotlinCoreEnvironment.createForTests(
|
||||||
testRootDisposable,
|
testRootDisposable,
|
||||||
newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, getAnnotationsJar(), out),
|
newConfiguration(ConfigurationKind.ALL, TestJdkKind.MOCK_JDK, getAnnotationsJar(), out),
|
||||||
EnvironmentConfigFiles.JVM_CONFIG_FILES
|
EnvironmentConfigFiles.JVM_CONFIG_FILES
|
||||||
)
|
)
|
||||||
|
|
||||||
environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
|
environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
|
||||||
@@ -71,10 +74,10 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
|
|||||||
|
|
||||||
@Throws(IOException::class)
|
@Throws(IOException::class)
|
||||||
fun compileKotlinWithJava(
|
fun compileKotlinWithJava(
|
||||||
javaFiles: List<File>,
|
javaFiles: List<File>,
|
||||||
ktFiles: List<File>,
|
ktFiles: List<File>,
|
||||||
outDir: File,
|
outDir: File,
|
||||||
disposable: Disposable
|
disposable: Disposable
|
||||||
): Boolean {
|
): Boolean {
|
||||||
val environment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable)
|
val environment = createEnvironmentWithMockJdkAndIdeaAnnotations(disposable)
|
||||||
environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
|
environment.configuration.put(JVMConfigurationKeys.USE_JAVAC, true)
|
||||||
@@ -85,8 +88,7 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
|
|||||||
arguments = arrayOf("-proc:none"))
|
arguments = arrayOf("-proc:none"))
|
||||||
if (!ktFiles.isEmpty()) {
|
if (!ktFiles.isEmpty()) {
|
||||||
LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment)
|
LoadDescriptorUtil.compileKotlinToDirAndGetModule(ktFiles, outDir, environment)
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
val mkdirs = outDir.mkdirs()
|
val mkdirs = outDir.mkdirs()
|
||||||
assert(mkdirs) { "Not created: $outDir" }
|
assert(mkdirs) { "Not created: $outDir" }
|
||||||
}
|
}
|
||||||
@@ -98,14 +100,14 @@ abstract class AbstractCompileKotlinAgainstJavaTest : TestCaseWithTmpdir() {
|
|||||||
// Do not render parameter names because there are test cases where classes inherit from JDK collections,
|
// Do not render parameter names because there are test cases where classes inherit from JDK collections,
|
||||||
// and some versions of JDK have debug information in the class files (including parameter names), and some don't
|
// and some versions of JDK have debug information in the class files (including parameter names), and some don't
|
||||||
private val CONFIGURATION = AbstractLoadJavaTest.COMPARATOR_CONFIGURATION.withRenderer(
|
private val CONFIGURATION = AbstractLoadJavaTest.COMPARATOR_CONFIGURATION.withRenderer(
|
||||||
DescriptorRenderer.withOptions {
|
DescriptorRenderer.withOptions {
|
||||||
withDefinedIn = false
|
withDefinedIn = false
|
||||||
parameterNameRenderingPolicy = ParameterNameRenderingPolicy.NONE
|
parameterNameRenderingPolicy = ParameterNameRenderingPolicy.NONE
|
||||||
verbose = true
|
verbose = true
|
||||||
annotationArgumentsRenderingPolicy = AnnotationArgumentsRenderingPolicy.UNLESS_EMPTY
|
annotationArgumentsRenderingPolicy = AnnotationArgumentsRenderingPolicy.UNLESS_EMPTY
|
||||||
excludedAnnotationClasses = setOf(FqName(Retention::class.java.name))
|
excludedAnnotationClasses = setOf(FqName(Retention::class.java.name))
|
||||||
modifiers = DescriptorRendererModifier.ALL
|
modifiers = DescriptorRendererModifier.ALL
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user