Merge together MultiplatformHighlighting and MultiplatformAnalysis tests

Basically, the former uses an old quickly-scrapped infrastructure,
which were not applicable for HMPP, so  the latter tests were written.

So, both check for one and the same thing (highlighting in MPP projects),
but MultiplatformAnalysisTest is more modern,
and has a lot of inconvenient stuff in MultiplatformHighlighting fixed
^KT-43116 Fixed
This commit is contained in:
Alexander Dudinsky
2020-12-22 12:29:43 +03:00
parent 73576c80e4
commit 10a5727260
123 changed files with 293 additions and 443 deletions
@@ -6,8 +6,8 @@ interface BB
interface CC
interface DD
expect interface A {
fun foo_A()
expect interface <!LINE_MARKER("descr='Is subclassed by B [common-2-1] C [common-2-2] D'"), LINE_MARKER("descr='Has actuals in common'")!>A<!> {
fun <!LINE_MARKER("descr='Has actuals in common'")!>foo_A<!>()
}
fun take0(x: A): AA = null!!
@@ -1,7 +1,7 @@
@file:Suppress("UNUSED_PARAMETER")
package sample
expect interface B : A {
expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>B<!> : A {
fun foo_B_1()
}
@@ -1,7 +1,7 @@
@file:Suppress("UNUSED_PARAMETER")
package sample
expect interface C : A {
expect interface <!LINE_MARKER("descr='Has actuals in JVM'")!>C<!> : A {
fun foo_C_1()
}
@@ -1,8 +1,8 @@
@file:Suppress("UNUSED_PARAMETER")
package sample
actual interface A {
actual fun foo_A()
actual interface <!LINE_MARKER("descr='Is implemented by D'"), LINE_MARKER("descr='Has declaration in common module'")!>A<!> {
actual fun <!LINE_MARKER("descr='Has declaration in common module'")!>foo_A<!>()
fun foo_A_3()
}
@@ -9,8 +9,8 @@ interface D : A {
fun foo_D()
}
actual typealias B = D
actual typealias C = D
actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>B<!> = D
actual typealias <!LINE_MARKER("descr='Has declaration in common module'")!>C<!> = D
fun take0(x: D): Unit = null!!