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

[Gradle] Update MppCInteropDependencyTransformationIT UP-TO-DATE requirements

Browse Source 
KT-56115
This commit is contained in:
Sebastian Sellmair
2023-01-24 13:50:28 +01:00
committed by Space Team
parent 103fb39306
commit c5d929eee4
1 changed files with 22 additions and 6 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/MppCInteropDependencyTransformationIT.kt
+22 -6
View File
@@ -25,6 +25,10 @@ import org.junit.Test
*/ */
abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() { abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
enum class DependencyMode {
Project, Repository
}
override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run { override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().run {
copy( copy(
forceOutputToStdout = true, forceOutputToStdout = true,
@@ -253,7 +257,8 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
) )
project.build(":p3:transformNativeMainCInteropDependenciesMetadata", options = repositoryDependencyOptions) { project.build(":p3:transformNativeMainCInteropDependenciesMetadata", options = repositoryDependencyOptions) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":p3:transformNativeMainCInteropDependenciesMetadata") /* Same binaries to transform; does not matter if coming from project dependency or direct one */
assertTasksUpToDate(":p3:transformNativeMainCInteropDependenciesMetadata")
} }
} }
@@ -288,15 +293,15 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
@Test @Test
fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=repository`() { fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=repository`() {
project.publishP1ToBuildRepository() project.publishP1ToBuildRepository()
`test UP-TO-DATE - when changing consumer targets`(repositoryDependencyOptions) `test UP-TO-DATE - when changing consumer targets`(repositoryDependencyOptions, DependencyMode.Repository)
} }
@Test @Test
fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=project`() { fun `test UP-TO-DATE - when changing consumer targets - dependencyMode=project`() {
`test UP-TO-DATE - when changing consumer targets`(projectDependencyOptions) `test UP-TO-DATE - when changing consumer targets`(projectDependencyOptions, DependencyMode.Project)
} }
private fun `test UP-TO-DATE - when changing consumer targets`(options: BuildOptions) { private fun `test UP-TO-DATE - when changing consumer targets`(options: BuildOptions, mode: DependencyMode) {
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) {
assertSuccessful() assertSuccessful()
} }
@@ -311,7 +316,13 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
when (mode) {
DependencyMode.Repository -> assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
/* Had nothing to do before (project to project dependencies are not handled by this task), has still nothing to do) */
DependencyMode.Project -> assertTasksUpToDate(":p2:transformCommonMainCInteropDependenciesMetadata")
}
} }
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = optionsWithAdditionalTargetEnabled) {
@@ -322,7 +333,12 @@ abstract class MppCInteropDependencyTransformationIT : BaseGradleIT() {
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
when (mode) {
DependencyMode.Repository -> assertTasksExecuted(":p2:transformCommonMainCInteropDependenciesMetadata")
/* Had nothing to do before (project to project dependencies are not handled by this task), has still nothing to do) */
DependencyMode.Project -> assertTasksUpToDate(":p2:transformCommonMainCInteropDependenciesMetadata")
}
} }
project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) { project.build(":p2:transformCommonMainCInteropDependenciesMetadata", options = options) {