Skip to content

Commit ca33043

Browse files
committed
Update compiler tests infra
1 parent ff67927 commit ca33043

File tree

8 files changed

+539
-543
lines changed

8 files changed

+539
-543
lines changed

tests/compiler-plugin-tests/build.gradle.kts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@ tasks.test {
113113

114114
useJUnitPlatform()
115115

116+
systemProperty("idea.ignore.disabled.plugins", "true")
117+
systemProperty("idea.home.path", rootDir)
118+
116119
systemPropertyLogged("kotlinx.rpc.globalRootDir", globalRootDir)
117120
systemPropertyLogged("kotlin.test.update.test.data", updateTestData)
118121

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractBoxTest.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44

55
package kotlinx.rpc.codegen.test.runners
66

7+
import org.jetbrains.kotlin.test.FirParser
78
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
89
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives.DUMP_IR
910
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives.WITH_STDLIB
1011
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives.WITH_REFLECT
12+
import org.jetbrains.kotlin.test.runners.codegen.AbstractFirBlackBoxCodegenTestBase
1113
import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
1214
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
1315

14-
open class AbstractBoxTest : BaseTestRunner() {
16+
open class AbstractBoxTest : AbstractFirBlackBoxCodegenTestBase(FirParser.LightTree) {
1517
override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
1618
return EnvironmentBasedStandardLibrariesPathProvider
1719
}

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/AbstractDiagnosticTest.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,17 @@
44

55
package kotlinx.rpc.codegen.test.runners
66

7+
import org.jetbrains.kotlin.test.FirParser
78
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
9+
import org.jetbrains.kotlin.test.runners.AbstractFirPhasedDiagnosticTest
10+
import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
11+
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
12+
13+
open class AbstractDiagnosticTest : AbstractFirPhasedDiagnosticTest(FirParser.LightTree) {
14+
override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
15+
return EnvironmentBasedStandardLibrariesPathProvider
16+
}
817

9-
open class AbstractDiagnosticTest : BaseTestRunner() {
1018
override fun configure(builder: TestConfigurationBuilder) {
1119
super.configure(builder)
1220

tests/compiler-plugin-tests/src/test/kotlin/kotlinx/rpc/codegen/test/runners/BaseTestRunner.kt

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,10 @@ package kotlinx.rpc.codegen.test.runners
77
import kotlinx.rpc.codegen.test.services.ExtensionRegistrarConfigurator
88
import kotlinx.rpc.codegen.test.services.RpcCompileClasspathProvider
99
import kotlinx.rpc.codegen.test.services.RpcRuntimeClasspathProvider
10-
import org.jetbrains.kotlin.test.FirParser
1110
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
1211
import org.jetbrains.kotlin.test.directives.CodegenTestDirectives
1312
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
1413
import org.jetbrains.kotlin.test.directives.JvmEnvironmentConfigurationDirectives
15-
import org.jetbrains.kotlin.test.initIdeaConfiguration
16-
import org.jetbrains.kotlin.test.runners.AbstractFirPhasedDiagnosticTest
17-
import org.jetbrains.kotlin.test.services.EnvironmentBasedStandardLibrariesPathProvider
18-
import org.jetbrains.kotlin.test.services.KotlinStandardLibrariesPathProvider
19-
import org.junit.jupiter.api.BeforeAll
20-
21-
abstract class BaseTestRunner : AbstractFirPhasedDiagnosticTest(FirParser.LightTree) {
22-
companion object {
23-
@BeforeAll
24-
@JvmStatic
25-
fun setUp() {
26-
initIdeaConfiguration()
27-
}
28-
}
29-
30-
override fun createKotlinStandardLibrariesPathProvider(): KotlinStandardLibrariesPathProvider {
31-
return EnvironmentBasedStandardLibrariesPathProvider
32-
}
33-
}
3414

3515
fun TestConfigurationBuilder.commonFirWithPluginFrontendConfiguration() {
3616
defaultDirectives {

tests/compiler-plugin-tests/src/testData/box/customParameterTypes.fir.ir.txt

Lines changed: 204 additions & 202 deletions
Large diffs are not rendered by default.

tests/compiler-plugin-tests/src/testData/box/flowParameter.fir.ir.txt

Lines changed: 122 additions & 121 deletions
Large diffs are not rendered by default.

tests/compiler-plugin-tests/src/testData/box/multiModule.fir.ir.txt

Lines changed: 99 additions & 99 deletions
Large diffs are not rendered by default.

tests/compiler-plugin-tests/src/testData/box/simple.fir.ir.txt

Lines changed: 99 additions & 99 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)