azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Migrate MultiplatformAnalysisTest to new test runner

Browse Source
This commit is contained in:
Alexander Dudinsky
2020-09-14 12:33:35 +03:00
parent ac98bc9853
commit 84d24e5b76
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/multiplatform/diamondDuplicateActuals/top/top.kt
Vendored
+2 -2
View File
@@ -2,6 +2,6 @@
package sample package sample
expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, left")!>A<!> { expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, left")!>A<!> {
fun <!AMBIGUOUS_ACTUALS("Function 'foo'", "bottom, left")!>foo<!>(): Int fun <!AMBIGUOUS_ACTUALS("Function 'foo'; bottom, left")!>foo<!>(): Int
} }
idea/testData/multiplatform/duplicateActualsImplicit/top/top.kt
Vendored
+3 -3
View File
@@ -2,7 +2,7 @@
package foo package foo
expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'", "bottom, middle")!>ActualInMiddleCompatibleInBottom<!> expect class <!AMBIGUOUS_ACTUALS("Class 'ActualInMiddleCompatibleInBottom'; bottom, middle")!>ActualInMiddleCompatibleInBottom<!>
expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'", "bottom, middle")!>CompatibleInMiddleActualInBottom<!> expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleActualInBottom'; bottom, middle")!>CompatibleInMiddleActualInBottom<!>
expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'", "bottom, middle")!>CompatibleInMiddleAndBottom<!> expect class <!AMBIGUOUS_ACTUALS("Class 'CompatibleInMiddleAndBottom'; bottom, middle")!>CompatibleInMiddleAndBottom<!>
idea/testData/multiplatform/duplicateActualsOneWeaklyIncompatible/top/top.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
package foo package foo
expect class <!AMBIGUOUS_ACTUALS("Class 'A'", "bottom, middle")!>A<!> expect class <!AMBIGUOUS_ACTUALS("Class 'A'; bottom, middle")!>A<!>
idea/testData/multiplatform/duplicateActualsOneWithStrongIncompatibility/bottom/bottom.kt
Vendored
+1 -1
View File
@@ -2,4 +2,4 @@
package foo 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 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
idea/testData/multiplatform/duplicateExpectsExplicit/bottom/bottom.kt
Vendored
+1 -1
View File
@@ -1,3 +1,3 @@
// !RENDER_DIAGNOSTICS_MESSAGES // !RENDER_DIAGNOSTICS_MESSAGES
actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'", "left, right")!>A<!> actual class <!AMBIGUOUS_EXPECTS("Actual class 'A'; left, right")!>A<!>
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleIdeResolveTest.kt
+2 -1
View File
@@ -16,6 +16,7 @@ import org.jetbrains.kotlin.checkers.utils.DiagnosticsRenderingConfiguration
import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl import org.jetbrains.kotlin.descriptors.impl.ModuleDescriptorImpl
import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromTextFile import org.jetbrains.kotlin.idea.multiplatform.setupMppProjectFromTextFile
import org.jetbrains.kotlin.idea.project.KotlinMultiplatformAnalysisModeComponent 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.getDataFlowValueFactory
import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings import org.jetbrains.kotlin.idea.resolve.getLanguageVersionSettings
import org.jetbrains.kotlin.idea.stubs.AbstractMultiModuleTest 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 getTestDataPath(): String = "${PluginTestCaseBase.getTestDataPathBase()}/multiplatform"
override fun setUp() { override fun setUp() {