From 8fe176f605b9fabf3a8fd6e9273dbd99b92306d0 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Tue, 7 Sep 2021 09:12:28 +0200 Subject: [PATCH] [Gradle] CommonizerHierarchicalIT: Add assertions for ^KT-46257 --- .../kotlin/gradle/CommonizerHierarchicalIT.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt index 0f15fe8abfd..f571633ccd6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerHierarchicalIT.kt @@ -14,17 +14,19 @@ class CommonizerHierarchicalIT : BaseGradleIT() { @Test fun `test commonizeHierarchically metadata compilations`() { + with(Project("commonizeHierarchically")) { if (Os.canCompileApple) { build(":p1:compileIosMainKotlinMetadata") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/iosMain/klib/p1_iosMain.klib") + assertNoDuplicateLibraryWarning() } build(":p1:compileAppleMainKotlinMetadata") { - assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/appleMain/klib/p1_appleMain.klib") + assertNoDuplicateLibraryWarning() } } @@ -32,6 +34,7 @@ class CommonizerHierarchicalIT : BaseGradleIT() { build(":p1:compileLinuxMainKotlinMetadata") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/linuxMain/klib/p1_linuxMain.klib") + assertNoDuplicateLibraryWarning() } } @@ -46,6 +49,7 @@ class CommonizerHierarchicalIT : BaseGradleIT() { build(":p1:compileAppleAndLinuxMainKotlinMetadata") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/appleAndLinuxMain/klib/p1_appleAndLinuxMain.klib") + assertNoDuplicateLibraryWarning() } } @@ -53,6 +57,7 @@ class CommonizerHierarchicalIT : BaseGradleIT() { build(":p1:compileNativeMainKotlinMetadata") { assertSuccessful() assertFileExists("p1/build/classes/kotlin/metadata/nativeMain/klib/p1_nativeMain.klib") + assertNoDuplicateLibraryWarning() } } } @@ -68,6 +73,7 @@ class CommonizerHierarchicalIT : BaseGradleIT() { assertFileExists("p1/build/classes/kotlin/iosX64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/macosX64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/macosArm64/main/klib/p1.klib") + assertNoDuplicateLibraryWarning() } } @@ -76,6 +82,7 @@ class CommonizerHierarchicalIT : BaseGradleIT() { assertSuccessful() assertFileExists("p1/build/classes/kotlin/linuxX64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/linuxArm64/main/klib/p1.klib") + assertNoDuplicateLibraryWarning() } } @@ -84,6 +91,7 @@ class CommonizerHierarchicalIT : BaseGradleIT() { assertSuccessful() assertFileExists("p1/build/classes/kotlin/windowsX64/main/klib/p1.klib") assertFileExists("p1/build/classes/kotlin/windowsX86/main/klib/p1.klib") + assertNoDuplicateLibraryWarning() } } } @@ -130,4 +138,6 @@ class CommonizerHierarchicalIT : BaseGradleIT() { val canCompileLinux get() = os.isLinux || os.isMacOsX val canCompileWindows get() = os.isWindows } + + private fun CompiledProject.assertNoDuplicateLibraryWarning() = assertNotContains("library included more than once") }