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

Minor. Reformat AbstractCompileKotlinAgainstJavaTest

Browse Source
This commit is contained in:
Denis Zharkov
2018-03-13 16:11:24 +03:00
parent c334f46825
commit 1766812bf3
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileKotlinAgainstJavaTest.kt
+12 -10
View File
@@ -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,9 +47,11 @@ 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(javaFile),
listOf(ktFile), listOf(ktFile),
out, testRootDisposable) out, testRootDisposable
)
if (!compiledSuccessfully) return if (!compiledSuccessfully) return
val environment = KotlinCoreEnvironment.createForTests( val environment = KotlinCoreEnvironment.createForTests(
@@ -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" }
} }