Validate variant-dependent config file location in integration test

bidetofevil · bidetofevil · commit d8536a99eb4e · 2025-02-13T10:11:48.000-08:00
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoCustom/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoCustom/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoCustom/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoCustom/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "democ",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoDebug/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoDebug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoDebug/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoDebug/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "demod",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoRelease/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoRelease/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoRelease/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/demoRelease/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "demor",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullCustom/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullCustom/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullCustom/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullCustom/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "fullc",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullDebug/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullDebug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullDebug/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullDebug/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "fulld",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullRelease/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullRelease/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullRelease/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types-product-flavors/src/fullRelease/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "fullr",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/custom/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/custom/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/custom/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/custom/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "custo",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/debug/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/debug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/debug/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/debug/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "debug",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/release/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/release/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/release/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-build-types/src/release/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "relea",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoDebug/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoDebug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoDebug/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoDebug/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "demod",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoRelease/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoRelease/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoRelease/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/demoRelease/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "demor",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullDebug/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullDebug/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullDebug/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullDebug/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "fulld",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullRelease/AndroidManifest.xml b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullRelease/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application android:hasCode="false">
+    </application>
+</manifest>
diff --git a/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullRelease/embrace-config.json b/embrace-gradle-plugin-integration-tests/fixtures/android-product-flavors/src/fullRelease/embrace-config.json
@@ -0,0 +1,4 @@
+{
+  "app_id": "fullr",
+  "api_token": "12345123451234512345123451234512"
+}
diff --git a/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/framework/AssertionInterface.kt b/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/framework/AssertionInterface.kt
@@ -84,8 +84,8 @@ class AssertionInterface(
     private fun AssertionInterface.verifyBuildTelemetryRequestContents(
         request: RecordedRequest,
         expectedVariants: List<String>,
-        testMatrix: TestMatrix,
-        validateAppId: Boolean = true
+        expectedAppIds: List<String>,
+        testMatrix: TestMatrix
     ) {
         with(deserializeRequestBody<BuildTelemetryRequest>(request)) {
             assertNotNull(metadataRequestId)
@@ -102,12 +102,11 @@ class AssertionInterface(
 
             // assert variants match expected list and contain unique build IDs
             val variants = checkNotNull(variantMetadata)
-            variants.forEach { variant ->
+            variants.forEachIndexed { i, variant ->
                 assertNotNull(variant.buildId)
                 assertTrue(expectedVariants.contains(variant.variantName))
-
-                if (validateAppId) {
-                    assertNotNull(variant.appId)
+                if (expectedAppIds.isNotEmpty()) {
+                    assertEquals(expectedAppIds[i], variant.appId)
                 }
             }
             assertEquals(variants.size, variants.map { it.buildId }.distinct().count())
@@ -119,26 +118,40 @@ class AssertionInterface(
      */
     fun AssertionInterface.verifyBuildTelemetryRequestSent(
         expectedVariants: List<String>,
-        validateAppId: Boolean = true,
+        expectedAppIds: List<String>? = null,
         testMatrix: TestMatrix = TestMatrix.MaxVersion,
     ) {
         val request = fetchRequest(EmbraceEndpoint.BUILD_DATA)
         assertHeaders(request, "application/json", null)
 
+        val appIds = expectedAppIds ?: MutableList(expectedVariants.size) {
+            IntegrationTestDefaults.APP_ID
+        }
+
         // assert plugin telemetry was sent
-        verifyBuildTelemetryRequestContents(request, expectedVariants, testMatrix, validateAppId)
+        verifyBuildTelemetryRequestContents(request, expectedVariants, appIds, testMatrix)
     }
 
     /**
      * Verifies JVM mapping requests were sent.
      */
-    fun AssertionInterface.verifyJvmMappingRequestsSent(expectedCount: Int) {
+    fun AssertionInterface.verifyJvmMappingRequestsSent(expectedCount: Int) =
+        verifyJvmMappingRequestsSent(
+            appIds = MutableList(expectedCount) {
+                IntegrationTestDefaults.APP_ID
+            }
+        )
+
+    /**
+     * Verifies JVM mapping requests were sent with the specific appIds in that order
+     */
+    fun AssertionInterface.verifyJvmMappingRequestsSent(appIds: List<String>) {
         val requests = fetchRequests(EmbraceEndpoint.PROGUARD)
-        assertEquals(expectedCount, requests.size)
+        assertEquals(appIds.size, requests.size)
 
-        requests.forEach { request ->
+        requests.forEachIndexed { i, request ->
             val parts = readMultipartRequest(request)
-            parts[0].validateBodyAppId(IntegrationTestDefaults.APP_ID)
+            parts[0].validateBodyAppId(appIds[i])
             parts[1].validateBodyApiToken(IntegrationTestDefaults.API_TOKEN)
             parts[2].validateBodyBuildId()
             parts[3].validateMappingFile("mapping.txt")
diff --git a/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidBuildTypeProductFlavorTest.kt b/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidBuildTypeProductFlavorTest.kt
@@ -12,6 +12,8 @@ class AndroidBuildTypeProductFlavorTest {
     val rule: PluginIntegrationTestRule = PluginIntegrationTestRule()
 
     private val variants = listOf("demoDebug", "fullDebug", "demoRelease", "fullRelease", "demoCustom", "fullCustom")
+    private val appIds = listOf("demod", "fulld", "demor", "fullr", "democ", "fullc")
+    private val obfuscatedAppIds = listOf("democ", "fullc", "demor", "fullr")
 
     @Test
     fun assemble() {
@@ -20,8 +22,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "assemble",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(4)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(obfuscatedAppIds)
             }
         )
     }
@@ -33,8 +35,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "assembleDemo",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(2)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("democ", "demor"))
             }
         )
     }
@@ -46,9 +48,9 @@ class AndroidBuildTypeProductFlavorTest {
             task = "assembleRelease",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(2)
-            }
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("demor", "fullr"))
+            },
         )
     }
 
@@ -59,8 +61,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "assembleFullCustom",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(1)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("fullc"))
             }
         )
     }
@@ -72,8 +74,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "bundle",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(4)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(obfuscatedAppIds)
             }
         )
     }
@@ -85,8 +87,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "bundleDemo",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(2)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("democ", "demor"))
             }
         )
     }
@@ -98,8 +100,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "bundleRelease",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(2)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("demor", "fullr"))
             }
         )
     }
@@ -111,8 +113,8 @@ class AndroidBuildTypeProductFlavorTest {
             task = "bundleFullCustom",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(1)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("fullc"))
             }
         )
     }
diff --git a/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidBuildTypeTest.kt b/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidBuildTypeTest.kt
@@ -12,6 +12,8 @@ class AndroidBuildTypeTest {
     val rule: PluginIntegrationTestRule = PluginIntegrationTestRule()
 
     private val variants = listOf("debug", "release", "custom")
+    private val appIds = listOf("debug", "relea", "custo")
+    private val obfuscatedAppIds = listOf("custo", "relea")
 
     @Test
     fun assemble() {
@@ -20,8 +22,8 @@ class AndroidBuildTypeTest {
             task = "assemble",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(2)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(obfuscatedAppIds)
             }
         )
     }
@@ -33,8 +35,8 @@ class AndroidBuildTypeTest {
             task = "assembleCustom",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(1)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("custo"))
             }
         )
     }
@@ -46,8 +48,8 @@ class AndroidBuildTypeTest {
             task = "bundle",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(2)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(obfuscatedAppIds)
             }
         )
     }
@@ -59,8 +61,8 @@ class AndroidBuildTypeTest {
             task = "bundleCustom",
             projectType = ProjectType.ANDROID,
             assertions = {
-                verifyBuildTelemetryRequestSent(variants)
-                verifyJvmMappingRequestsSent(1)
+                verifyBuildTelemetryRequestSent(expectedVariants = variants, expectedAppIds = appIds)
+                verifyJvmMappingRequestsSent(listOf("custo"))
             }
         )
     }
diff --git a/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidFlavorDimensionsTest.kt b/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidFlavorDimensionsTest.kt
diff --git a/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidProductFlavorTest.kt b/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/AndroidProductFlavorTest.kt
diff --git a/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/MissingConfigFileTest.kt b/embrace-gradle-plugin-integration-tests/src/test/java/io/embrace/android/gradle/integration/testcases/MissingConfigFileTest.kt

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +  "app_id": "democ",
 +  "api_token": "12345123451234512345123451234512"
 +}