Allow alternative *AndroidTest.apk suffixes in AndroidTest.zip

Add more ducttape in guessing what is the app apk for a given test
apk.

Test: Updated the test

Author: liutikas

AndroidXCI/lib/src/main/kotlin/dev/androidx/ci/testRunner/FirebaseTestLabController.kt

@@ -211,10 +211,15 @@ internal class FirebaseTestLabController(
         devicePicker: DevicePicker? = null
     ): List<TestMatrix> {
         val pairs = apks.mapNotNull { uploadedApk ->
-            val isTestApk = uploadedApk.apkInfo.filePath.endsWith(TEST_APK_SUFFIX)
-            if (isTestApk) {
+            val isTestApkWithLegacySuffix = uploadedApk.apkInfo.filePath.endsWith(TEST_APK_SUFFIX_LEGACY)
+            val isTestApkWithNewSuffix = uploadedApk.apkInfo.filePath.endsWith(TEST_APK_SUFFIX_NEW)
+            if (isTestApkWithLegacySuffix || isTestApkWithNewSuffix) {
                 // find the app apk
-                val targetName = uploadedApk.apkInfo.filePath.replace(TEST_APK_SUFFIX, ".apk")
+                val targetName = if (isTestApkWithNewSuffix) {
+                    uploadedApk.apkInfo.filePath.replace(TEST_APK_SUFFIX_NEW, ".apk")
+                } else {
+                    uploadedApk.apkInfo.filePath.replace(TEST_APK_SUFFIX_LEGACY, ".apk")
+                }
                 val appApk = apks.firstOrNull {
                     it.apkInfo.filePath == targetName
                 }
@@ -240,7 +245,8 @@ internal class FirebaseTestLabController(
     }
 
     companion object {
-        private const val TEST_APK_SUFFIX = "-androidTest.apk"
+        private const val TEST_APK_SUFFIX_LEGACY = "-androidTest.apk"
+        private const val TEST_APK_SUFFIX_NEW = "AndroidTest.apk"
     }
 }
 

AndroidXCI/lib/src/test/kotlin/dev/androidx/ci/testRunner/FirebaseTestLabControllerTest.kt

@@ -42,16 +42,21 @@ internal class FirebaseTestLabControllerTest {
 
     @Test
     fun testPairing() = runBlocking<Unit> {
-        val app1Apk = createUploadedApk("app1.apk")
-        val app1TestApk = createUploadedApk("app1-androidTest.apk")
-        val app2Apk = createUploadedApk("app2.apk")
-        val app2TestApk = createUploadedApk("app2-androidTest.apk")
+        val app1LegacyApk = createUploadedApk("app1Legacy.apk")
+        val app1LegacyTestApk = createUploadedApk("app1Legacy-androidTest.apk")
+        val app1Apk = createUploadedApk("app1debug.apk")
+        val app1TestApk = createUploadedApk("app1debugAndroidTest.apk")
+        val app2Apk = createUploadedApk("app2debug.apk")
+        val app2TestApk = createUploadedApk("app2debugAndroidTest.apk")
         val placeholderApk = createUploadedApk("placeholder.apk")
         val noAppTestApk = createUploadedApk("no-app-apk-androidTest.apk")
+
         val apks = listOf(
             app1TestApk,
             createUploadedApk("foo.apk"),
             createUploadedApk("bar.apk"),
+            app1LegacyApk,
+            app1LegacyTestApk,
             app1Apk,
             app2Apk,
             noAppTestApk,
@@ -61,7 +66,7 @@ internal class FirebaseTestLabControllerTest {
             apks = apks,
             placeholderApk = placeholderApk
         )
-        assertThat(testMatrices).hasSize(3)
+        assertThat(testMatrices).hasSize(4)
         val appApkPaths = testMatrices.mapNotNull {
             it.testSpecification.androidInstrumentationTest?.let {
                 it.appApk!!.gcsPath to it.testApk.gcsPath
@@ -71,6 +76,7 @@ internal class FirebaseTestLabControllerTest {
             appApkPaths
         ).containsExactlyElementsIn(
             listOf(
+                app1LegacyApk.gcsPath.path to app1LegacyTestApk.gcsPath.path,
                 app1Apk.gcsPath.path to app1TestApk.gcsPath.path,
                 app2Apk.gcsPath.path to app2TestApk.gcsPath.path,
                 placeholderApk.gcsPath.path to noAppTestApk.gcsPath.path