From 21c7325dbe3d3f282708f621e7b7635be11cbda2 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 3 Aug 2023 15:16:18 +0200 Subject: [PATCH] Tests: remove actualTypealiasToCompiledInlineClass test This test uses multiple features which are obsolete and will be discontinued soon: - Language version 1.4 - Expect/actual declarations in the same module - Declaring inline classes via "inline class" --- .../expectActualLv14.kt | 12 ------- .../expectActualLv16.kt | 12 ------- .../library14/inlineClass.kt | 4 --- .../library16/inlineClass.kt | 4 --- .../output14.txt | 2 -- .../output16.txt | 1 - .../CompileKotlinAgainstCustomBinariesTest.kt | 32 ------------------- 7 files changed, 67 deletions(-) delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv16.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library14/inlineClass.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library16/inlineClass.kt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt delete mode 100644 compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt deleted file mode 100644 index 50633ab4ccc..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv14.kt +++ /dev/null @@ -1,12 +0,0 @@ -@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE") - -package test - -@Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING") -expect inline class ExpectInlineActualInline(val value: Int) - -@Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING") -expect inline class ExpectInlineActualValue(val value: Int) - -actual typealias ExpectInlineActualInline = lib.InlineClass -actual typealias ExpectInlineActualValue = lib.ValueClass diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv16.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv16.kt deleted file mode 100644 index 71d80a26d81..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/expectActualLv16.kt +++ /dev/null @@ -1,12 +0,0 @@ -@file:Suppress("EXPECT_AND_ACTUAL_IN_THE_SAME_MODULE") - -package test - -@kotlin.jvm.JvmInline -expect value class ExpectValueActualInline(val value: Int) - -@kotlin.jvm.JvmInline -expect value class ExpectValueActualValue(val value: Int) - -actual typealias ExpectValueActualInline = lib.InlineClass -actual typealias ExpectValueActualValue = lib.ValueClass diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library14/inlineClass.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library14/inlineClass.kt deleted file mode 100644 index 10048971681..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library14/inlineClass.kt +++ /dev/null @@ -1,4 +0,0 @@ -package lib - -@Suppress("INLINE_CLASS_DEPRECATED", "EXPERIMENTAL_FEATURE_WARNING") -inline class InlineClass(val value: Int) diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library16/inlineClass.kt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library16/inlineClass.kt deleted file mode 100644 index 6c3d25321be..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/library16/inlineClass.kt +++ /dev/null @@ -1,4 +0,0 @@ -package lib - -@kotlin.jvm.JvmInline -value class ValueClass(val value: Int) diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt deleted file mode 100644 index 856bf234263..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output14.txt +++ /dev/null @@ -1,2 +0,0 @@ -warning: language version 1.4 is deprecated and its support will be removed in a future version of Kotlin -OK diff --git a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt b/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt deleted file mode 100644 index d86bac9de59..00000000000 --- a/compiler/testData/compileKotlinAgainstCustomBinaries/actualTypealiasToCompiledInlineClass/output16.txt +++ /dev/null @@ -1 +0,0 @@ -OK diff --git a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt index fabc850eaa7..f19a3665adc 100644 --- a/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.kt @@ -696,38 +696,6 @@ class CompileKotlinAgainstCustomBinariesTest : AbstractKotlinCompilerIntegration ) } - fun testActualTypealiasToCompiledInlineClass() { - val library14 = compileLibrary( - "library14", - additionalOptions = listOf("-language-version", "1.4"), - checkKotlinOutput = { result -> - KotlinTestUtils.assertEqualsToFile( - "Expected output check failed", - File(testDataDirectory, "output14.txt"), - result - ) - } - ) - val library16 = compileLibrary( - "library16", - additionalOptions = listOf("-language-version", "1.6") - ) - compileKotlin( - "expectActualLv14.kt", - output = tmpdir, - classpath = listOf(library14, library16), - additionalOptions = listOf("-language-version", "1.4", "-Xmulti-platform"), - expectedFileName = "output14.txt", - ) - compileKotlin( - "expectActualLv16.kt", - output = tmpdir, - classpath = listOf(library14, library16), - additionalOptions = listOf("-language-version", "1.6", "-Xmulti-platform"), - expectedFileName = "output16.txt", - ) - } - fun testDeserializedAnnotationReferencesJava() { // Only Java val libraryAnnotation = compileLibrary("libraryAnnotation")