Add --async (#416)

Flank · Dec 3, 2018 · b5fb31a · b5fb31a
1 parent f0a6c86
commit b5fb31a
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 2 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt
@@ -44,7 +44,7 @@ class AndroidArgs(
     override val resultsBucket: String
     override val recordVideo = cli?.recordVideo ?: cli?.noRecordVideo?.not() ?: gcloud.recordVideo
     override val testTimeout = cli?.timeout ?: gcloud.timeout
-    override val async = gcloud.async
+    override val async = cli?.async ?: gcloud.async
     override val projectId = gcloud.project
     override val resultsHistoryName = gcloud.resultsHistoryName
 

diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt
@@ -36,7 +36,7 @@ class IosArgs(
     override val resultsBucket: String
     override val recordVideo = cli?.recordVideo ?: cli?.noRecordVideo?.not() ?: gcloud.recordVideo
     override val testTimeout = cli?.timeout ?: gcloud.timeout
-    override val async = gcloud.async
+    override val async = cli?.async ?: gcloud.async
     override val projectId = gcloud.project
     override val resultsHistoryName = gcloud.resultsHistoryName
 

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
@@ -135,4 +135,7 @@ class AndroidRunCommand : Runnable {
         |possible testing time is 30m on physical devices and 60m on virtual devices. The TIMEOUT units can be h, m,
         | or s. If no unit is given, seconds are assumed. """])
     var timeout: String? = null
+
+    @Option(names = ["--async"], description = ["""Invoke a test asynchronously without waiting for test results."""])
+    var async: Boolean? = 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
@@ -54,4 +54,7 @@ class IosRunCommand : Runnable {
         |possible testing time is 30m on physical devices and 60m on virtual devices. The TIMEOUT units can be h, m,
         | or s. If no unit is given, seconds are assumed. """])
     var timeout: String? = null
+
+    @Option(names = ["--async"], description = ["""Invoke a test asynchronously without waiting for test results."""])
+    var async: Boolean? = null
 }
diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt
@@ -576,4 +576,19 @@ AndroidArgs
         assertThat(AndroidArgs.load(yaml).testTimeout).isEqualTo("2m")
         assertThat(AndroidArgs.load(yaml, cli).testTimeout).isEqualTo("1m")
     }
+
+    @Test
+    fun cli_async() {
+        val cli = AndroidRunCommand()
+        CommandLine(cli).parse("--async")
+
+        val yaml = """
+        gcloud:
+          app: $appApk
+          test: $testApk
+          async: false
+      """
+        assertThat(AndroidArgs.load(yaml).async).isEqualTo(false)
+        assertThat(AndroidArgs.load(yaml, cli).async).isEqualTo(true)
+    }
 }
diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt
@@ -296,4 +296,19 @@ IosArgs
         assertThat(IosArgs.load(yaml).testTimeout).isEqualTo("2m")
         assertThat(IosArgs.load(yaml, cli).testTimeout).isEqualTo("1m")
     }
+
+    @Test
+    fun cli_async() {
+        val cli = IosRunCommand()
+        CommandLine(cli).parse("--async")
+
+        val yaml = """
+        gcloud:
+          test: $testPath
+          xctestrun-file: $xctestrunFile
+          async: false
+      """
+        assertThat(IosArgs.load(yaml).async).isEqualTo(false)
+        assertThat(IosArgs.load(yaml, cli).async).isEqualTo(true)
+    }
 }
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
@@ -74,6 +74,7 @@ class AndroidRunCommandTest {
         assertThat(cmd.recordVideo).isNull()
         assertThat(cmd.noRecordVideo).isNull()
         assertThat(cmd.timeout).isNull()
+        assertThat(cmd.async).isNull()
     }
 
     @Test
@@ -208,4 +209,12 @@ class AndroidRunCommandTest {
 
         assertThat(cmd.timeout).isEqualTo("1m")
     }
+
+    @Test
+    fun async_parse() {
+        val cmd = AndroidRunCommand()
+        CommandLine(cmd).parse("--async")
+
+        assertThat(cmd.async).isTrue()
+    }
 }
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
@@ -61,6 +61,7 @@ class IosRunCommandTest {
         assertThat(cmd.recordVideo).isNull()
         assertThat(cmd.noRecordVideo).isNull()
         assertThat(cmd.timeout).isNull()
+        assertThat(cmd.async).isNull()
     }
 
     @Test
@@ -94,4 +95,12 @@ class IosRunCommandTest {
 
         assertThat(cmd.timeout).isEqualTo("1m")
     }
+
+    @Test
+    fun async_parse() {
+        val cmd = IosRunCommand()
+        CommandLine(cmd).parse("--async")
+
+        assertThat(cmd.async).isTrue()
+    }
 }