Update tests and linting

Flank · Aug 16, 2020 · a5dcec7 · a5dcec7
1 parent 8023bd7
commit a5dcec7
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 10 deletions.
diff --git a/test_runner/src/main/kotlin/ftl/Main.kt b/test_runner/src/main/kotlin/ftl/Main.kt
@@ -4,7 +4,11 @@ import ftl.cli.AuthCommand
 import ftl.cli.FirebaseCommand
 import ftl.cli.firebase.CancelCommand
 import ftl.cli.firebase.RefreshCommand
-import ftl.cli.firebase.test.*
+import ftl.cli.firebase.test.AndroidCommand
+import ftl.cli.firebase.test.IPBlocksCommand
+import ftl.cli.firebase.test.IosCommand
+import ftl.cli.firebase.test.NetworkProfilesCommand
+import ftl.cli.firebase.test.ProvidedSoftwareCommand
 import ftl.log.setDebugLogging
 import ftl.util.readRevision
 import ftl.util.readVersion

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt
@@ -1,6 +1,10 @@
 package ftl.cli.firebase
 
-import ftl.cli.firebase.test.*
+import ftl.cli.firebase.test.AndroidCommand
+import ftl.cli.firebase.test.IPBlocksCommand
+import ftl.cli.firebase.test.IosCommand
+import ftl.cli.firebase.test.NetworkProfilesCommand
+import ftl.cli.firebase.test.ProvidedSoftwareCommand
 import picocli.CommandLine
 import picocli.CommandLine.Command
 

diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ipblocks/IPBlocksListCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ipblocks/IPBlocksListCommand.kt
@@ -1,7 +1,6 @@
 package ftl.cli.firebase.test.ipblocks
 
 import ftl.environment.ipBlocksListAsTable
-import ftl.gc.GcTesting
 import picocli.CommandLine
 
 @CommandLine.Command(
@@ -19,4 +18,4 @@ class IPBlocksListCommand : Runnable {
     override fun run() {
         println(ipBlocksListAsTable())
     }
-}
+}
diff --git a/test_runner/src/main/kotlin/ftl/gc/GcTesting.kt b/test_runner/src/main/kotlin/ftl/gc/GcTesting.kt
@@ -1,7 +1,6 @@
 package ftl.gc
 
 import com.google.api.services.testing.Testing
-import com.google.api.services.testing.model.DeviceIpBlock
 import ftl.config.FtlConstants
 import ftl.config.FtlConstants.JSON_FACTORY
 import ftl.config.FtlConstants.applicationName

diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/IPBlocksCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/IPBlocksCommandTest.kt
@@ -15,6 +15,7 @@ class IPBlocksCommandTest {
         IPBlocksCommand().run()
 
         val expected = """
+Explore IP blocks used by Firebase Test Lab devices.
 ip-blocks [COMMAND]
 Commands:
   list  List all IP address blocks used by Firebase Test Lab devices

diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/NetworkProfilesCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/NetworkProfilesCommandTest.kt
@@ -17,11 +17,12 @@ class NetworkProfilesCommandTest {
         NetworkProfilesCommand().run()
 
         val expected = listOf(
-                "network-profiles [COMMAND]",
-                "Commands:",
-                "  list      List all network profiles available for testing",
-                "  describe  Describe a network profile",
-                ""
+            "Explore network profiles available for testing.",
+            "network-profiles [COMMAND]",
+            "Commands:",
+            "  list      List all network profiles available for testing",
+            "  describe  Describe a network profile",
+            ""
         ).joinToString("\n")
 
         val actual = systemOutRule.log.normalizeLineEnding()