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

[Gradle] Update MppHighlightingTestDataWithGradleIT for K2

Browse Source 
^KT-61106 Verification Pending
This commit is contained in:
Anton Lakotka
2023-09-11 13:46:05 +02:00
committed by Space Team
parent c290a44f2b
commit 58b0d6ffa8
3 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/testData/multiModuleHighlighting/multiplatform/basic/jvm/jvm.kt
Vendored
+2 -2
View File
@@ -1,4 +1,4 @@
actual class <error descr="[ACTUAL_WITHOUT_EXPECT] Actual class 'Your' has no corresponding expected declaration">Your</error> {
actual class <error descr="[ACTUAL_WITHOUT_EXPECT] 'actual class Your : Any' has no corresponding expected declaration">Your</error> {
}
@@ -11,6 +11,6 @@ expect class Their {
}
actual class Their {
actual class <error descr="[ACTUAL_WITHOUT_EXPECT] 'actual class Your : Any' has no corresponding expected declaration">Their</error> {
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt
+1 -1
View File
@@ -210,7 +210,7 @@ class MppHighlightingTestDataWithGradleIT : BaseGradleIT() {
) {
val isAllowedInCli
get() = when (expectedErrorKind) {
"NO_ACTUAL_FOR_EXPECT", "ACTUAL_WITHOUT_EXPECT", null /*TODO are some nulls better than others?*/ -> true
"NO_ACTUAL_FOR_EXPECT", null /*TODO are some nulls better than others?*/ -> true
else -> false
}
}
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt
-25
View File
@@ -104,31 +104,6 @@ class KotlinProjectIT : KGPBaseTest() {
}
}
@DisplayName("Valid model in multiplatform project")
@GradleTest
fun testMultiplatformProject(gradleVersion: GradleVersion) {
project("multiplatformProject", gradleVersion) {
getModels<KotlinProject> {
val libKotlinProject = getModel(":lib")!!
val libJvmKotlinProject = getModel(":libJvm")!!
libKotlinProject.assertBasics(
"lib",
defaultBuildOptions.kotlinVersion,
KotlinProject.ProjectType.PLATFORM_COMMON,
)
libJvmKotlinProject.assertBasics(
"libJvm",
defaultBuildOptions.kotlinVersion,
KotlinProject.ProjectType.PLATFORM_JVM,
)
assertEquals(1, libJvmKotlinProject.expectedByDependencies.size)
assertTrue(libJvmKotlinProject.expectedByDependencies.contains(":lib"))
}
}
}
private fun SourceSet.verifySourceSet(
testProject: TestProject,
name: String,