diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt index 9f36b3dcc26..3f277899570 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/CommonizerIT.kt @@ -20,7 +20,8 @@ import org.jetbrains.kotlin.konan.target.KonanTarget.* import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.io.TempDir import java.nio.file.Path -import kotlin.io.path.* +import kotlin.io.path.Path +import kotlin.io.path.walk import kotlin.test.assertTrue import kotlin.test.fail @@ -124,8 +125,10 @@ open class CommonizerIT : KGPBaseTest() { } build(":commonize") { assertNativeDistributionCommonizationCacheHit() - assertTasksAreNotInTaskGraph(":cinteropCurlTargetA") - assertTasksAreNotInTaskGraph(":cinteropCurlTargetB") + assertTasksAreNotInTaskGraph( + ":cinteropCurlTargetA", + ":cinteropCurlTargetB", + ) } } } @@ -144,9 +147,11 @@ open class CommonizerIT : KGPBaseTest() { build(":commonize") { assertTasksExecuted(":commonizeNativeDistribution") - assertTasksAreNotInTaskGraph(":cinteropCurlTargetA") - assertTasksAreNotInTaskGraph(":cinteropCurlTargetB") - assertTasksAreNotInTaskGraph(":commonizeCInterop") + assertTasksAreNotInTaskGraph( + ":cinteropCurlTargetA", + ":cinteropCurlTargetB", + ":commonizeCInterop", + ) } build(":commonize", "-Pkotlin.mpp.enableCInteropCommonization=true") { @@ -158,14 +163,15 @@ open class CommonizerIT : KGPBaseTest() { build(":commonize", "-Pkotlin.mpp.enableCInteropCommonization=false") { assertNativeDistributionCommonizationCacheHit() - assertTasksAreNotInTaskGraph(":cinteropCurlTargetA") - assertTasksAreNotInTaskGraph(":cinteropCurlTargetB") - assertTasksAreNotInTaskGraph(":commonizeCInterop") + assertTasksAreNotInTaskGraph( + ":cinteropCurlTargetA", + ":cinteropCurlTargetB", + ":commonizeCInterop", + ) } } } - @DisplayName("Commonize Curl Interop copy CommonizeCInterop for Ide") @GradleTest fun testCommonizeCurlInteropcopyCommonizeCInteropForIde( @@ -514,10 +520,14 @@ open class CommonizerIT : KGPBaseTest() { fun testCommonizationWithTwoCInteropCommonizerGroups(gradleVersion: GradleVersion) { nativeProject("commonize-kt-57796-twoCInteropCommonizerGroups", gradleVersion) { build(":app:commonizeCInterop") { - assertTasksAreNotInTaskGraph(":lib:transformCommonMainCInteropDependenciesMetadata") - assertTasksExecuted(":lib:commonizeCInterop") - assertTasksAreNotInTaskGraph(":app:transformCommonMainCInteropDependenciesMetadata") - assertTasksExecuted(":app:commonizeCInterop") + assertTasksExecuted( + ":lib:commonizeCInterop", + ":app:commonizeCInterop", + ) + assertTasksAreNotInTaskGraph( + ":lib:transformCommonMainCInteropDependenciesMetadata", + ":app:transformCommonMainCInteropDependenciesMetadata", + ) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt index b29e7d35309..ad0c6fb18f2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppCompositeBuildIT.kt @@ -261,11 +261,15 @@ class MppCompositeBuildIT : KGPBaseTest() { build("cleanNativeDistributionCommonization") build(":consumerA:transformNativeMainCInteropDependenciesMetadataForIde") { if (HostManager.hostIsMac) { - assertTasksSkipped(":producerBuild:producerA:iosArm64MetadataJar") - assertTasksSkipped(":producerBuild:producerA:iosX64MetadataJar") + assertTasksSkipped( + ":producerBuild:producerA:iosArm64MetadataJar", + ":producerBuild:producerA:iosX64MetadataJar", + ) } else { - assertTasksAreNotInTaskGraph(":producerBuild:producerA:iosArm64MetadataJar") - assertTasksAreNotInTaskGraph(":producerBuild:producerA:iosX64MetadataJar") + assertTasksAreNotInTaskGraph( + ":producerBuild:producerA:iosArm64MetadataJar", + ":producerBuild:producerA:iosX64MetadataJar", + ) } assertTasksExecuted(":consumerA:transformNativeMainCInteropDependenciesMetadataForIde") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index 65f350e7bea..5411e5cb81d 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -21,7 +21,9 @@ import org.junit.jupiter.api.DisplayName import org.junit.jupiter.api.condition.OS import java.util.zip.ZipFile import kotlin.io.path.* -import kotlin.test.* +import kotlin.test.assertContains +import kotlin.test.assertEquals +import kotlin.test.assertTrue @OsCondition(supportedOn = [OS.MAC], enabledOnCI = [OS.MAC]) @DisplayName("CocoaPods plugin tests") @@ -561,9 +563,11 @@ class CocoaPodsIT : KGPBaseTest() { nativeProjectWithCocoapodsAndIosAppPodFile(cocoapodsCommonizationProjectName, gradleVersion) { buildWithCocoapodsWrapper(":commonize", "-Pkotlin.mpp.enableCInteropCommonization=false") { assertTasksExecuted(":commonizeNativeDistribution") - assertTasksAreNotInTaskGraph(":cinteropAFNetworkingIosArm64") - assertTasksAreNotInTaskGraph(":cinteropAFNetworkingIosX64") - assertTasksAreNotInTaskGraph(":commonizeCInterop") + assertTasksAreNotInTaskGraph( + ":cinteropAFNetworkingIosArm64", + ":cinteropAFNetworkingIosX64", + ":commonizeCInterop", + ) } } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/tasksAssertions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/tasksAssertions.kt index 1b091b2e7a2..dbeffe158a2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/tasksAssertions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/tasksAssertions.kt @@ -66,7 +66,7 @@ fun BuildResult.assertTasksExecuted(taskPaths: Collection) { * Asserts given [taskPaths] have [TaskOutcome.FAILED] execution state. */ fun BuildResult.assertTasksFailed(vararg taskPaths: String) { - assertTasksHaveOutcome(TaskOutcome.SKIPPED, taskPaths.asList()) + assertTasksHaveOutcome(TaskOutcome.FAILED, taskPaths.asList()) } /**