From 3d4439a2dc981326cc35c233b060f8d5f29af60a Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Sat, 18 Dec 2021 09:28:18 +0100 Subject: [PATCH] [MPP][Test] Enable 'FIR_IDENTICAL' default directive for AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest ^KT-50120 --- .../defaultArguments/constructor.fir.kt | 21 ------ .../defaultArguments/function.fir.kt | 73 ------------------- ...sWithMultiplatformCompositeAnalysisTest.kt | 6 +- 3 files changed, 3 insertions(+), 97 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.fir.kt delete mode 100644 compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.fir.kt diff --git a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.fir.kt b/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.fir.kt deleted file mode 100644 index 7b346fdb6c7..00000000000 --- a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.fir.kt +++ /dev/null @@ -1,21 +0,0 @@ -// MODULE: m1-common -// FILE: common.kt - -expect class Ok(x: Int, y: String = "") - -fun test() { - Ok() - Ok(42) - Ok(42, "OK") -} - -// MODULE: m2-jvm()()(m1-common) -// FILE: jvm.kt - -actual class Ok actual constructor(x: Int, y: String) - -fun testJvm() { - Ok() - Ok(42) - Ok(42, "OK") -} diff --git a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.fir.kt b/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.fir.kt deleted file mode 100644 index ae0b020ee41..00000000000 --- a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.fir.kt +++ /dev/null @@ -1,73 +0,0 @@ -// MODULE: m1-common -// FILE: common.kt - -import A.Companion.companionExtensionFunction - -expect class A() { - fun memberFunction(x: Int, y: String = "ok") - companion object { - fun companionFunction(x: Int, y: String = "ok") - fun String.companionExtensionFunction(x: Int, y: String = "ok") - } -} - -expect fun topLevelFunction(x: Int, y: String = "ok") - -expect fun String.topLevelExtensionFunction(x: Int, y: String = "ok") - -fun test() { - A().memberFunction() - A().memberFunction(42) - A().memberFunction(42, "ok") - - topLevelFunction() - topLevelFunction(42) - topLevelFunction(42, "ok") - - "".topLevelExtensionFunction() - "".topLevelExtensionFunction(42) - "".topLevelExtensionFunction(42, "ok") -} - -fun A.test() { - "".companionExtensionFunction() - "".companionExtensionFunction(42) - "".companionExtensionFunction(42, "ok") -} - -// MODULE: m2-jvm()()(m1-common) -// FILE: jvm.kt - -import A.Companion.companionExtensionFunction - -actual class A { - actual fun memberFunction(x: Int, y: String) = Unit - actual companion object { - actual fun companionFunction(x: Int, y: String) = Unit - actual fun String.companionExtensionFunction(x: Int, y: String) = Unit - } -} - -actual fun topLevelFunction(x: Int, y: String) = Unit - -actual fun String.topLevelExtensionFunction(x: Int, y: String) = Unit - -fun testJvm() { - A().memberFunction() - A().memberFunction(42) - A().memberFunction(42, "ok") - - topLevelFunction() - topLevelFunction(42) - topLevelFunction(42, "ok") - - "".topLevelExtensionFunction() - "".topLevelExtensionFunction(42) - "".topLevelExtensionFunction(42, "ok") -} - -fun A.testJvm() { - "".companionExtensionFunction() - "".companionExtensionFunction(42) - "".companionExtensionFunction(42, "ok") -} \ No newline at end of file diff --git a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt index b3c2aa2634a..015db250237 100644 --- a/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt +++ b/compiler/tests-common-new/tests/org/jetbrains/kotlin/test/runners/AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest.kt @@ -7,18 +7,18 @@ package org.jetbrains.kotlin.test.runners import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.SKIP_TXT -import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives +import org.jetbrains.kotlin.test.directives.FirDiagnosticsDirectives.FIR_IDENTICAL import org.jetbrains.kotlin.test.directives.LanguageSettingsDirectives.LANGUAGE -import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives import org.jetbrains.kotlin.test.directives.MultiplatformDiagnosticsDirectives.MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED abstract class AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest : AbstractDiagnosticTest() { override fun configure(builder: TestConfigurationBuilder) { super.configure(builder) builder.defaultDirectives { + LANGUAGE with "+MultiPlatformProjects" +MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED +SKIP_TXT - LANGUAGE with "+MultiPlatformProjects" + +FIR_IDENTICAL } } }