--test-targets param

test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt

@@ -54,7 +54,7 @@ class AndroidArgs(
     val environmentVariables = androidGcloud.environmentVariables
     val directoriesToPull = androidGcloud.directoriesToPull
     val performanceMetrics = androidGcloud.performanceMetrics
-    val testTargets = androidGcloud.testTargets
+    val testTargets = cli.testTargets ?: androidGcloud.testTargets
     val devices = androidGcloud.device
 
     private val flank = flankYml.flank

test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt

@@ -44,4 +44,11 @@ class AndroidRunCommand : Runnable {
     @Option(names = ["--test"], description = ["""The path to the binary file containing instrumentation tests.
         |The given path may be in the local filesystem or in Google Cloud Storage using a URL beginning with gs://."""])
     var test: String? = null
+
+    @Option(names = ["--test-targets"], description = ["""A list of one or more test target filters to apply
+         (default: run all test targets). Each target filter must be fully qualified with the package name, class name,
+          or test annotation desired. Any test filter supported by am instrument -e … is supported.
+          See https://developer.android.com/reference/android/support/test/runner/AndroidJUnitRunner for more
+          information."""])
+    var testTargets: List<String>? = null
 }

test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt

@@ -315,4 +315,27 @@ AndroidArgs
         assertThat(androidArgs.testApk).isEqualTo(appApk)
         assertThat(androidArgs.cli).isEqualTo(cli)
     }
+
+    @Test
+    fun androidArgs_overrideTestTargetsFromCmdLine() {
+        val cli = AndroidRunCommand()
+        val testTarget = "class com.foo.ClassName"
+
+        CommandLine(cli).parse("--test-targets", testTarget)
+
+        val androidArgs = AndroidArgs.load(
+            """
+        gcloud:
+          app: $appApk
+          test: $testApk
+          test-targets:
+            - class com.example.app.ExampleUiTest#testPasses
+            - class com.example.app.ExampleUiTest#testFails
+      """,
+            cli
+        )
+
+        assertThat(androidArgs.testTargets.size).isEqualTo(1)
+        assertThat(androidArgs.testTargets).isEqualTo(listOf(testTarget))
+    }
 }

test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt

@@ -59,6 +59,7 @@ class AndroidRunCommandTest {
         CommandLine(cmd).parse()
         assertThat(cmd.app).isEqualTo(null)
         assertThat(cmd.test).isEqualTo(null)
+        assertThat(cmd.testTargets).isEqualTo(null)
     }
 
     @Test
@@ -74,4 +75,17 @@ class AndroidRunCommandTest {
         CommandLine(cmd).parse("--test", "myTestApp.apk")
         assertThat(cmd.test).isEqualTo("myTestApp.apk")
     }
+
+    @Test
+    fun testTargets_parse() {
+        val testTargets = "--test-targets"
+        val params = arrayOf(testTargets, "class com.foo.Clazz", testTargets, "package com.my.package")
+        val cmd = AndroidRunCommand()
+
+        CommandLine(cmd).parse(*params)
+
+        assertThat(cmd.testTargets).isNotNull()
+        assertThat(cmd.testTargets?.size).isEqualTo(2)
+        assertThat(cmd.testTargets).isEqualTo(params.filter { it != testTargets })
+    }
 }