Refactor android versions logging

test_runner/src/main/kotlin/ftl/domain/DescribeAndroidVersions.kt

@@ -1,17 +1,22 @@
 package ftl.domain
 
-import flank.common.logLn
+import ftl.api.fetchAndroidOsVersion
 import ftl.args.AndroidArgs
-import ftl.client.google.AndroidCatalog
+import ftl.presentation.Output
 import ftl.run.exception.FlankConfigurationError
+import ftl.run.exception.FlankGeneralError
 import java.nio.file.Paths
 
-interface DescribeAndroidVersions {
+interface DescribeAndroidVersions : Output {
     val versionId: String
     val configPath: String
 }
 
 fun DescribeAndroidVersions.invoke() {
     if (versionId.isBlank()) throw FlankConfigurationError("Argument VERSION_ID must be specified.")
-    logLn(AndroidCatalog.describeSoftwareVersion(AndroidArgs.loadOrDefault(Paths.get(configPath)).project, versionId))
+
+    fetchAndroidOsVersion(AndroidArgs.loadOrDefault(Paths.get(configPath)).project)
+        .find { it.id == versionId }
+        ?.out()
+        ?: throw FlankGeneralError("ERROR: '$versionId' is not a valid OS version")
 }

test_runner/src/main/kotlin/ftl/environment/android/AndroidSoftwareVersionDescription.kt

@@ -8,7 +8,7 @@ fun List<OsVersion.Android>.getDescription(versionId: String) = findVersion(vers
 
 private fun List<OsVersion.Android>.findVersion(versionId: String) = firstOrNull { it.id == versionId }
 
-private fun OsVersion.Android.prepareDescription() = """
+fun OsVersion.Android.prepareDescription() = """
     apiLevel: $apiLevel
     codeName: $codeName
     id: '$id'

test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt

@@ -1,8 +1,12 @@
 package ftl.presentation.cli.firebase.test.android.versions
 
+import ftl.api.OsVersion
 import ftl.config.FtlConstants
 import ftl.domain.DescribeAndroidVersions
 import ftl.domain.invoke
+import ftl.environment.android.prepareDescription
+import ftl.presentation.outputLogger
+import ftl.presentation.throwUnknownType
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -39,4 +43,11 @@ class AndroidVersionsDescribeCommand :
     override var versionId: String = ""
 
     override fun run() = invoke()
+
+    override val out = outputLogger {
+        when (this) {
+            is OsVersion.Android -> prepareDescription()
+            else -> throwUnknownType()
+        }
+    }
 }

test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommandTest.kt

@@ -1,26 +1,15 @@
 package ftl.cli.firebase.test.android.versions
 
-import ftl.client.google.AndroidCatalog
 import ftl.presentation.cli.firebase.test.android.versions.AndroidVersionsDescribeCommand
 import ftl.presentation.cli.firebase.test.ios.versions.IosVersionsDescribeCommand
 import ftl.run.exception.FlankConfigurationError
 import ftl.test.util.TestHelper
-import io.mockk.mockkObject
-import io.mockk.verify
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import picocli.CommandLine
 
 class AndroidVersionsDescribeCommandTest {
 
-    @Test
-    fun `should execute AndroidCatalog describeSoftwareVersion when run AndroidVersionsDescribeCommand`() {
-        mockkObject(AndroidCatalog) {
-            CommandLine(AndroidVersionsDescribeCommand()).execute("21")
-            verify { AndroidCatalog.describeSoftwareVersion(any(), any()) }
-        }
-    }
-
     @Test(expected = FlankConfigurationError::class)
     fun `should throw if version not specified`() {
         CommandLine(AndroidVersionsDescribeCommand()).execute()