From 0b3d64719f1f888483e48869d65c2c48616d4ccd Mon Sep 17 00:00:00 2001 From: Dmitriy Dolovov Date: Fri, 8 Dec 2023 17:30:04 +0100 Subject: [PATCH] [test] Split KMP IR text tests onto K1-only and K2-only groups ^KT-60390 --- .../FirLightTreeJvmIrTextTestGenerated.java | 42 +++++++++---------- .../ir/FirPsiJvmIrTextTestGenerated.java | 42 +++++++++---------- .../expectIntersectionOverride.kt | 33 --------------- .../{ => k1}/expectClassInherited.ir.txt | 0 .../{ => k1}/expectClassInherited.kt | 2 + .../{ => k1}/expectClassInherited.kt.txt | 0 .../{ => k1}/expectClassInherited.sig.kt.txt | 0 .../expectMemberInNotExpectClass.ir.txt | 0 .../{ => k1}/expectMemberInNotExpectClass.kt | 2 + .../expectMemberInNotExpectClass.kt.txt | 0 .../expectMemberInNotExpectClass.sig.kt.txt | 0 .../{ => k1}/expectedEnumClass.ir.txt | 0 .../{ => k1}/expectedEnumClass.kt | 5 ++- .../{ => k1}/expectedEnumClass.kt.txt | 0 .../{ => k1}/expectedEnumClass.sig.kt.txt | 0 .../{ => k1}/expectedSealedClass.ir.txt | 0 .../{ => k1}/expectedSealedClass.kt | 2 + .../{ => k1}/expectedSealedClass.kt.txt | 0 .../{ => k1}/expectedSealedClass.sig.kt.txt | 0 .../expectIntersectionOverride.ir.txt | 0 .../k2/expectIntersectionOverride.kt | 31 ++++++++++++++ .../expectIntersectionOverride.kt.txt | 0 .../expectIntersectionOverride.sig.kt.txt | 0 .../expectMemberInNotExpectClass.ir.txt} | 0 .../expectMemberInNotExpectClass.kt} | 7 ++-- .../expectMemberInNotExpectClass.kt.txt} | 0 .../expectMemberInNotExpectClass.sig.kt.txt} | 0 .../expectedEnumClass.ir.txt} | 0 .../expectedEnumClass.kt} | 4 +- .../expectedEnumClass.kt.txt} | 0 .../expectedEnumClass.sig.kt.txt} | 0 .../ir/ClassicJvmIrTextTestGenerated.java | 42 +++++++++---------- .../klib/KlibIrTextTestCaseGenerated.java | 42 +++++++++---------- .../FirLightTreeJsIrTextTestGenerated.java | 42 +++++++++---------- .../test/fir/FirPsiJsIrTextTestGenerated.java | 42 +++++++++---------- .../test/ir/ClassicJsIrTextTestGenerated.java | 42 +++++++++---------- .../ClassicNativeIrTextTestGenerated.java | 42 +++++++++---------- ...FirLightTreeNativeIrTextTestGenerated.java | 42 +++++++++---------- .../FirPsiNativeIrTextTestGenerated.java | 42 +++++++++---------- 39 files changed, 256 insertions(+), 250 deletions(-) delete mode 100644 compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectClassInherited.ir.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectClassInherited.kt (78%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectClassInherited.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectClassInherited.sig.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectMemberInNotExpectClass.ir.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectMemberInNotExpectClass.kt (66%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectMemberInNotExpectClass.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectMemberInNotExpectClass.sig.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedEnumClass.ir.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedEnumClass.kt (56%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedEnumClass.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedEnumClass.sig.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedSealedClass.ir.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedSealedClass.kt (65%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedSealedClass.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k1}/expectedSealedClass.sig.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k2}/expectIntersectionOverride.ir.txt (100%) create mode 100644 compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt rename compiler/testData/ir/irText/declarations/multiplatform/{ => k2}/expectIntersectionOverride.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{ => k2}/expectIntersectionOverride.sig.kt.txt (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectMemberInNotExpectClassFir.ir.txt => k2/expectMemberInNotExpectClass.ir.txt} (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectMemberInNotExpectClassFir.kt => k2/expectMemberInNotExpectClass.kt} (61%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectMemberInNotExpectClassFir.kt.txt => k2/expectMemberInNotExpectClass.kt.txt} (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectMemberInNotExpectClassFir.sig.kt.txt => k2/expectMemberInNotExpectClass.sig.kt.txt} (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectedEnumClass2.ir.txt => k2/expectedEnumClass.ir.txt} (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectedEnumClass2.kt => k2/expectedEnumClass.kt} (76%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectedEnumClass2.kt.txt => k2/expectedEnumClass.kt.txt} (100%) rename compiler/testData/ir/irText/declarations/multiplatform/{expectedEnumClass2.sig.kt.txt => k2/expectedEnumClass.sig.kt.txt} (100%) diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java index c1f41882127..ee89549f903 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirLightTreeJvmIrTextTestGenerated.java @@ -1032,45 +1032,45 @@ public class FirLightTreeJvmIrTextTestGenerated extends AbstractFirLightTreeJvmI } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java index e68fd98b8b5..23c8f1beabf 100644 --- a/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java +++ b/compiler/fir/fir2ir/tests-gen/org/jetbrains/kotlin/test/runners/ir/FirPsiJvmIrTextTestGenerated.java @@ -1032,45 +1032,45 @@ public class FirPsiJvmIrTextTestGenerated extends AbstractFirPsiJvmIrTextTest { } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt b/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt deleted file mode 100644 index ae86cdec4ca..00000000000 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt +++ /dev/null @@ -1,33 +0,0 @@ -// FIR_IDENTICAL -// IGNORE_BACKEND_K1: JVM_IR, JS_IR -// !LANGUAGE: +MultiPlatformProjects - -// KT-61141: NO_ACTUAL_FOR_EXPECT: Expected class 'C' has no actual declaration in module for Native (21,14) in /common.kt -// IGNORE_BACKEND_K1: NATIVE - -// MODULE: common -// FILE: common.kt - -interface I1 { - fun f(): String - - val p: Int -} - -interface I2 { - fun f(): String - - val p: Int -} - -@Suppress("ABSTRACT_MEMBER_NOT_IMPLEMENTED") // Workaround for KT-60390 -expect class C() : I1, I2 - -// MODULE: platform()()(common) -// FILE: platform.kt - -actual class C : I1, I2 { - override fun f() = "OK" - - override val p = 42 -} \ No newline at end of file diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt similarity index 78% rename from compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt index 53c4c0c94ac..47df1011092 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt @@ -1,4 +1,6 @@ // IGNORE_BACKEND_K2: ANY +// ^^^ In FIR, declaring the same `expect` and `actual` classes in one compiler module is not possible (see KT-55177). + // !LANGUAGE: +MultiPlatformProjects expect abstract class A protected constructor() { diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectClassInherited.sig.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt similarity index 66% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt index c29ca83900f..725c6e47df2 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt @@ -1,4 +1,6 @@ // IGNORE_BACKEND_K2: ANY +// ^^^ In FIR, declaring the same `expect` and `actual` classes in one compiler module is not possible (see KT-55177). + // SKIP_KLIB_TEST // LANGUAGE: +MultiPlatformProjects diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectMemberInNotExpectClass.sig.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt similarity index 56% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt index 7a7b9ab4acf..14e02cd02dc 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt @@ -1,6 +1,7 @@ -// !LANGUAGE: +MultiPlatformProjects // IGNORE_BACKEND_K2: ANY -// FIR status: In FIR, declaring the same `expect` and `actual` classes in one compiler module is not possible (see KT-55177). +// ^^^ In FIR, declaring the same `expect` and `actual` classes in one compiler module is not possible (see KT-55177). + +// !LANGUAGE: +MultiPlatformProjects expect enum class MyEnum { FOO, diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedEnumClass.sig.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt similarity index 65% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt index bf74e402391..51d99f6b0bd 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt @@ -1,4 +1,6 @@ // IGNORE_BACKEND_K2: ANY +// ^^^ In FIR, declaring the same `expect` and `actual` classes in one compiler module is not possible (see KT-55177). + // !LANGUAGE: +MultiPlatformProjects // SKIP_KLIB_TEST diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k1/expectedSealedClass.sig.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt new file mode 100644 index 00000000000..fe452f0e160 --- /dev/null +++ b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt @@ -0,0 +1,31 @@ +// IGNORE_BACKEND_K1: ANY +// ^^^ K1 as well as K1-based test infra do not support "fragment refinement". + +// FIR_IDENTICAL +// !LANGUAGE: +MultiPlatformProjects + +// MODULE: common +// FILE: common.kt + +interface I1 { + fun f(): String + val p: Int +} + +interface I2 { + fun f(): String + val p: Int +} + +expect class C() : I1, I2 { + override fun f(): String + override val p: Int +} + +// MODULE: platform()()(common) +// FILE: platform.kt + +actual class C : I1, I2 { + actual override fun f() = "OK" + actual override val p = 42 +} \ No newline at end of file diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectIntersectionOverride.sig.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt similarity index 61% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt index 156cb471505..86db0079d80 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt @@ -1,11 +1,10 @@ +// IGNORE_BACKEND_K1: ANY +// ^^^ K1 as well as K1-based test infra do not support "fragment refinement". + // FIR_IDENTICAL -// IGNORE_BACKEND_K1: JVM_IR, JS_IR // SKIP_KLIB_TEST // LANGUAGE: +MultiPlatformProjects -// KT-61141: NO_ACTUAL_FOR_EXPECT: Expected class 'C1' has no actual declaration in module for Native (9,19) in /common.kt -// IGNORE_BACKEND_K1: NATIVE - // MODULE: common // FILE: common.kt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectMemberInNotExpectClass.sig.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.ir.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.ir.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.ir.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.ir.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt similarity index 76% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt index 654d5c73ce7..96c0d99163d 100644 --- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt +++ b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt @@ -1,6 +1,8 @@ +// IGNORE_BACKEND_K1: ANY +// ^^^ K1 as well as K1-based test infra do not support "fragment refinement". + // FIR_IDENTICAL // !LANGUAGE: +MultiPlatformProjects -// IGNORE_BACKEND_K1: ANY // MODULE: lib // FILE: lib.kt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.kt.txt diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt b/compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.sig.kt.txt similarity index 100% rename from compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.sig.kt.txt rename to compiler/testData/ir/irText/declarations/multiplatform/k2/expectedEnumClass.sig.kt.txt diff --git a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java index 262cf0d99fd..183e1cbd1b0 100644 --- a/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java +++ b/compiler/tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/ir/ClassicJvmIrTextTestGenerated.java @@ -1032,45 +1032,45 @@ public class ClassicJvmIrTextTestGenerated extends AbstractClassicJvmIrTextTest } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java index cec63e50aed..dc2f4fe9c5f 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/klib/KlibIrTextTestCaseGenerated.java @@ -835,39 +835,39 @@ public class KlibIrTextTestCaseGenerated extends AbstractKlibIrTextTestCase { KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("compiler/testData/ir/irText/declarations/multiplatform"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true); } - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java index 396af6f7930..272fbd89a5f 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsIrTextTestGenerated.java @@ -942,45 +942,45 @@ public class FirLightTreeJsIrTextTestGenerated extends AbstractFirLightTreeJsIrT } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java index f404cdc940f..f70b4c59370 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsIrTextTestGenerated.java @@ -942,45 +942,45 @@ public class FirPsiJsIrTextTestGenerated extends AbstractFirPsiJsIrTextTest { } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java index 66b47f38b28..c2c4be95f65 100644 --- a/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java +++ b/js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/ir/ClassicJsIrTextTestGenerated.java @@ -942,45 +942,45 @@ public class ClassicJsIrTextTestGenerated extends AbstractClassicJsIrTextTest { } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java index 8cb9c190f4b..e998d0fea59 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/ClassicNativeIrTextTestGenerated.java @@ -942,45 +942,45 @@ public class ClassicNativeIrTextTestGenerated extends AbstractClassicNativeIrTex } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirLightTreeNativeIrTextTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirLightTreeNativeIrTextTestGenerated.java index 240a7a33abd..86192cf6c8f 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirLightTreeNativeIrTextTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirLightTreeNativeIrTextTestGenerated.java @@ -942,45 +942,45 @@ public class FirLightTreeNativeIrTextTestGenerated extends AbstractFirLightTreeN } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } } diff --git a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirPsiNativeIrTextTestGenerated.java b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirPsiNativeIrTextTestGenerated.java index 6e04815ff59..9475a09f231 100644 --- a/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirPsiNativeIrTextTestGenerated.java +++ b/native/native.tests/tests-gen/org/jetbrains/kotlin/konan/test/irtext/FirPsiNativeIrTextTestGenerated.java @@ -942,45 +942,45 @@ public class FirPsiNativeIrTextTestGenerated extends AbstractFirPsiNativeIrTextT } @Test - @TestMetadata("expectClassInherited.kt") - public void testExpectClassInherited() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.kt"); + @TestMetadata("K1_expectClassInherited.kt") + public void testK1_expectClassInherited() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectClassInherited.kt"); } @Test - @TestMetadata("expectIntersectionOverride.kt") - public void testExpectIntersectionOverride() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectIntersectionOverride.kt"); + @TestMetadata("K1_expectMemberInNotExpectClass.kt") + public void testK1_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClass.kt") - public void testExpectMemberInNotExpectClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClass.kt"); + @TestMetadata("K1_expectedEnumClass.kt") + public void testK1_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedEnumClass.kt"); } @Test - @TestMetadata("expectMemberInNotExpectClassFir.kt") - public void testExpectMemberInNotExpectClassFir() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectMemberInNotExpectClassFir.kt"); + @TestMetadata("K1_expectedSealedClass.kt") + public void testK1_expectedSealedClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K1_expectedSealedClass.kt"); } @Test - @TestMetadata("expectedEnumClass.kt") - public void testExpectedEnumClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.kt"); + @TestMetadata("K2_expectIntersectionOverride.kt") + public void testK2_expectIntersectionOverride() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectIntersectionOverride.kt"); } @Test - @TestMetadata("expectedEnumClass2.kt") - public void testExpectedEnumClass2() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass2.kt"); + @TestMetadata("K2_expectMemberInNotExpectClass.kt") + public void testK2_expectMemberInNotExpectClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectMemberInNotExpectClass.kt"); } @Test - @TestMetadata("expectedSealedClass.kt") - public void testExpectedSealedClass() throws Exception { - runTest("compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.kt"); + @TestMetadata("K2_expectedEnumClass.kt") + public void testK2_expectedEnumClass() throws Exception { + runTest("compiler/testData/ir/irText/declarations/multiplatform/K2_expectedEnumClass.kt"); } }