Skip to content

RUM-19011: Assemble only the tested variant in upload functional tests #658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xnm merged 1 commit into from
Oct 19, 2026
Merged

RUM-19011: Assemble only the tested variant in upload functional tests #658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 33 additions & 27 deletions ...e-plugin/src/test/kotlin/com/datadog/gradle/plugin/DdAndroidGradlePluginFunctionalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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") }
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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
Expand All @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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"
Expand Down
Loading