From 760c496000f4679fd1b4ac71f928715e1b658eb3 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Sat, 18 Dec 2021 09:18:04 +0100 Subject: [PATCH] [MPP][Test] Enable 'SKIP_TXT' default directive for AbstractDiagnosticsWithMultiplatformCompositeAnalysisTest ^KT-50120 --- .../defaultArguments/constructor.txt | 52 ------------------- .../defaultArguments/function.txt | 49 ----------------- ...sWithMultiplatformCompositeAnalysisTest.kt | 8 ++- 3 files changed, 6 insertions(+), 103 deletions(-) delete mode 100644 compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.txt delete mode 100644 compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.txt diff --git a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.txt b/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.txt deleted file mode 100644 index 14a14870814..00000000000 --- a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/constructor.txt +++ /dev/null @@ -1,52 +0,0 @@ -// -- Module: -- -package - -public fun test(): kotlin.Unit - -public final expect class FailX { - public constructor FailX(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final expect class FailY { - public constructor FailY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final expect class Ok { - public constructor Ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -// -- Module: -- -package - -public fun testJvm(): kotlin.Unit - -public final actual class FailX { - public constructor FailX(/*0*/ x: kotlin.Int = ..., /*1*/ y: kotlin.String) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final actual class FailY { - public constructor FailY(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - -public final actual class Ok { - public constructor Ok(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String) - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} - diff --git a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.txt b/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.txt deleted file mode 100644 index 071fde74e49..00000000000 --- a/compiler/testData/diagnostics/testsWithMultiplatformCompositeAnalysis/defaultArguments/function.txt +++ /dev/null @@ -1,49 +0,0 @@ -// -- Module: -- -package - -public fun test(): kotlin.Unit -public expect fun topLevelFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit -public fun A.test(): kotlin.Unit -public expect fun kotlin.String.topLevelExtensionFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit - -public final expect class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final expect fun memberFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public expect companion object Companion { - public final expect fun companionFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final expect fun kotlin.String.companionExtensionFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String = ...): kotlin.Unit - } -} - -// -- Module: -- -package - -public fun testJvm(): kotlin.Unit -public actual fun topLevelFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit -public fun A.testJvm(): kotlin.Unit -public actual fun kotlin.String.topLevelExtensionFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit - -public final actual class A { - public constructor A() - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public final actual fun memberFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public actual companion object Companion { - private constructor Companion() - public final actual fun companionFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - public final actual fun kotlin.String.companionExtensionFunction(/*0*/ x: kotlin.Int, /*1*/ y: kotlin.String): kotlin.Unit - } -} - 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 2ae6085cd30..b3c2aa2634a 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 @@ -6,15 +6,19 @@ 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.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 { - +MultiplatformDiagnosticsDirectives.MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED - LanguageSettingsDirectives.LANGUAGE with "+MultiPlatformProjects" + +MULTIPLATFORM_COMPOSITE_ANALYSIS_MODE_ENABLED + +SKIP_TXT + LANGUAGE with "+MultiPlatformProjects" } } }