From 84d24e5b7666b4db621bcd3b1e4d6f96f09eed2a Mon Sep 17 00:00:00 2001
From: Alexander Dudinsky <Alexander.Dudinsky@jetbrains.com>
Date: Mon, 14 Sep 2020 12:33:35 +0300
Subject: [PATCH] Migrate `MultiplatformAnalysisTest` to new test runner

---
 .../multiplatform/diamondDuplicateActuals/top/top.kt        | 4 ++--
 .../multiplatform/duplicateActualsImplicit/top/top.kt       | 6 +++---
 .../duplicateActualsOneWeaklyIncompatible/top/top.kt        | 2 +-
 .../bottom/bottom.kt                                        | 2 +-
 .../multiplatform/duplicateExpectsExplicit/bottom/bottom.kt | 2 +-
 .../caches/resolve/AbstractMultiModuleIdeResolveTest.kt     | 3 ++-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
index b4eed14b822..ace4e1bab24 100644
--- a/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
+++ b/idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
@@ -2,6 +2,6 @@
 
 package sample
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, left")!>A<!> {
-    fun <!AMBIGUOUS_ACTUALS("Function 'foo'", "bottom, left")!>foo<!>(): Int
+expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, left")!>A<!> {
+    fun <!AMBIGUOUS_ACTUALS("Function 'foo'; bottom, left")!>foo<!>(): Int
 }
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
index 237a5d750af..502bde6fc0c 100644
--- a/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
@@ -2,7 +2,7 @@
 
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'", "bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
-expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'", "bottom, middle")!>CompatibleInMiddleActualInBottom<!>
+expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'; bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
+expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'; bottom, middle")!>CompatibleInMiddleActualInBottom<!>
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'", "bottom, middle")!>CompatibleInMiddleAndBottom<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'; bottom, middle")!>CompatibleInMiddleAndBottom<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
index 2cc6d86f804..587cf9e0e7e 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
@@ -2,4 +2,4 @@
 
 package foo
 
-expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, middle")!>A<!>
\ No newline at end of file
+expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, middle")!>A<!>
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
index 35f51d5efbc..6da3b5ddb84 100644
--- a/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
@@ -2,4 +2,4 @@
 
 package foo
 
-actual fun foo<!ACTUAL_WITHOUT_EXPECT("Actual function 'foo'", " The following declaration is incompatible because number of value parameters is different:     public expect fun foo(): Int ")!>(x: Int)<!>: Int = x
\ No newline at end of file
+actual fun foo<!ACTUAL_WITHOUT_EXPECT("Actual function 'foo'; The following declaration is incompatible because number of value parameters is different:    public expect fun foo(): Int")!>(x: Int)<!>: Int = x
\ No newline at end of file
diff --git a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
index 4b63aec7964..21a344f975a 100644
--- a/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
+++ b/idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
@@ -1,3 +1,3 @@
 // !RENDER_DIAGNOSTICS_MESSAGES
 
-actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'", "left, right")!>A<!>
\ No newline at end of file
+actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'; left, right")!>A<!>
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
index fafe2c3a388..3a04a61725f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
 import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
 import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromTextFile
 import org.jetbrains.kotlin.idea.project.KotlinMultiplatformAnalysisModeComponent
+import org.jetbrains.kotlin.idea.codeMetaInfo.AbstractDiagnosticCodeMetaInfoTest
 import org.jetbrains.kotlin.idea.resolve.getDataFlowValueFactory
 import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
 import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest
@@ -120,7 +121,7 @@ abstract class AbstractHierarchicalExpectActualTest : AbstractMultiModuleIdeReso
     }
 }
 
-abstract class AbstractMultiplatformAnalysisTest : AbstractMultiModuleIdeResolveTest() {
+abstract class AbstractMultiplatformAnalysisTest : AbstractDiagnosticCodeMetaInfoTest() {
     override fun getTestDataPath(): String = "${PluginTestCaseBase.getTestDataPathBase()}/multiplatform"
 
     override fun setUp() {