Skip to content

Commit df12b11

Browse files
vsukharevSpace Team
authored and
Space Team
committed
[Tests][JS] Add kotlinx.serialization testrunner with +IrInlinerBeforeKlibSerialization
^KT-76326 Merge-request: KT-MR-21866 Merged-by: Vladimir Sukharev <[email protected]>
1 parent 69b58f1 commit df12b11

File tree

3 files changed

+264
-2
lines changed

3 files changed

+264
-2
lines changed

plugins/kotlinx-serialization/tests-gen/org/jetbrains/kotlinx/serialization/runners/SerializationFirJsBoxWithInlinedFunInKlibTestGenerated.java

Lines changed: 242 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/TestGenerator.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ fun main(args: Array<String>) {
7777
model("boxIr")
7878
}
7979

80+
testClass<AbstractSerializationFirJsBoxWithInlinedFunInKlibTest> {
81+
model("boxIr")
82+
}
8083
// ------------------------------- code compile -------------------------------
8184

8285
testClass<AbstractCompilerFacilityTestForSerialization> {

plugins/kotlinx-serialization/tests/org/jetbrains/kotlinx/serialization/runners/BoxTests.kt

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
package org.jetbrains.kotlinx.serialization.runners
77

8+
import org.jetbrains.kotlin.config.LanguageFeature
89
import org.jetbrains.kotlin.js.test.fir.AbstractFirJsTest
910
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
1011
import org.jetbrains.kotlin.test.runners.codegen.AbstractFirLightTreeBlackBoxCodegenTest
@@ -13,6 +14,7 @@ import org.jetbrains.kotlinx.serialization.configureForKotlinxSerialization
1314
import org.jetbrains.kotlin.js.test.ir.AbstractJsIrTest;
1415
import org.jetbrains.kotlin.test.TargetBackend
1516
import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives
17+
import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.LANGUAGE
1618

1719
open class AbstractSerializationIrBoxTest : AbstractIrBlackBoxCodegenTest() {
1820
override fun configure(builder: TestConfigurationBuilder) {
@@ -76,12 +78,27 @@ open class AbstractSerializationIrJsBoxTest : AbstractJsIrTest(
7678
}
7779
}
7880

79-
open class AbstractSerializationFirJsBoxTest : AbstractFirJsTest(
81+
open class AbstractSerializationFirJsBoxTest(
82+
testGroupOutputDirPrefix: String = "codegen/serializationBoxFir/"
83+
) : AbstractFirJsTest(
8084
pathToTestDir = "plugins/kotlinx-serialization/testData/boxIr/",
81-
testGroupOutputDirPrefix = "codegen/serializationBoxFir/"
85+
testGroupOutputDirPrefix = testGroupOutputDirPrefix,
8286
) {
8387
override fun configure(builder: TestConfigurationBuilder) {
8488
super.configure(builder)
8589
builder.configureForKotlinxSerialization(target = TargetBackend.JS_IR)
8690
}
8791
}
92+
93+
open class AbstractSerializationFirJsBoxWithInlinedFunInKlibTest : AbstractSerializationFirJsBoxTest(
94+
testGroupOutputDirPrefix = "codegen/serializationBoxFirWithInlinedFunInKlib/"
95+
) {
96+
override fun configure(builder: TestConfigurationBuilder) {
97+
super.configure(builder)
98+
with(builder) {
99+
defaultDirectives {
100+
LANGUAGE with "+${LanguageFeature.IrInlinerBeforeKlibSerialization.name}"
101+
}
102+
}
103+
}
104+
}

0 commit comments

Comments
 (0)