Added structural output for ios models (#1910)

Flank · May 11, 2021 · 395e5ba · 395e5ba
1 parent 66e796c
commit 395e5ba
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 10 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/adapter/GoogleDeviceModel.kt b/test_runner/src/main/kotlin/ftl/adapter/GoogleDeviceModel.kt
@@ -14,6 +14,8 @@ object GoogleAndroidDeviceModel :
 
 object GoogleIosDeviceModel :
     DeviceModel.Ios.Fetch,
-    (String) -> List<DeviceModel.Ios> by { projectId ->
-        IosCatalog.getModels(projectId).toIosApiModel()
+    (String) -> DeviceModel.Ios.Available by { projectId ->
+        IosCatalog.getModels(projectId).toIosApiModel().available()
     }
+
+private fun List<DeviceModel.Ios>.available() = DeviceModel.Ios.Available(this)
diff --git a/test_runner/src/main/kotlin/ftl/adapter/GoogleTestEnvironment.kt b/test_runner/src/main/kotlin/ftl/adapter/GoogleTestEnvironment.kt
@@ -32,7 +32,7 @@ object FetchGoogleTestEnvironmentIos :
     (String) -> TestEnvironment.Ios by { projectId ->
         TestEnvironment.Ios(
             osVersions = fetchIosOsVersion(projectId),
-            models = fetchDeviceModelIos(projectId),
+            models = fetchDeviceModelIos(projectId).list,
             locales = fetchLocales(Locale.Identity(projectId, Platform.IOS)),
             softwareCatalog = fetchSoftwareCatalog(),
             networkProfiles = fetchNetworkProfiles(),

diff --git a/test_runner/src/main/kotlin/ftl/api/DeviceModels.kt b/test_runner/src/main/kotlin/ftl/api/DeviceModels.kt
@@ -41,6 +41,9 @@ object DeviceModel {
         val deviceCapabilities: List<String>,
     ) {
 
-        interface Fetch : (String) -> List<Ios>
+        data class Available(
+            val list: List<Ios>
+        )
+        interface Fetch : (String) -> Available
     }
 }
diff --git a/test_runner/src/main/kotlin/ftl/args/ValidateIosArgs.kt b/test_runner/src/main/kotlin/ftl/args/ValidateIosArgs.kt
@@ -92,7 +92,7 @@ internal fun isDeviceSupported(
     modelId: String,
     versionId: String,
     projectId: String
-) = fetchDeviceModelIos(projectId).find { it.id == modelId }?.supportedVersionIds?.contains(versionId) ?: false
+) = fetchDeviceModelIos(projectId).list.find { it.id == modelId }?.supportedVersionIds?.contains(versionId) ?: false
 
 private fun IosArgs.assertTestFiles() =
     if (isXcTest) {

diff --git a/test_runner/src/main/kotlin/ftl/domain/DescribeIosModels.kt b/test_runner/src/main/kotlin/ftl/domain/DescribeIosModels.kt
@@ -15,6 +15,7 @@ interface DescribeIosModels : Output {
 operator fun DescribeIosModels.invoke() {
     if (modelId.isBlank()) throw FlankConfigurationError("Argument MODEL_ID must be specified.")
     fetchDeviceModelIos(IosArgs.loadOrDefault(Paths.get(configPath)).project)
+        .list
         .find { it.id == modelId }
         ?.out()
         ?: throw FlankGeneralError("ERROR: '$modelId' is not a valid model")

diff --git a/test_runner/src/main/kotlin/ftl/domain/ListIosModels.kt b/test_runner/src/main/kotlin/ftl/domain/ListIosModels.kt
@@ -1,16 +1,14 @@
 package ftl.domain
 
-import flank.common.logLn
 import ftl.api.fetchDeviceModelIos
 import ftl.args.IosArgs
-import ftl.environment.ios.toCliTable
+import ftl.presentation.Output
 import java.nio.file.Paths
 
-interface ListIosModels {
+interface ListIosModels : Output {
     val configPath: String
 }
 
 operator fun ListIosModels.invoke() {
-    // TODO move toCliTable() and printing presentation layer during refactor of presentation after #1728
-    logLn(fetchDeviceModelIos(IosArgs.loadOrDefault(Paths.get(configPath)).project).toCliTable())
+    fetchDeviceModelIos(IosArgs.loadOrDefault(Paths.get(configPath)).project).out()
 }
diff --git a/test_runner/src/main/kotlin/ftl/environment/ios/ListIOsDevices.kt b/test_runner/src/main/kotlin/ftl/environment/ios/ListIOsDevices.kt
@@ -14,6 +14,8 @@ import ftl.environment.tagToSystemOutColorMapper
 import ftl.util.applyColorsUsing
 import ftl.util.buildTable
 
+fun DeviceModel.Ios.Available.toCliTable() = list.toCliTable()
+
 fun List<DeviceModel.Ios>.toCliTable() = createTestEnvironmentInfo().createIoDevicesTable()
 
 fun List<DeviceModel.Ios>.createTestEnvironmentInfo() =

diff --git a/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelsListCommand.kt b/...ner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelsListCommand.kt
@@ -1,8 +1,12 @@
 package ftl.presentation.cli.firebase.test.ios.models
 
+import ftl.api.DeviceModel
 import ftl.config.FtlConstants
 import ftl.domain.ListIosModels
 import ftl.domain.invoke
+import ftl.environment.ios.toCliTable
+import ftl.presentation.outputLogger
+import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -26,6 +30,13 @@ class IosModelsListCommand :
     )
     override var configPath: String = FtlConstants.defaultIosConfig
 
+    override val out = outputLogger {
+        when (this) {
+            is DeviceModel.Ios.Available -> toCliTable()
+            else -> throwUnknownType()
+        }
+    }
+
     @CommandLine.Option(
         names = ["-h", "--help"],
         usageHelp = true,