Add --test-targets-always-run (#421)

Flank · Dec 3, 2018 · 42eb2dd · 42eb2dd
1 parent b28a17f
commit 42eb2dd
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 7 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt
@@ -65,7 +65,7 @@ class AndroidArgs(
     override val testShards = cli?.testShards ?: flank.testShards
     override val repeatTests = cli?.repeatTests ?: flank.repeatTests
     override val smartFlankGcsPath = flank.smartFlankGcsPath
-    override val testTargetsAlwaysRun = flank.testTargetsAlwaysRun
+    override val testTargetsAlwaysRun = cli?.testTargetsAlwaysRun ?: flank.testTargetsAlwaysRun
 
     // computed properties not specified in yaml
     override val testShardChunks: List<List<String>> by lazy {

diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt
@@ -50,7 +50,7 @@ class IosArgs(
     override val testShards = cli?.testShards ?: flank.testShards
     override val repeatTests = cli?.repeatTests ?: flank.repeatTests
     override val smartFlankGcsPath = flank.smartFlankGcsPath
-    override val testTargetsAlwaysRun = flank.testTargetsAlwaysRun
+    override val testTargetsAlwaysRun = cli?.testTargetsAlwaysRun ?: flank.testTargetsAlwaysRun
 
     private val iosFlank = iosFlankYml.flank
     val testTargets = iosFlank.testTargets

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt
@@ -50,7 +50,7 @@ class AndroidRunCommand : Runnable {
         |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
+    @Option(names = ["--test-targets"], split = ",", 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
@@ -154,4 +154,8 @@ class AndroidRunCommand : Runnable {
 
     @Option(names = ["--repeat-tests"], description = ["""The amount of times to repeat the test executions."""])
     var repeatTests: Int? = null
+
+    @Option(names = ["--test-targets-always-run"], split = ",", description = ["""A list of one or more test methods to always run
+        |first in every shard."""])
+    var testTargetsAlwaysRun: List<String>? = null
 }
diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt
@@ -73,4 +73,8 @@ class IosRunCommand : Runnable {
 
     @Option(names = ["--repeat-tests"], description = ["""The amount of times to repeat the test executions."""])
     var repeatTests: Int? = null
+
+    @Option(names = ["--test-targets-always-run"], split = ",", description = ["""A list of one or more test methods to always run
+        |first in every shard."""])
+    var testTargetsAlwaysRun: List<String>? = null
 }
diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
@@ -322,21 +322,22 @@ AndroidArgs
         val cli = AndroidRunCommand()
         val testTarget = "class com.foo.ClassName"
 
-        CommandLine(cli).parse("--test-targets", testTarget)
+        CommandLine(cli).parse("--test-targets=$testTarget,$testTarget")
 
         val yaml = """
         gcloud:
           app: $appApk
           test: $testApk
           test-targets:
+            - class com.example.app.ExampleUiTest#testPasses
             - class com.example.app.ExampleUiTest#testPasses
             - class com.example.app.ExampleUiTest#testFails
       """
-        assertThat(AndroidArgs.load(yaml).testTargets.size).isEqualTo(2)
+        assertThat(AndroidArgs.load(yaml).testTargets.size).isEqualTo(3)
 
         val androidArgs = AndroidArgs.load(yaml, cli)
-        assertThat(androidArgs.testTargets.size).isEqualTo(1)
-        assertThat(androidArgs.testTargets).isEqualTo(listOf(testTarget))
+        assertThat(androidArgs.testTargets.size).isEqualTo(2)
+        assertThat(androidArgs.testTargets).isEqualTo(listOf(testTarget, testTarget))
     }
 
     @Test
@@ -655,4 +656,17 @@ AndroidArgs
         assertThat(AndroidArgs.load(yaml).repeatTests).isEqualTo(2)
         assertThat(AndroidArgs.load(yaml, cli).repeatTests).isEqualTo(3)
     }
+
+    @Test
+    fun cli_testTargetsAlwaysRun() {
+        val cli = AndroidRunCommand()
+        CommandLine(cli).parse("--test-targets-always-run=com.A,com.B")
+
+        val yaml = """
+        gcloud:
+          app: $appApk
+          test: $testApk
+      """
+        assertThat(AndroidArgs.load(yaml, cli).testTargetsAlwaysRun).isEqualTo(arrayListOf("com.A", "com.B"))
+    }
 }
diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt
@@ -375,4 +375,17 @@ IosArgs
         assertThat(IosArgs.load(yaml).repeatTests).isEqualTo(2)
         assertThat(IosArgs.load(yaml, cli).repeatTests).isEqualTo(3)
     }
+
+    @Test
+    fun cli_testTargetsAlwaysRun() {
+        val cli = IosRunCommand()
+        CommandLine(cli).parse("--test-targets-always-run=com.A,com.B")
+
+        val yaml = """
+        gcloud:
+          test: $testPath
+          xctestrun-file: $xctestrunFile
+      """
+        assertThat(IosArgs.load(yaml, cli).testTargetsAlwaysRun).isEqualTo(arrayListOf("com.A", "com.B"))
+    }
 }
diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt
@@ -79,6 +79,7 @@ class AndroidRunCommandTest {
         assertThat(cmd.resultsHistoryName).isNull()
         assertThat(cmd.testShards).isNull()
         assertThat(cmd.repeatTests).isNull()
+        assertThat(cmd.testTargetsAlwaysRun).isNull()
     }
 
     @Test
@@ -255,4 +256,12 @@ class AndroidRunCommandTest {
 
         assertThat(cmd.repeatTests).isEqualTo(3)
     }
+
+    @Test
+    fun testTargetsAlwaysRun_parse() {
+        val cmd = AndroidRunCommand()
+        CommandLine(cmd).parse("--test-targets-always-run=a,b,c")
+
+        assertThat(cmd.testTargetsAlwaysRun).isEqualTo(arrayListOf("a", "b", "c"))
+    }
 }
diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt
@@ -66,6 +66,7 @@ class IosRunCommandTest {
         assertThat(cmd.resultsHistoryName).isNull()
         assertThat(cmd.testShards).isNull()
         assertThat(cmd.repeatTests).isNull()
+        assertThat(cmd.testTargetsAlwaysRun).isNull()
     }
 
     @Test
@@ -141,4 +142,12 @@ class IosRunCommandTest {
 
         assertThat(cmd.repeatTests).isEqualTo(3)
     }
+
+    @Test
+    fun testTargetsAlwaysRun_parse() {
+        val cmd = IosRunCommand()
+        CommandLine(cmd).parse("--test-targets-always-run=a,b,c")
+
+        assertThat(cmd.testTargetsAlwaysRun).isEqualTo(arrayListOf("a", "b", "c"))
+    }
 }