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

Add implements common dependency for regular multiplatform tests

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-09-26 17:28:34 +03:00
parent 848a80a266
commit c9f11e4bc2
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractMultiModuleHighlightingTest.kt
+3 -2
View File
@@ -40,7 +40,8 @@ abstract class AbstractMultiModuleHighlightingTest : AbstractMultiHighlightingTe
configureModule: (Module, TargetPlatformKind<*>) -> Unit = { _, _ -> }, configureModule: (Module, TargetPlatformKind<*>) -> Unit = { _, _ -> },
jdk: TestJdkKind = TestJdkKind.MOCK_JDK jdk: TestJdkKind = TestJdkKind.MOCK_JDK
) { ) {
val commonModule = module("common", jdk) val commonModuleName = "common"
val commonModule = module(commonModuleName, jdk)
commonModule.createFacet(TargetPlatformKind.Common, false) commonModule.createFacet(TargetPlatformKind.Common, false)
if (withStdlibCommon) { if (withStdlibCommon) {
commonModule.addLibrary(ForTestCompileRuntime.stdlibCommonForTests(), kind = CommonLibraryKind) commonModule.addLibrary(ForTestCompileRuntime.stdlibCommonForTests(), kind = CommonLibraryKind)
@@ -53,7 +54,7 @@ abstract class AbstractMultiModuleHighlightingTest : AbstractMultiHighlightingTe
else -> error("Unsupported platform: $platform") else -> error("Unsupported platform: $platform")
} }
val platformModule = module(path, jdk) val platformModule = module(path, jdk)
platformModule.createFacet(platform) platformModule.createFacet(platform, implementedModuleName = commonModuleName)
platformModule.enableMultiPlatform() platformModule.enableMultiPlatform()
platformModule.addDependency(commonModule) platformModule.addDependency(commonModule)
configureModule(platformModule, platform) configureModule(platformModule, platform)