diff --git a/idea/testData/multiModuleHighlighting/multiplatform/basic/jvm/jvm.kt b/idea/testData/multiModuleHighlighting/multiplatform/basic/jvm/jvm.kt index 866dbd2173f..154183a4fd7 100644 --- a/idea/testData/multiModuleHighlighting/multiplatform/basic/jvm/jvm.kt +++ b/idea/testData/multiModuleHighlighting/multiplatform/basic/jvm/jvm.kt @@ -1,4 +1,4 @@ -actual class Your { +actual class Your { } @@ -11,6 +11,6 @@ expect class Their { } -actual class Their { +actual class Their { } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt index 593b3692894..fffa25a1ba5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppHighlightingTestDataWithGradleIT.kt @@ -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 } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt index 82f1492d98a..490f5ecbcb1 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/model/KotlinProjectIT.kt @@ -104,31 +104,6 @@ class KotlinProjectIT : KGPBaseTest() { } } - @DisplayName("Valid model in multiplatform project") - @GradleTest - fun testMultiplatformProject(gradleVersion: GradleVersion) { - project("multiplatformProject", gradleVersion) { - getModels { - 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,