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

Minor. rename header -> commonModule

Browse Source
This commit is contained in:
Stanislav Erokhin
2017-09-15 16:17:18 +03:00
parent 91a99b4726
commit 6d26d1fb67
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/findUsages/FindUsagesMultiModuleTest.kt
+3 -3
View File
@@ -26,13 +26,13 @@ class FindUsagesMultiModuleTest : AbstractFindUsagesMultiModuleTest() {
private fun doMultiPlatformTest(commonName: String = "common",
implName: String = "jvm",
implKind: TargetPlatformKind<*> = TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]) {
val header = module(commonName)
header.createFacet(TargetPlatformKind.Common)
val commonModule = module(commonName)
commonModule.createFacet(TargetPlatformKind.Common)
val jvm = module(implName)
jvm.createFacet(implKind)
jvm.enableMultiPlatform()
jvm.addDependency(header)
jvm.addDependency(commonModule)
doFindUsagesTest()
}
idea/tests/org/jetbrains/kotlin/idea/quickfix/QuickFixMultiModuleTest.kt
+5 -5
View File
@@ -23,18 +23,18 @@ import org.junit.Test
class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() {
private fun doMultiPlatformTest(
headerName: String = "header",
expectName: String = "header", // todo: change dir name
vararg impls: Pair<String, TargetPlatformKind<*>> = arrayOf("jvm" to TargetPlatformKind.Jvm[JvmTarget.JVM_1_6]),
withTests: Boolean = false
) {
val header = module(headerName, hasTestRoot = withTests)
header.createFacet(TargetPlatformKind.Common)
val commonModule = module(expectName, hasTestRoot = withTests)
commonModule.createFacet(TargetPlatformKind.Common)
impls.forEach { (implName, implKind) ->
val implModule = module(implName, hasTestRoot = withTests)
implModule.createFacet(implKind)
implModule.enableMultiPlatform()
implModule.addDependency(header)
implModule.addDependency(commonModule)
}
doQuickFixTest()
@@ -136,7 +136,7 @@ class QuickFixMultiModuleTest : AbstractQuickFixMultiModuleTest() {
@Test
fun testWithTest() {
doMultiPlatformTest(headerName = "common", withTests = true)
doMultiPlatformTest(expectName = "common", withTests = true)
}
@Test