diff --git a/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt b/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt index 2d336c85..234b6209 100644 --- a/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt +++ b/dd-sdk-android-gradle-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt @@ -629,7 +629,7 @@ internal class DdAndroidGradlePluginFunctionalTest { // since there is no explicit dependency between assemble and upload tasks, Gradle may // optimize the execution and run them in parallel, ignoring the order in the command // line, so we do the explicit split - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -690,7 +690,7 @@ internal class DdAndroidGradlePluginFunctionalTest { // since there is no explicit dependency between assemble and upload tasks, Gradle may // optimize the execution and run them in parallel, ignoring the order in the command // line, so we do the explicit split - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -754,7 +754,7 @@ internal class DdAndroidGradlePluginFunctionalTest { // since there is no explicit dependency between assemble and upload tasks, Gradle may // optimize the execution and run them in parallel, ignoring the order in the command // line, so we do the explicit split - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -790,7 +790,7 @@ internal class DdAndroidGradlePluginFunctionalTest { // since there is no explicit dependency between assemble and upload tasks, Gradle may // optimize the execution and run them in parallel, ignoring the order in the command // line, so we do the explicit split - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -835,7 +835,7 @@ internal class DdAndroidGradlePluginFunctionalTest { // since there is no explicit dependency between assemble and upload tasks, Gradle may // optimize the execution and run them in parallel, ignoring the order in the command // line, so we do the explicit split - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { withArguments(taskName, "--info", "-Pdd-emulate-upload-call") } @@ -886,7 +886,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val taskName = resolveMappingUploadTask(variant) // When - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -942,7 +942,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val taskName = resolveMappingUploadTask(variant) // When - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -1007,7 +1007,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val taskName = resolveMappingUploadTask(variant) // When - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -1249,7 +1249,7 @@ internal class DdAndroidGradlePluginFunctionalTest { // since there is no explicit dependency between assemble and upload tasks, Gradle may // optimize the execution and run them in parallel, ignoring the order in the command // line, so we do the explicit split - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -1307,7 +1307,14 @@ internal class DdAndroidGradlePluginFunctionalTest { ) stubNativeFiles() - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + + val color = forge.anElementFrom(colors) + val version = forge.anElementFrom(versions) + val variant = "${version.lowercase()}$color" + val variantVersionName = version.lowercase() + val taskName = resolveNdkSymbolUploadTask(variant) + + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val arch = forge.anElementFrom(NdkSymbolFileUploadTask.SUPPORTED_ARCHS).arch @@ -1316,12 +1323,6 @@ internal class DdAndroidGradlePluginFunctionalTest { // Stubbing custom .so file that not present inside default build directories stubFile(customSoFile, "some_content") - val color = forge.anElementFrom(colors) - val version = forge.anElementFrom(versions) - val variant = "${version.lowercase()}$color" - val variantVersionName = version.lowercase() - val taskName = resolveNdkSymbolUploadTask(variant) - val result = gradleRunner { withArguments( taskName, @@ -1369,7 +1370,14 @@ internal class DdAndroidGradlePluginFunctionalTest { ) stubNativeFiles() - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + + val color = forge.anElementFrom(colors) + val version = forge.anElementFrom(versions) + val variant = "${version.lowercase()}$color" + val variantVersionName = version.lowercase() + val taskName = resolveNdkSymbolUploadTask(variant) + + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val arch = forge.anElementFrom(NdkSymbolFileUploadTask.SUPPORTED_ARCHS).arch @@ -1378,12 +1386,6 @@ internal class DdAndroidGradlePluginFunctionalTest { // Stubbing custom .so file that not present inside default build directories stubFile(customSoFile, "some_content") - val color = forge.anElementFrom(colors) - val version = forge.anElementFrom(versions) - val variant = "${version.lowercase()}$color" - val variantVersionName = version.lowercase() - val taskName = resolveNdkSymbolUploadTask(variant) - val result = gradleRunner { withArguments( taskName, @@ -1425,7 +1427,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val variant = "${version.lowercase()}$color" val taskName = resolveNdkSymbolUploadTask(variant) - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -1530,7 +1532,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val variant = "${forge.anElementFrom(versions).lowercase()}${forge.anElementFrom(colors)}" val taskName = resolveNdkSymbolUploadTask(variant) - gradleRunner { withArguments(":samples:app:assembleRelease") } + gradleRunner { withArguments(resolveAssembleTask(variant)) } .build() // When @@ -1576,7 +1578,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val variant = "${version.lowercase()}$color" val taskName = resolveNdkSymbolUploadTask(variant) - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val result = gradleRunner { @@ -1631,7 +1633,7 @@ internal class DdAndroidGradlePluginFunctionalTest { val mappingUploadTaskName = resolveMappingUploadTask(variant) // When - gradleRunner { withArguments("--info", ":samples:app:assembleRelease") } + gradleRunner { withArguments("--info", resolveAssembleTask(variant)) } .build() val nativeResult = gradleRunner { @@ -1692,6 +1694,10 @@ internal class DdAndroidGradlePluginFunctionalTest { // region Internal + private fun resolveAssembleTask( + variantName: String + ) = ":samples:app:assemble${variantName.replaceFirstChar { capitalizeChar(it) }}Release" + private fun resolveMappingUploadTask( variantName: String ) = "uploadMapping${variantName.replaceFirstChar { capitalizeChar(it) }}Release"