From 3a1866b405bd2b9dcc5e422bf04706fc50643a58 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Tue, 18 Apr 2017 12:09:43 +0300 Subject: [PATCH] Refactoring: introduce doTest in MultiModuleLineMarkerTest --- .../resolve/MultiModuleLineMarkerTest.kt | 42 +++++++++---------- 1 file changed, 19 insertions(+), 23 deletions(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt index d33555108b1..12b3595d5df 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/MultiModuleLineMarkerTest.kt @@ -20,39 +20,35 @@ import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.TargetPlatformKind class MultiModuleLineMarkerTest : AbstractMultiModuleLineMarkerTest() { - fun testFromCommonToJvmHeader() { + + private fun doTest(vararg platforms: TargetPlatformKind<*>) { val header = module("header") header.createFacet(TargetPlatformKind.Common) - val jvm = module("jvm") - jvm.createFacet(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) - jvm.enableMultiPlatform() - jvm.addDependency(header) + for (platform in platforms) { + val path = when (platform) { + is TargetPlatformKind.Jvm -> "jvm" + is TargetPlatformKind.JavaScript -> "js" + else -> error("Unsupported platform: $platform") + } + val platformModule = module(path) + platformModule.createFacet(platform) + platformModule.enableMultiPlatform() + platformModule.addDependency(header) + } checkHighlightingInAllFiles() } + fun testFromCommonToJvmHeader() { + doTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) + } + fun testFromCommonToJvmImpl() { - val header = module("header") - header.createFacet(TargetPlatformKind.Common) - - val jvm = module("jvm") - jvm.createFacet(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) - jvm.enableMultiPlatform() - jvm.addDependency(header) - - checkHighlightingInAllFiles() + doTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) } fun testFromClassToAlias() { - val header = module("header") - header.createFacet(TargetPlatformKind.Common) - - val jvm = module("jvm") - jvm.createFacet(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) - jvm.enableMultiPlatform() - jvm.addDependency(header) - - checkHighlightingInAllFiles() + doTest(TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) } } \ No newline at end of file