diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/AndroidCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/AndroidCommandTest.kt deleted file mode 100644 index 21edd81213..0000000000 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/AndroidCommandTest.kt +++ /dev/null @@ -1,29 +0,0 @@ -package ftl.cli.firebase.test - -import com.google.common.truth.Truth -import ftl.test.util.FlankTestRunner -import ftl.test.util.TestHelper.normalizeLineEnding -import org.junit.Rule -import org.junit.Test -import org.junit.contrib.java.lang.system.SystemOutRule -import org.junit.runner.RunWith - -@RunWith(FlankTestRunner::class) -class AndroidCommandTest { - @Rule - @JvmField - val systemOutRule: SystemOutRule = SystemOutRule().enableLog().muteForSuccessfulTests() - - @Test - fun androidCommandPrintsHelp() { - AndroidCommand().run() - val output = systemOutRule.log.normalizeLineEnding() - Truth.assertThat(output).startsWith( - "android [COMMAND]\n" + - "Commands:\n" + - " run Run tests on Firebase Test Lab\n" + - " doctor Verifies flank firebase is setup correctly\n" + - " models Information about available models" - ) - } -} diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsCommandTest.kt deleted file mode 100644 index a6a97f3037..0000000000 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsCommandTest.kt +++ /dev/null @@ -1,28 +0,0 @@ -package ftl.cli.firebase.test.android.models - -import com.google.common.truth.Truth -import ftl.test.util.TestHelper.normalizeLineEnding -import org.junit.Rule -import org.junit.Test -import org.junit.contrib.java.lang.system.SystemOutRule - -class AndroidModelsCommandTest { - @Rule - @JvmField - val systemOutRule: SystemOutRule = SystemOutRule().enableLog().muteForSuccessfulTests() - - @Test - fun androidModelsCommandPrintsHelp() { - AndroidModelsCommand().run() - val output = systemOutRule.log.normalizeLineEnding() - Truth.assertThat(output).startsWith( - "Information about available models\n\n" + - "models [COMMAND]\n\n" + - "Description:\n\n" + - "Information about available models. For example prints list of available models\n" + - "to test against\n" + - "Commands:\n" + - " list Print current list of devices available to test against" - ) - } -} diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommandTest.kt index f9d8ec2586..959301174e 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommandTest.kt @@ -2,43 +2,11 @@ package ftl.cli.firebase.test.android.models import com.google.common.truth.Truth.assertThat import ftl.config.FtlConstants -import ftl.test.util.TestHelper.normalizeLineEnding -import org.junit.Rule import org.junit.Test -import org.junit.contrib.java.lang.system.SystemOutRule import picocli.CommandLine class AndroidModelsListCommandTest { - @Rule - @JvmField - val systemOutRule: SystemOutRule = SystemOutRule().enableLog().muteForSuccessfulTests() - - @Test - fun androidModelsListCommandPrintsHelp() { - val modelsListCommand = AndroidModelsListCommand() - assertThat(modelsListCommand.usageHelpRequested).isFalse() - CommandLine(modelsListCommand).execute("-h") - - val output = systemOutRule.log.normalizeLineEnding() - assertThat(output).startsWith( - "Print current list of devices available to test against\n" + - "\n" + - "list [-h] [-c=<configPath>]\n" + - "\n" + - "Description:\n" + - "\n" + - "Print current list of Android devices available to test against\n" + - "\n" + - "Options:\n" + - " -c, --config=<configPath>\n" + - " YAML config file path\n" + - " -h, --help Prints this help message" - ) - - assertThat(modelsListCommand.usageHelpRequested).isTrue() - } - @Test fun androidModelsListCommandOptions() { val cmd = AndroidModelsListCommand()