Move common logic from CodegenTestCase to KotlinBaseTest

This commit is contained in:
Mikhail Bogdanov
2020-06-10 14:30:47 +02:00
parent 9d48ecfac3
commit 929bb0e8d1
32 changed files with 247 additions and 240 deletions
@@ -8,5 +8,5 @@ package org.jetbrains.kotlin.android.parcel
import org.jetbrains.kotlin.test.TargetBackend
abstract class AbstractParcelIrBoxTest : AbstractParcelBoxTest() {
override fun getBackend() = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
}
@@ -9,7 +9,7 @@ import org.jetbrains.kotlin.test.TargetBackend
import java.io.File
abstract class AbstractParcelIrBytecodeListingTest : AbstractParcelBytecodeListingTest() {
override fun getBackend() = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
override fun getExpectedTextFileName(wholeFile: File): String {
return wholeFile.nameWithoutExtension + ".ir.txt"
@@ -8,5 +8,5 @@ package org.jetbrains.kotlin.android.synthetic.test
import org.jetbrains.kotlin.test.TargetBackend
abstract class AbstractAndroidIrBoxTest : AbstractAndroidBoxTest() {
override fun getBackend() = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
}
@@ -17,8 +17,8 @@ abstract class AbstractFirAllOpenDiagnosticTest : AbstractFirDiagnosticsTest() {
service.registerExtensions(FirAllOpenComponentRegistrar().configure())
}
override fun performCustomConfiguration(configuration: CompilerConfiguration) {
super.performCustomConfiguration(configuration)
override fun updateConfiguration(configuration: CompilerConfiguration) {
super.updateConfiguration(configuration)
val jar = File("plugins/fir/fir-plugin-prototype/plugin-annotations/build/libs/plugin-annotations-1.4.255-SNAPSHOT.jar")
if (!jar.exists()) {
throw AssertionError("Jar with annotations does not exist. Please run :plugins:fir:fir-plugin-prototype:plugin-annotations:jar")
@@ -8,5 +8,5 @@ package org.jetbrains.kotlin.kapt3.test
import org.jetbrains.kotlin.test.TargetBackend
abstract class AbstractIrKotlinKapt3IntegrationTest : AbstractKotlinKapt3IntegrationTest() {
override fun getBackend() = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
}
@@ -12,9 +12,9 @@ Currently Kapt3 only works with the old backend. To enable IR, modify the isIrBa
*/
abstract class AbstractIrClassFileToSourceStubConverterTest : AbstractClassFileToSourceStubConverterTest() {
override fun getBackend() = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
}
abstract class AbstractIrKotlinKaptContextTest : AbstractKotlinKaptContextTest() {
override fun getBackend() = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
}
@@ -19,7 +19,7 @@ abstract class AbstractSerializationIrBytecodeListingTest : AbstractAsmLikeInstr
return wholeFile.nameWithoutExtension + ".ir.txt"
}
override fun getBackend(): TargetBackend = TargetBackend.JVM_IR
override val backend = TargetBackend.JVM_IR
override fun setupEnvironment(environment: KotlinCoreEnvironment) {
SerializationComponentRegistrar.registerExtensions(environment.project)