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

[MPP] Simplify test

Browse Source 
KT-54975
This commit is contained in:
Pavel Kirpichenkov
2022-12-19 19:52:48 +02:00
committed by Space Team
parent 7308583388
commit 0e195b3ad0
1 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MppIdeDependencyResolutionIT.kt
+26 -45
View File
@@ -94,59 +94,40 @@ class MppIdeDependencyResolutionIT : KGPBaseTest() {
build(":dep-with-cinterop:publishToMavenLocal") build(":dep-with-cinterop:publishToMavenLocal")
resolveIdeDependencies("dep-with-cinterop") { dependencies -> resolveIdeDependencies("dep-with-cinterop") { dependencies ->
val commonMainDependencies = dependencies["commonMain"].cinteropDependencies() dependencies["commonMain"].cinteropDependencies()
val commonTestDependencies = dependencies["commonTest"].cinteropDependencies() .assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
val linuxX64MainDependencies = dependencies["linuxX64Main"].cinteropDependencies() dependencies["commonTest"].cinteropDependencies()
val linuxX64TestDependencies = dependencies["linuxX64Test"].cinteropDependencies() .assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
val linuxArmMainDependencies = dependencies["linuxArm64Main"].cinteropDependencies() dependencies["linuxX64Main"].cinteropDependencies().assertMatches(binaryCoordinates(Regex("a:dep.*linux_x64")))
val linuxArmTestDependencies = dependencies["linuxArm64Test"].cinteropDependencies() dependencies["linuxArm64Main"].cinteropDependencies().assertMatches(binaryCoordinates(Regex("a:dep.*linux_arm64")))
dependencies["linuxX64Test"].cinteropDependencies().assertMatches(binaryCoordinates(Regex("a:dep.*linux_x64")))
for (commonDeps in listOf(commonMainDependencies, commonTestDependencies)) { dependencies["linuxArm64Test"].cinteropDependencies().assertMatches(binaryCoordinates(Regex("a:dep.*linux_arm64")))
commonDeps.assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
}
linuxX64MainDependencies.assertMatches(binaryCoordinates(Regex("a:dep.*linux_x64")))
linuxArmMainDependencies.assertMatches(binaryCoordinates(Regex("a:dep.*linux_arm64")))
linuxX64TestDependencies.assertMatches(binaryCoordinates(Regex("a:dep.*linux_x64")))
linuxArmTestDependencies.assertMatches(binaryCoordinates(Regex("a:dep.*linux_arm64")))
} }
resolveIdeDependencies("client-for-binary-dep") { dependencies -> resolveIdeDependencies("client-for-binary-dep") { dependencies ->
val commonMainDependencies = dependencies["commonMain"].cinteropDependencies() dependencies["commonMain"].cinteropDependencies()
val commonTestDependencies = dependencies["commonTest"].cinteropDependencies() .assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
val linuxMainDependencies = dependencies["linuxX64Main"].cinteropDependencies() dependencies["commonTest"].cinteropDependencies()
val linuxTestDependencies = dependencies["linuxX64Test"].cinteropDependencies() .assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
val linux2MainDependencies = dependencies["linuxArm64Main"].cinteropDependencies()
val linux2TestDependencies = dependencies["linuxArm64Test"].cinteropDependencies()
for (commonDeps in listOf(commonMainDependencies, commonTestDependencies)) { // TODO (kirpichenkov): consider extracting cinterops from platform libraries (they are library roots currently)
commonDeps.assertMatches( dependencies["linuxX64Main"].cinteropDependencies().assertMatches()
commonDeps.assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)"))) dependencies["linuxX64Test"].cinteropDependencies().assertMatches()
) dependencies["linuxArm64Main"].cinteropDependencies().assertMatches()
} dependencies["linuxArm64Test"].cinteropDependencies().assertMatches()
for (platformDeps in listOf(linuxMainDependencies, linuxTestDependencies, linux2MainDependencies, linux2TestDependencies)) {
platformDeps.assertMatches(
// TODO (kirpichenkov): consider extracting cinterops from , platform source set cinterops
)
}
} }
resolveIdeDependencies("client-for-project-to-project-dep") { dependencies -> resolveIdeDependencies("client-for-project-to-project-dep") { dependencies ->
val commonMainDependencies = dependencies["commonMain"].cinteropDependencies() dependencies["commonMain"].cinteropDependencies()
val commonTestDependencies = dependencies["commonTest"].cinteropDependencies() .assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
val linuxMainDependencies = dependencies["linuxX64Main"].cinteropDependencies() dependencies["commonTest"].cinteropDependencies()
val linuxTestDependencies = dependencies["linuxX64Test"].cinteropDependencies() .assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)")))
val linux2MainDependencies = dependencies["linuxArm64Main"].cinteropDependencies()
val linux2TestDependencies = dependencies["linuxArm64Test"].cinteropDependencies()
for (commonDeps in listOf(commonMainDependencies, commonTestDependencies)) { // TODO (kirpichenkov): project to project dependency, platform source set cinterops
commonDeps.assertMatches(binaryCoordinates(Regex("a:dep.*\\(linux_arm64, linux_x64\\)"))) dependencies["linuxX64Main"].cinteropDependencies().assertMatches()
} dependencies["linuxX64Test"].cinteropDependencies().assertMatches()
dependencies["linuxArm64Main"].cinteropDependencies().assertMatches()
for (platformDeps in listOf(linuxMainDependencies, linuxTestDependencies, linux2MainDependencies, linux2TestDependencies)) { dependencies["linuxArm64Test"].cinteropDependencies().assertMatches()
platformDeps.assertMatches() // TODO (kirpichenkov): project to project dependency, platform source set cinterops
}
} }
} }
} }