From ec79d8cd2711e78883c77f2e6c4ec377398aecb9 Mon Sep 17 00:00:00 2001 From: Dmitrii Gridin Date: Tue, 17 Oct 2023 16:29:28 +0200 Subject: [PATCH] [SLC] add multiplatform test cases on typealias actualization ^KT-62345 --- ...ClassesByFqNameForSourceTestGenerated.java | 12 ++++++++ ...qualityByFqNameForSourceTestGenerated.java | 12 ++++++++ ...rentingByFqNameForSourceTestGenerated.java | 12 ++++++++ .../typeAliasActualization.java | 5 ++++ .../typeAliasActualization.kt | 26 ++++++++++++++++ .../typeAliasActualization2.descriptors.java | 7 +++++ .../typeAliasActualization2.java | 7 +++++ .../typeAliasActualization2.kt | 30 +++++++++++++++++++ .../CompilerLightClassTestGenerated.java | 10 +++++++ 9 files changed, 121 insertions(+) create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.descriptors.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.java create mode 100644 compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java index e0440c420d4..cca08dbec16 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesByFqNameForSourceTestGenerated.java @@ -465,6 +465,18 @@ public class SymbolLightClassesByFqNameForSourceTestGenerated extends AbstractSy runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.kt"); } + @Test + @TestMetadata("typeAliasActualization.kt") + public void testTypeAliasActualization() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt"); + } + + @Test + @TestMetadata("typeAliasActualization2.kt") + public void testTypeAliasActualization2() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt"); + } + @Test @TestMetadata("unresolvedQuialifierInAnnotation.kt") public void testUnresolvedQuialifierInAnnotation() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java index 8c6088925a6..4bcddd2c24b 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesEqualityByFqNameForSourceTestGenerated.java @@ -465,6 +465,18 @@ public class SymbolLightClassesEqualityByFqNameForSourceTestGenerated extends Ab runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.kt"); } + @Test + @TestMetadata("typeAliasActualization.kt") + public void testTypeAliasActualization() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt"); + } + + @Test + @TestMetadata("typeAliasActualization2.kt") + public void testTypeAliasActualization2() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt"); + } + @Test @TestMetadata("unresolvedQuialifierInAnnotation.kt") public void testUnresolvedQuialifierInAnnotation() throws Exception { diff --git a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java index 58c8492dab2..74c53b380bc 100644 --- a/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java +++ b/analysis/symbol-light-classes/tests/org/jetbrains/kotlin/light/classes/symbol/source/SymbolLightClassesParentingByFqNameForSourceTestGenerated.java @@ -465,6 +465,18 @@ public class SymbolLightClassesParentingByFqNameForSourceTestGenerated extends A runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.kt"); } + @Test + @TestMetadata("typeAliasActualization.kt") + public void testTypeAliasActualization() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt"); + } + + @Test + @TestMetadata("typeAliasActualization2.kt") + public void testTypeAliasActualization2() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt"); + } + @Test @TestMetadata("unresolvedQuialifierInAnnotation.kt") public void testUnresolvedQuialifierInAnnotation() throws Exception { diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.java new file mode 100644 index 00000000000..b1c2d7ad52f --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.java @@ -0,0 +1,5 @@ +@jvm.pack.ActualAnnotation() +@jvm.pack.RegularAnnotation() +public final class ClassToCheck /* common.pack.ClassToCheck*/ { + public ClassToCheck();// .ctor() +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt new file mode 100644 index 00000000000..0692aa4549d --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt @@ -0,0 +1,26 @@ +// common.pack.ClassToCheck +// MODULE: m1-common +// FILE: common.kt +package common.pack + +expect annotation class ExpectAnnotation + +// MODULE: m2-jvm()()(m1-common) +// FILE: annotations.kt +package jvm.pack + +annotation class ActualAnnotation +annotation class RegularAnnotation +// FILE: jvm.kt +package common.pack + +import jvm.pack.ActualAnnotation +import jvm.pack.RegularAnnotation + +actual typealias ExpectAnnotation = ActualAnnotation + +typealias RegularTypeAlias = RegularAnnotation + +@ExpectAnnotation +@RegularTypeAlias +class ClassToCheck diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.descriptors.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.descriptors.java new file mode 100644 index 00000000000..9a095613236 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.descriptors.java @@ -0,0 +1,7 @@ +@common.pack.RegularAnnotation() +@jvm.pack.ActualAnnotation() +public final class ClassToCheck /* common.pack.ClassToCheck*/ { + public ClassToCheck();// .ctor() + + public final void t(@org.jetbrains.annotations.NotNull() jvm.pack.ActualClass);// t(jvm.pack.ActualClass) +} \ No newline at end of file diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.java b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.java new file mode 100644 index 00000000000..5d9ecff4c78 --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.java @@ -0,0 +1,7 @@ +@common.pack.ExpectAnnotation() +@common.pack.RegularAnnotation() +public final class ClassToCheck /* common.pack.ClassToCheck*/ { + public ClassToCheck();// .ctor() + + public final void t(@org.jetbrains.annotations.NotNull() common.pack.ExpectClass);// t(common.pack.ExpectClass) +} diff --git a/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt new file mode 100644 index 00000000000..ebb3e1b9ccc --- /dev/null +++ b/compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt @@ -0,0 +1,30 @@ +// common.pack.ClassToCheck +// MODULE: m1-common +// FILE: common.kt +package common.pack + +annotation class RegularAnnotation +expect annotation class ExpectAnnotation +expect class ExpectClass + +@RegularAnnotation +@ExpectAnnotation +class ClassToCheck { + fun t(t: ExpectClass) { + + } +} +// MODULE: m2-jvm()()(m1-common) +// FILE: annotations.kt +package jvm.pack + +annotation class ActualAnnotation +class ActualClass +// FILE: jvm.kt +package common.pack + +import jvm.pack.ActualAnnotation +import jvm.pack.ActualClass + +actual typealias ExpectAnnotation = ActualAnnotation +actual typealias ExpectClass = ActualClass diff --git a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java index 3077178ca95..ddc2e86fc1b 100644 --- a/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java +++ b/compiler/tests-gen/org/jetbrains/kotlin/asJava/CompilerLightClassTestGenerated.java @@ -401,6 +401,16 @@ public class CompilerLightClassTestGenerated extends AbstractCompilerLightClassT runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/TwoOverrides.kt"); } + @TestMetadata("typeAliasActualization.kt") + public void testTypeAliasActualization() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization.kt"); + } + + @TestMetadata("typeAliasActualization2.kt") + public void testTypeAliasActualization2() throws Exception { + runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/typeAliasActualization2.kt"); + } + @TestMetadata("unresolvedQuialifierInAnnotation.kt") public void testUnresolvedQuialifierInAnnotation() throws Exception { runTest("compiler/testData/asJava/lightClasses/lightClassByFqName/compilationErrors/unresolvedQuialifierInAnnotation.kt");