Added the ability to pass in device ids to filter the execution on th…

…ose devices only (#85)
gojuno · Jul 25, 2017 · 773e5f1 · 773e5f1
1 parent d115821
commit 773e5f1
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/composer/src/main/kotlin/com/gojuno/composer/Args.kt b/composer/src/main/kotlin/com/gojuno/composer/Args.kt
@@ -13,7 +13,8 @@ data class Args(
         val shard: Boolean,
         val outputDirectory: String,
         val instrumentationArguments: List<Pair<String, String>>,
-        val verboseOutput: Boolean
+        val verboseOutput: Boolean,
+        val devices: List<String>
 )
 
 // No way to share array both for runtime and annotation without reflection.
@@ -86,6 +87,14 @@ private class JCommanderArgs {
             description = "Either `true` or `false` to enable/disable verbose output for Swarmer. `false` by default."
     )
     var verboseOutput: Boolean? = null
+
+    @Parameter(
+            names = arrayOf("--devices"),
+            required = false,
+            variableArity = true,
+            description = "Connected devices/emulators that will be used to run tests against. If not passed — tests will run on all connected devices/emulators. Usage example: `--devices emulator-5554 emulator-5556`."
+    )
+    var devices: List<String>? = null
 }
 
 fun parseArgs(rawArgs: Array<String>): Args {
@@ -119,7 +128,8 @@ fun parseArgs(rawArgs: Array<String>): Args {
                         }
                     }
                 },
-                verboseOutput = jCommanderArgs.verboseOutput ?: false
+                verboseOutput = jCommanderArgs.verboseOutput ?: false,
+                devices = jCommanderArgs.devices ?: emptyList()
         )
     }
 }

diff --git a/composer/src/main/kotlin/com/gojuno/composer/Main.kt b/composer/src/main/kotlin/com/gojuno/composer/Main.kt
@@ -38,6 +38,12 @@ fun main(rawArgs: Array<String>) {
     val gson = Gson()
 
     val suites: List<Suite> = connectedAdbDevices()
+            .map {
+                when (args.devices.isEmpty()) {
+                    true -> it
+                    false -> it.filter { args.devices.contains(it.id) }
+                }
+            }
             .map {
                 it.filter { it.online }.apply {
                     if (isEmpty()) {

diff --git a/composer/src/test/kotlin/com/gojuno/composer/ArgsSpec.kt b/composer/src/test/kotlin/com/gojuno/composer/ArgsSpec.kt
@@ -29,7 +29,8 @@ class ArgsSpec : Spek({
                     shard = true,
                     outputDirectory = "composer-output",
                     instrumentationArguments = emptyList(),
-                    verboseOutput = false
+                    verboseOutput = false,
+                    devices = emptyList()
             ))
         }
     }
@@ -78,4 +79,28 @@ class ArgsSpec : Spek({
             }
         }
     }
+
+    context("parse args with passed --devices") {
+
+        val args by memoized {
+            parseArgs(rawArgsWithOnlyRequiredFields + arrayOf("--devices", "emulator-5554"))
+        }
+
+        it("parses correctly device ids") {
+            assertThat(args.devices).isEqualTo(listOf("emulator-5554"))
+        }
+
+    }
+
+    context("parse args with passed two --devices") {
+
+        val args by memoized {
+            parseArgs(rawArgsWithOnlyRequiredFields + arrayOf("--devices", "emulator-5554", "emulator-5556"))
+        }
+
+        it("parses correctly two device ids") {
+            assertThat(args.devices).isEqualTo(listOf("emulator-5554", "emulator-5556"))
+        }
+
+    }
 })