From 9cb1c523f0c49f91a644a43e8ab3942d286bee0b Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Fri, 2 Apr 2021 13:07:43 +0200 Subject: [PATCH] Move cli to presentation --- test_runner/src/main/kotlin/ftl/Main.kt | 2 +- .../kotlin/ftl/args/AndroidArgsCompanion.kt | 2 +- .../main/kotlin/ftl/args/IosArgsCompanion.kt | 2 +- .../kotlin/ftl/cli/firebase/TestCommand.kt | 23 ---------------- .../ftl/cli/firebase/test/AndroidCommand.kt | 27 ------------------- .../ftl/cli/firebase/test/IosCommand.kt | 27 ------------------- .../src/main/kotlin/ftl/config/Create.kt | 4 +-- .../kotlin/ftl/domain/RunDoctorAndroid.kt | 2 +- .../main/kotlin/ftl/domain/RunDoctorIos.kt | 2 +- .../ftl/{ => presentation}/cli/AuthCommand.kt | 5 ++-- .../{ => presentation}/cli/FirebaseCommand.kt | 8 +++--- .../ftl/{ => presentation}/cli/MainCommand.kt | 16 +++++------ .../ftl/{ => presentation}/cli/README.md | 0 .../cli/auth/LoginCommand.kt | 2 +- .../cli/firebase/CancelCommand.kt | 2 +- .../cli/firebase/RefreshCommand.kt | 2 +- .../presentation/cli/firebase/TestCommand.kt | 22 +++++++++++++++ .../cli/firebase/test/AndroidCommand.kt | 27 +++++++++++++++++++ .../cli/firebase/test/CommandUtil.kt | 2 +- .../cli/firebase/test/CommonRunCommand.kt | 2 +- .../cli/firebase/test/IPBlocksCommand.kt | 4 +-- .../cli/firebase/test/IosCommand.kt | 27 +++++++++++++++++++ .../firebase/test/NetworkProfilesCommand.kt | 6 ++--- .../firebase/test/ProvidedSoftwareCommand.kt | 4 +-- .../test/android/AndroidDoctorCommand.kt | 2 +- .../test/android/AndroidLocalesCommand.kt | 6 ++--- .../test/android/AndroidModelsCommand.kt | 6 ++--- .../android/AndroidOrientationsCommand.kt | 4 +-- .../test/android/AndroidRunCommand.kt | 4 +-- .../android/AndroidTestEnvironmentCommand.kt | 2 +- .../test/android/AndroidVersionsCommand.kt | 6 ++--- .../locales/AndroidLocalesDescribeCommand.kt | 2 +- .../locales/AndroidLocalesListCommand.kt | 2 +- .../models/AndroidModelDescribeCommand.kt | 2 +- .../models/AndroidModelsListCommand.kt | 2 +- .../AndroidOrientationsListCommand.kt | 2 +- .../AndroidVersionsDescribeCommand.kt | 2 +- .../versions/AndroidVersionsListCommand.kt | 2 +- .../cli/firebase/test/ios/IosDoctorCommand.kt | 2 +- .../firebase/test/ios/IosLocalesCommand.kt | 6 ++--- .../cli/firebase/test/ios/IosModelsCommand.kt | 6 ++--- .../test/ios/IosOrientationsCommand.kt | 4 +-- .../cli/firebase/test/ios/IosRunCommand.kt | 4 +-- .../test/ios/IosTestEnvironmentCommand.kt | 2 +- .../firebase/test/ios/IosVersionsCommand.kt | 6 ++--- .../IosLocalesDescribeCommand.kt | 2 +- .../configuration/IosLocalesListCommand.kt | 2 +- .../ios/models/IosModelDescribeCommand.kt | 2 +- .../test/ios/models/IosModelsListCommand.kt | 2 +- .../IosOrientationsListCommand.kt | 2 +- .../versions/IosVersionsDescribeCommand.kt | 2 +- .../ios/versions/IosVersionsListCommand.kt | 2 +- .../test/ipblocks/IPBlocksListCommand.kt | 2 +- .../NetworkProfilesDescribeCommand.kt | 2 +- .../NetworkProfilesListCommand.kt | 2 +- .../ProvidedSoftwareListCommand.kt | 2 +- test_runner/src/test/kotlin/Debug.kt | 4 +-- test_runner/src/test/kotlin/ftl/MainTest.kt | 4 +-- .../test/kotlin/ftl/args/AndroidArgsTest.kt | 2 +- .../src/test/kotlin/ftl/args/IosArgsTest.kt | 2 +- .../test/kotlin/ftl/cli/AuthCommandTest.kt | 2 +- .../kotlin/ftl/cli/FirebaseCommandTest.kt | 2 +- .../kotlin/ftl/cli/auth/LoginCommandTest.kt | 6 ++--- .../ftl/cli/firebase/CancelCommandTest.kt | 8 +++--- .../ftl/cli/firebase/RefreshCommandTest.kt | 6 ++--- .../ftl/cli/firebase/TestCommandTest.kt | 2 +- .../cli/firebase/test/IPBlocksCommandTest.kt | 1 + .../test/NetworkProfilesCommandTest.kt | 1 + .../test/android/AndroidDoctorCommandTest.kt | 1 + .../test/android/AndroidRunCommandTest.kt | 1 + .../AndroidTestEnvironmentCommandTest.kt | 1 + .../AndroidLocalesDescribeCommandTest.kt | 1 + .../locales/AndroidLocalesListCommandTest.kt | 1 + .../models/AndroidModelsListCommandTest.kt | 1 + .../AndroidOrientationCommandListTest.kt | 3 ++- .../AndroidVersionsDescribeCommandTest.kt | 3 ++- .../AndroidVersionsListCommandTest.kt | 1 + .../firebase/test/ios/IosDoctorCommandTest.kt | 1 + .../firebase/test/ios/IosRunCommandTest.kt | 1 + .../test/ios/IosTestEnvironmentCommandTest.kt | 1 + .../IosLocalesDescribeCommandTest.kt | 1 + .../IosLocalesListCommandTest.kt | 1 + .../ios/models/IosModelsListCommandTest.kt | 1 + .../IosOrientationCommandListTest.kt | 1 + .../IosVersionsDescribeCommandTest.kt | 1 + .../versions/IosVersionsListCommandTest.kt | 1 + .../NetworkProfileDescribeTest.kt | 1 + .../NetworkProfilesListCommandTest.kt | 1 + .../kotlin/ftl/ios/xctest/XcTestDataTest.kt | 2 +- .../test/kotlin/ftl/run/DumpShardsKtTest.kt | 4 +-- .../test/kotlin/ftl/test/util/TestHelper.kt | 4 +-- 91 files changed, 205 insertions(+), 185 deletions(-) delete mode 100644 test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt delete mode 100644 test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt delete mode 100644 test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/AuthCommand.kt (76%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/FirebaseCommand.kt (62%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/MainCommand.kt (69%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/README.md (100%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/auth/LoginCommand.kt (96%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/CancelCommand.kt (96%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/RefreshCommand.kt (96%) create mode 100644 test_runner/src/main/kotlin/ftl/presentation/cli/firebase/TestCommand.kt create mode 100644 test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/AndroidCommand.kt rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/CommandUtil.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/CommonRunCommand.kt (98%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/IPBlocksCommand.kt (73%) create mode 100644 test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IosCommand.kt rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/NetworkProfilesCommand.kt (64%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ProvidedSoftwareCommand.kt (68%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidDoctorCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidLocalesCommand.kt (75%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidModelsCommand.kt (75%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidOrientationsCommand.kt (80%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidRunCommand.kt (93%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt (96%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/AndroidVersionsCommand.kt (75%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/models/AndroidModelsListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosDoctorCommand.kt (96%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosLocalesCommand.kt (76%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosModelsCommand.kt (76%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosOrientationsCommand.kt (82%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosRunCommand.kt (93%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosTestEnvironmentCommand.kt (96%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/IosVersionsCommand.kt (76%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/models/IosModelDescribeCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/models/IosModelsListCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt (95%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ios/versions/IosVersionsListCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/ipblocks/IPBlocksListCommand.kt (92%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt (94%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt (91%) rename test_runner/src/main/kotlin/ftl/{ => presentation}/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt (91%) diff --git a/test_runner/src/main/kotlin/ftl/Main.kt b/test_runner/src/main/kotlin/ftl/Main.kt index d3c53afd57..2f0cb96cd0 100644 --- a/test_runner/src/main/kotlin/ftl/Main.kt +++ b/test_runner/src/main/kotlin/ftl/Main.kt @@ -1,6 +1,6 @@ package ftl -import ftl.cli.MainCommand +import ftl.presentation.cli.MainCommand import ftl.run.exception.withGlobalExceptionHandling import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/args/AndroidArgsCompanion.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgsCompanion.kt index a568bc5eda..0fa4d3b290 100644 --- a/test_runner/src/main/kotlin/ftl/args/AndroidArgsCompanion.kt +++ b/test_runner/src/main/kotlin/ftl/args/AndroidArgsCompanion.kt @@ -2,7 +2,6 @@ package ftl.args import com.google.common.annotations.VisibleForTesting import ftl.args.yml.mergeYmlKeys -import ftl.cli.firebase.test.android.AndroidRunCommand import ftl.config.android.AndroidFlankConfig import ftl.config.android.AndroidGcloudConfig import ftl.config.common.CommonFlankConfig @@ -10,6 +9,7 @@ import ftl.config.common.CommonGcloudConfig import ftl.config.defaultAndroidConfig import ftl.config.loadAndroidConfig import ftl.config.plus +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand import ftl.util.loadFile import java.io.Reader import java.nio.file.Files diff --git a/test_runner/src/main/kotlin/ftl/args/IosArgsCompanion.kt b/test_runner/src/main/kotlin/ftl/args/IosArgsCompanion.kt index 4c3ca0493b..e32d9d271b 100644 --- a/test_runner/src/main/kotlin/ftl/args/IosArgsCompanion.kt +++ b/test_runner/src/main/kotlin/ftl/args/IosArgsCompanion.kt @@ -2,7 +2,6 @@ package ftl.args import com.google.common.annotations.VisibleForTesting import ftl.args.yml.mergeYmlKeys -import ftl.cli.firebase.test.ios.IosRunCommand import ftl.config.common.CommonFlankConfig import ftl.config.common.CommonGcloudConfig import ftl.config.defaultIosConfig @@ -10,6 +9,7 @@ import ftl.config.ios.IosFlankConfig import ftl.config.ios.IosGcloudConfig import ftl.config.loadIosConfig import ftl.config.plus +import ftl.presentation.cli.firebase.test.ios.IosRunCommand import ftl.util.loadFile import java.io.Reader import java.nio.file.Files diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt deleted file mode 100644 index f6ecfa2b67..0000000000 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt +++ /dev/null @@ -1,23 +0,0 @@ -package ftl.cli.firebase - -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.util.PrintHelp -import picocli.CommandLine.Command - -@Command( - name = "test", - synopsisHeading = "", - subcommands = [ - AndroidCommand::class, - IosCommand::class, - NetworkProfilesCommand::class, - ProvidedSoftwareCommand::class, - IPBlocksCommand::class - ], - usageHelpAutoWidth = true -) -class TestCommand : PrintHelp diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt deleted file mode 100644 index fd2d3ed9d7..0000000000 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt +++ /dev/null @@ -1,27 +0,0 @@ -package ftl.cli.firebase.test - -import ftl.cli.firebase.test.android.AndroidDoctorCommand -import ftl.cli.firebase.test.android.AndroidLocalesCommand -import ftl.cli.firebase.test.android.AndroidModelsCommand -import ftl.cli.firebase.test.android.AndroidOrientationsCommand -import ftl.cli.firebase.test.android.AndroidRunCommand -import ftl.cli.firebase.test.android.AndroidTestEnvironmentCommand -import ftl.cli.firebase.test.android.AndroidVersionsCommand -import ftl.util.PrintHelp -import picocli.CommandLine.Command - -@Command( - name = "android", - synopsisHeading = "", - subcommands = [ - AndroidRunCommand::class, - AndroidDoctorCommand::class, - AndroidModelsCommand::class, - AndroidVersionsCommand::class, - AndroidOrientationsCommand::class, - AndroidLocalesCommand::class, - AndroidTestEnvironmentCommand::class - ], - usageHelpAutoWidth = true -) -class AndroidCommand : PrintHelp diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt deleted file mode 100644 index 8309540c5a..0000000000 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt +++ /dev/null @@ -1,27 +0,0 @@ -package ftl.cli.firebase.test - -import ftl.cli.firebase.test.ios.IosDoctorCommand -import ftl.cli.firebase.test.ios.IosLocalesCommand -import ftl.cli.firebase.test.ios.IosModelsCommand -import ftl.cli.firebase.test.ios.IosOrientationsCommand -import ftl.cli.firebase.test.ios.IosRunCommand -import ftl.cli.firebase.test.ios.IosTestEnvironmentCommand -import ftl.cli.firebase.test.ios.IosVersionsCommand -import ftl.util.PrintHelp -import picocli.CommandLine.Command - -@Command( - name = "ios", - synopsisHeading = "", - subcommands = [ - IosRunCommand::class, - IosDoctorCommand::class, - IosModelsCommand::class, - IosVersionsCommand::class, - IosLocalesCommand::class, - IosTestEnvironmentCommand::class, - IosOrientationsCommand::class - ], - usageHelpAutoWidth = true -) -class IosCommand : PrintHelp diff --git a/test_runner/src/main/kotlin/ftl/config/Create.kt b/test_runner/src/main/kotlin/ftl/config/Create.kt index f9f8e7a055..64a2baa2e7 100644 --- a/test_runner/src/main/kotlin/ftl/config/Create.kt +++ b/test_runner/src/main/kotlin/ftl/config/Create.kt @@ -1,13 +1,13 @@ package ftl.config -import ftl.cli.firebase.test.android.AndroidRunCommand -import ftl.cli.firebase.test.ios.IosRunCommand import ftl.config.android.AndroidFlankConfig import ftl.config.android.AndroidGcloudConfig import ftl.config.common.CommonFlankConfig import ftl.config.common.CommonGcloudConfig import ftl.config.ios.IosFlankConfig import ftl.config.ios.IosGcloudConfig +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand +import ftl.presentation.cli.firebase.test.ios.IosRunCommand import kotlin.properties.ReadOnlyProperty fun defaultAndroidConfig() = AndroidConfig( diff --git a/test_runner/src/main/kotlin/ftl/domain/RunDoctorAndroid.kt b/test_runner/src/main/kotlin/ftl/domain/RunDoctorAndroid.kt index 931a983a1e..fdadabca0f 100644 --- a/test_runner/src/main/kotlin/ftl/domain/RunDoctorAndroid.kt +++ b/test_runner/src/main/kotlin/ftl/domain/RunDoctorAndroid.kt @@ -1,8 +1,8 @@ package ftl.domain import ftl.args.AndroidArgs -import ftl.cli.firebase.test.processValidation import ftl.doctor.validateYaml +import ftl.presentation.cli.firebase.test.processValidation import java.nio.file.Paths interface RunDoctorAndroid { diff --git a/test_runner/src/main/kotlin/ftl/domain/RunDoctorIos.kt b/test_runner/src/main/kotlin/ftl/domain/RunDoctorIos.kt index 836c7cc0b6..b90e3e63fb 100644 --- a/test_runner/src/main/kotlin/ftl/domain/RunDoctorIos.kt +++ b/test_runner/src/main/kotlin/ftl/domain/RunDoctorIos.kt @@ -1,8 +1,8 @@ package ftl.domain import ftl.args.IosArgs -import ftl.cli.firebase.test.processValidation import ftl.doctor.validateYaml +import ftl.presentation.cli.firebase.test.processValidation import java.nio.file.Paths interface RunDoctorIos { diff --git a/test_runner/src/main/kotlin/ftl/cli/AuthCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/AuthCommand.kt similarity index 76% rename from test_runner/src/main/kotlin/ftl/cli/AuthCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/AuthCommand.kt index 6d14073b96..e6ce643a3e 100644 --- a/test_runner/src/main/kotlin/ftl/cli/AuthCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/AuthCommand.kt @@ -1,6 +1,5 @@ -package ftl.cli +package ftl.presentation.cli -import ftl.cli.auth.LoginCommand import ftl.util.PrintHelp import picocli.CommandLine.Command @@ -9,7 +8,7 @@ import picocli.CommandLine.Command synopsisHeading = "%n", header = ["Manage oauth2 credentials for Google Cloud"], subcommands = [ - LoginCommand::class + ftl.presentation.cli.auth.LoginCommand::class ], usageHelpAutoWidth = true ) diff --git a/test_runner/src/main/kotlin/ftl/cli/FirebaseCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/FirebaseCommand.kt similarity index 62% rename from test_runner/src/main/kotlin/ftl/cli/FirebaseCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/FirebaseCommand.kt index c11261efde..6bfc81e463 100644 --- a/test_runner/src/main/kotlin/ftl/cli/FirebaseCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/FirebaseCommand.kt @@ -1,8 +1,8 @@ -package ftl.cli +package ftl.presentation.cli -import ftl.cli.firebase.CancelCommand -import ftl.cli.firebase.RefreshCommand -import ftl.cli.firebase.TestCommand +import ftl.presentation.cli.firebase.CancelCommand +import ftl.presentation.cli.firebase.RefreshCommand +import ftl.presentation.cli.firebase.TestCommand import ftl.util.PrintHelp import picocli.CommandLine.Command diff --git a/test_runner/src/main/kotlin/ftl/cli/MainCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/MainCommand.kt similarity index 69% rename from test_runner/src/main/kotlin/ftl/cli/MainCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/MainCommand.kt index 77204883a9..120b77d1f6 100644 --- a/test_runner/src/main/kotlin/ftl/cli/MainCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/MainCommand.kt @@ -1,13 +1,13 @@ -package ftl.cli +package ftl.presentation.cli -import ftl.cli.firebase.CancelCommand -import ftl.cli.firebase.RefreshCommand -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.presentation.cli.firebase.CancelCommand +import ftl.presentation.cli.firebase.RefreshCommand +import ftl.presentation.cli.firebase.test.AndroidCommand +import ftl.presentation.cli.firebase.test.IPBlocksCommand +import ftl.presentation.cli.firebase.test.IosCommand +import ftl.presentation.cli.firebase.test.NetworkProfilesCommand +import ftl.presentation.cli.firebase.test.ProvidedSoftwareCommand import ftl.util.printVersionInfo import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/README.md b/test_runner/src/main/kotlin/ftl/presentation/cli/README.md similarity index 100% rename from test_runner/src/main/kotlin/ftl/cli/README.md rename to test_runner/src/main/kotlin/ftl/presentation/cli/README.md diff --git a/test_runner/src/main/kotlin/ftl/cli/auth/LoginCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/auth/LoginCommand.kt similarity index 96% rename from test_runner/src/main/kotlin/ftl/cli/auth/LoginCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/auth/LoginCommand.kt index 3b6e90176f..51fb7f1443 100644 --- a/test_runner/src/main/kotlin/ftl/cli/auth/LoginCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/auth/LoginCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.auth +package ftl.presentation.cli.auth import ftl.domain.LoginGoogleAccount import ftl.domain.invoke diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/CancelCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/CancelCommand.kt similarity index 96% rename from test_runner/src/main/kotlin/ftl/cli/firebase/CancelCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/CancelCommand.kt index 2bdbd98b69..309bedc2be 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/CancelCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/CancelCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase +package ftl.presentation.cli.firebase import ftl.domain.CancelLastRun import ftl.domain.invoke diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/RefreshCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/RefreshCommand.kt similarity index 96% rename from test_runner/src/main/kotlin/ftl/cli/firebase/RefreshCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/RefreshCommand.kt index 1d1127d4c4..43c5d97266 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/RefreshCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/RefreshCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase +package ftl.presentation.cli.firebase import ftl.domain.RefreshLastRun import ftl.domain.invoke diff --git a/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/TestCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/TestCommand.kt new file mode 100644 index 0000000000..2fbfff75c3 --- /dev/null +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/TestCommand.kt @@ -0,0 +1,22 @@ +package ftl.presentation.cli.firebase + +import ftl.presentation.cli.firebase.test.IPBlocksCommand +import ftl.presentation.cli.firebase.test.IosCommand +import ftl.presentation.cli.firebase.test.NetworkProfilesCommand +import ftl.presentation.cli.firebase.test.ProvidedSoftwareCommand +import ftl.util.PrintHelp +import picocli.CommandLine.Command + +@Command( + name = "test", + synopsisHeading = "", + subcommands = [ + ftl.presentation.cli.firebase.test.AndroidCommand::class, + IosCommand::class, + NetworkProfilesCommand::class, + ProvidedSoftwareCommand::class, + IPBlocksCommand::class + ], + usageHelpAutoWidth = true +) +class TestCommand : PrintHelp diff --git a/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/AndroidCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/AndroidCommand.kt new file mode 100644 index 0000000000..494009b8c2 --- /dev/null +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/AndroidCommand.kt @@ -0,0 +1,27 @@ +package ftl.presentation.cli.firebase.test + +import ftl.presentation.cli.firebase.test.android.AndroidDoctorCommand +import ftl.presentation.cli.firebase.test.android.AndroidLocalesCommand +import ftl.presentation.cli.firebase.test.android.AndroidModelsCommand +import ftl.presentation.cli.firebase.test.android.AndroidOrientationsCommand +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand +import ftl.presentation.cli.firebase.test.android.AndroidTestEnvironmentCommand +import ftl.presentation.cli.firebase.test.android.AndroidVersionsCommand +import ftl.util.PrintHelp +import picocli.CommandLine.Command + +@Command( + name = "android", + synopsisHeading = "", + subcommands = [ + AndroidRunCommand::class, + AndroidDoctorCommand::class, + AndroidModelsCommand::class, + AndroidVersionsCommand::class, + AndroidOrientationsCommand::class, + AndroidLocalesCommand::class, + AndroidTestEnvironmentCommand::class + ], + usageHelpAutoWidth = true +) +class AndroidCommand : PrintHelp diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/CommandUtil.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommandUtil.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/CommandUtil.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommandUtil.kt index 2b04f42f72..f04aee1a6d 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/CommandUtil.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommandUtil.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test +package ftl.presentation.cli.firebase.test import flank.common.logLn import ftl.args.yml.YamlDeprecated diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/CommonRunCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommonRunCommand.kt similarity index 98% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/CommonRunCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommonRunCommand.kt index 18f9c784d3..52f82be622 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/CommonRunCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/CommonRunCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test +package ftl.presentation.cli.firebase.test import ftl.config.Config import ftl.config.android.AndroidGcloudConfig diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IPBlocksCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IPBlocksCommand.kt similarity index 73% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/IPBlocksCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IPBlocksCommand.kt index e2334fa2ec..a48392a8b3 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/IPBlocksCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IPBlocksCommand.kt @@ -1,6 +1,6 @@ -package ftl.cli.firebase.test +package ftl.presentation.cli.firebase.test -import ftl.cli.firebase.test.ipblocks.IPBlocksListCommand +import ftl.presentation.cli.firebase.test.ipblocks.IPBlocksListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IosCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IosCommand.kt new file mode 100644 index 0000000000..3e8a00059e --- /dev/null +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/IosCommand.kt @@ -0,0 +1,27 @@ +package ftl.presentation.cli.firebase.test + +import ftl.presentation.cli.firebase.test.ios.IosDoctorCommand +import ftl.presentation.cli.firebase.test.ios.IosLocalesCommand +import ftl.presentation.cli.firebase.test.ios.IosModelsCommand +import ftl.presentation.cli.firebase.test.ios.IosOrientationsCommand +import ftl.presentation.cli.firebase.test.ios.IosRunCommand +import ftl.presentation.cli.firebase.test.ios.IosTestEnvironmentCommand +import ftl.presentation.cli.firebase.test.ios.IosVersionsCommand +import ftl.util.PrintHelp +import picocli.CommandLine.Command + +@Command( + name = "ios", + synopsisHeading = "", + subcommands = [ + IosRunCommand::class, + IosDoctorCommand::class, + IosModelsCommand::class, + IosVersionsCommand::class, + IosLocalesCommand::class, + IosTestEnvironmentCommand::class, + IosOrientationsCommand::class + ], + usageHelpAutoWidth = true +) +class IosCommand : PrintHelp diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/NetworkProfilesCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/NetworkProfilesCommand.kt similarity index 64% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/NetworkProfilesCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/NetworkProfilesCommand.kt index 745a807fc6..1958fbbe68 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/NetworkProfilesCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/NetworkProfilesCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test +package ftl.presentation.cli.firebase.test -import ftl.cli.firebase.test.networkprofiles.NetworkProfilesDescribeCommand -import ftl.cli.firebase.test.networkprofiles.NetworkProfilesListCommand +import ftl.presentation.cli.firebase.test.networkprofiles.NetworkProfilesDescribeCommand +import ftl.presentation.cli.firebase.test.networkprofiles.NetworkProfilesListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ProvidedSoftwareCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ProvidedSoftwareCommand.kt similarity index 68% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ProvidedSoftwareCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ProvidedSoftwareCommand.kt index dc1946c29f..bb59c28f27 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ProvidedSoftwareCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ProvidedSoftwareCommand.kt @@ -1,6 +1,6 @@ -package ftl.cli.firebase.test +package ftl.presentation.cli.firebase.test -import ftl.cli.firebase.test.providedsoftware.ProvidedSoftwareListCommand +import ftl.presentation.cli.firebase.test.providedsoftware.ProvidedSoftwareListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidDoctorCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidDoctorCommand.kt index 9a9edd18aa..d8cec0692a 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidDoctorCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android import ftl.config.FtlConstants import ftl.domain.RunDoctorAndroid diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidLocalesCommand.kt similarity index 75% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidLocalesCommand.kt index d1638462e6..f40bf45f87 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidLocalesCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidLocalesCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android -import ftl.cli.firebase.test.android.locales.AndroidLocalesDescribeCommand -import ftl.cli.firebase.test.android.locales.AndroidLocalesListCommand +import ftl.presentation.cli.firebase.test.android.locales.AndroidLocalesDescribeCommand +import ftl.presentation.cli.firebase.test.android.locales.AndroidLocalesListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidModelsCommand.kt similarity index 75% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidModelsCommand.kt index 821cac2e0a..ed57414148 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidModelsCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidModelsCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android -import ftl.cli.firebase.test.android.models.AndroidModelDescribeCommand -import ftl.cli.firebase.test.android.models.AndroidModelsListCommand +import ftl.presentation.cli.firebase.test.android.models.AndroidModelDescribeCommand +import ftl.presentation.cli.firebase.test.android.models.AndroidModelsListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidOrientationsCommand.kt similarity index 80% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidOrientationsCommand.kt index 8d31577b36..94818daeaf 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidOrientationsCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidOrientationsCommand.kt @@ -1,6 +1,6 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android -import ftl.cli.firebase.test.android.orientations.AndroidOrientationsListCommand +import ftl.presentation.cli.firebase.test.android.orientations.AndroidOrientationsListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidRunCommand.kt similarity index 93% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidRunCommand.kt index 0c6a7a1e31..e08a37b841 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidRunCommand.kt @@ -1,12 +1,12 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android -import ftl.cli.firebase.test.CommonRunCommand import ftl.config.FtlConstants import ftl.config.android.AndroidFlankConfig import ftl.config.android.AndroidGcloudConfig import ftl.config.createConfiguration import ftl.domain.RunTestAndroid import ftl.domain.invoke +import ftl.presentation.cli.firebase.test.CommonRunCommand import ftl.run.ANDROID_SHARD_FILE import picocli.CommandLine import picocli.CommandLine.Command diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt similarity index 96% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt index cf0aa276e7..dc222e9f3e 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android import ftl.config.FtlConstants import ftl.domain.DescribeAndroidTestEnvironment diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidVersionsCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidVersionsCommand.kt similarity index 75% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidVersionsCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidVersionsCommand.kt index 52e9a4c40b..849dbb2fa9 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidVersionsCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/AndroidVersionsCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test.android +package ftl.presentation.cli.firebase.test.android -import ftl.cli.firebase.test.android.versions.AndroidVersionsDescribeCommand -import ftl.cli.firebase.test.android.versions.AndroidVersionsListCommand +import ftl.presentation.cli.firebase.test.android.versions.AndroidVersionsDescribeCommand +import ftl.presentation.cli.firebase.test.android.versions.AndroidVersionsListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt index 1355be2b69..8eed5d2be3 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.locales +package ftl.presentation.cli.firebase.test.android.locales import ftl.config.FtlConstants import ftl.domain.DescribeAndroidLocales diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt index 6076694ba5..9269f04e31 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/locales/AndroidLocalesListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.locales +package ftl.presentation.cli.firebase.test.android.locales import ftl.config.FtlConstants import ftl.domain.ListAndroidLocales diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt index 96b908745e..23f05cc99e 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/models/AndroidModelDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.models +package ftl.presentation.cli.firebase.test.android.models import ftl.config.FtlConstants import ftl.domain.DescribeAndroidModels diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/models/AndroidModelsListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/models/AndroidModelsListCommand.kt index 2e2446a074..c51fa343ee 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/models/AndroidModelsListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/models/AndroidModelsListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.models +package ftl.presentation.cli.firebase.test.android.models import ftl.config.FtlConstants import ftl.domain.ListAndroidModels diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt index 81b4d2e49a..4183ad0546 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/orientations/AndroidOrientationsListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.orientations +package ftl.presentation.cli.firebase.test.android.orientations import ftl.config.FtlConstants import ftl.domain.ListAndroidOrientations diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt index ed95dbbbee..39c2a19781 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.versions +package ftl.presentation.cli.firebase.test.android.versions import ftl.config.FtlConstants import ftl.domain.DescribeAndroidVersions diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt index 0dfdb36d9f..a2a5f77a5e 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/android/versions/AndroidVersionsListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.android.versions +package ftl.presentation.cli.firebase.test.android.versions import ftl.config.FtlConstants import ftl.domain.ListAndroidVersions diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosDoctorCommand.kt similarity index 96% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosDoctorCommand.kt index c6e7d265c1..eb84fb1c4a 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosDoctorCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios import ftl.config.FtlConstants import ftl.domain.RunDoctorIos diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosLocalesCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosLocalesCommand.kt similarity index 76% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosLocalesCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosLocalesCommand.kt index 4c9e89a6f7..738007a718 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosLocalesCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosLocalesCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios -import ftl.cli.firebase.test.ios.configuration.IosLocalesDescribeCommand -import ftl.cli.firebase.test.ios.configuration.IosLocalesListCommand +import ftl.presentation.cli.firebase.test.ios.configuration.IosLocalesDescribeCommand +import ftl.presentation.cli.firebase.test.ios.configuration.IosLocalesListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosModelsCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosModelsCommand.kt similarity index 76% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosModelsCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosModelsCommand.kt index 7bba6d6d79..44af7600f8 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosModelsCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosModelsCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios -import ftl.cli.firebase.test.ios.models.IosModelDescribeCommand -import ftl.cli.firebase.test.ios.models.IosModelsListCommand +import ftl.presentation.cli.firebase.test.ios.models.IosModelDescribeCommand +import ftl.presentation.cli.firebase.test.ios.models.IosModelsListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosOrientationsCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosOrientationsCommand.kt similarity index 82% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosOrientationsCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosOrientationsCommand.kt index 8b64d2e228..2afdc4f316 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosOrientationsCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosOrientationsCommand.kt @@ -1,6 +1,6 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios -import ftl.cli.firebase.test.ios.orientations.IosOrientationsListCommand +import ftl.presentation.cli.firebase.test.ios.orientations.IosOrientationsListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosRunCommand.kt similarity index 93% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosRunCommand.kt index 8ef65171cf..bab7f86199 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosRunCommand.kt @@ -1,12 +1,12 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios -import ftl.cli.firebase.test.CommonRunCommand import ftl.config.FtlConstants import ftl.config.createConfiguration import ftl.config.ios.IosFlankConfig import ftl.config.ios.IosGcloudConfig import ftl.domain.RunIosTest import ftl.domain.invoke +import ftl.presentation.cli.firebase.test.CommonRunCommand import ftl.run.IOS_SHARD_FILE import picocli.CommandLine import picocli.CommandLine.Command diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosTestEnvironmentCommand.kt similarity index 96% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosTestEnvironmentCommand.kt index 5624cb814c..051819bdca 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosTestEnvironmentCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios import ftl.config.FtlConstants import ftl.domain.DescribeIosTestEnvironment diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosVersionsCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosVersionsCommand.kt similarity index 76% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosVersionsCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosVersionsCommand.kt index 614a425bb0..c758549b82 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosVersionsCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/IosVersionsCommand.kt @@ -1,7 +1,7 @@ -package ftl.cli.firebase.test.ios +package ftl.presentation.cli.firebase.test.ios -import ftl.cli.firebase.test.ios.versions.IosVersionsDescribeCommand -import ftl.cli.firebase.test.ios.versions.IosVersionsListCommand +import ftl.presentation.cli.firebase.test.ios.versions.IosVersionsDescribeCommand +import ftl.presentation.cli.firebase.test.ios.versions.IosVersionsListCommand import ftl.util.PrintHelp import picocli.CommandLine diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt index c4343726f8..4d78c1a080 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.configuration +package ftl.presentation.cli.firebase.test.ios.configuration import ftl.config.FtlConstants import ftl.domain.DescribeIosLocales diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt index 55e5a4ba4a..02ddc9e142 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/configuration/IosLocalesListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.configuration +package ftl.presentation.cli.firebase.test.ios.configuration import ftl.config.FtlConstants import ftl.domain.ListIosLocales diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelDescribeCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelDescribeCommand.kt index 6ee0ae887b..8131e9de75 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.models +package ftl.presentation.cli.firebase.test.ios.models import ftl.config.FtlConstants import ftl.domain.DescribeIosModels diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelsListCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelsListCommand.kt index af4a286202..75d1c8816d 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/models/IosModelsListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.models +package ftl.presentation.cli.firebase.test.ios.models import ftl.config.FtlConstants import ftl.domain.ListIosModels diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt index 335b18a89e..f4cb3f7fbe 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/orientations/IosOrientationsListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.orientations +package ftl.presentation.cli.firebase.test.ios.orientations import ftl.config.FtlConstants import ftl.domain.ListIosOrientations diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt similarity index 95% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt index b9503c768e..afd050ecb1 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/versions/IosVersionsDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.versions +package ftl.presentation.cli.firebase.test.ios.versions import ftl.config.FtlConstants import ftl.domain.DescribeIosVersions diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/versions/IosVersionsListCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/versions/IosVersionsListCommand.kt index 9a421b099e..24cb50567f 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ios/versions/IosVersionsListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ios.versions +package ftl.presentation.cli.firebase.test.ios.versions import ftl.config.FtlConstants import ftl.domain.ListIosVersions diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ipblocks/IPBlocksListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ipblocks/IPBlocksListCommand.kt similarity index 92% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/ipblocks/IPBlocksListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ipblocks/IPBlocksListCommand.kt index af4d570769..cb2a10d457 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/ipblocks/IPBlocksListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/ipblocks/IPBlocksListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.ipblocks +package ftl.presentation.cli.firebase.test.ipblocks import ftl.domain.ListIPBlocks import ftl.domain.invoke diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt similarity index 94% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt index 837454424d..76d0380606 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesDescribeCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.networkprofiles +package ftl.presentation.cli.firebase.test.networkprofiles import ftl.domain.DescribeNetworkProfiles import ftl.domain.invoke diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt similarity index 91% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt index 1f9520fc44..9321716d19 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/networkprofiles/NetworkProfilesListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.networkprofiles +package ftl.presentation.cli.firebase.test.networkprofiles import ftl.domain.ListNetworkProfiles import ftl.domain.invoke diff --git a/test_runner/src/main/kotlin/ftl/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt similarity index 91% rename from test_runner/src/main/kotlin/ftl/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt rename to test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt index 3a3aaffac1..fd607ccafe 100644 --- a/test_runner/src/main/kotlin/ftl/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt +++ b/test_runner/src/main/kotlin/ftl/presentation/cli/firebase/test/providedsoftware/ProvidedSoftwareListCommand.kt @@ -1,4 +1,4 @@ -package ftl.cli.firebase.test.providedsoftware +package ftl.presentation.cli.firebase.test.providedsoftware import ftl.domain.ListProvidedSoftware import ftl.domain.invoke diff --git a/test_runner/src/test/kotlin/Debug.kt b/test_runner/src/test/kotlin/Debug.kt index 00cd2d5526..c026a1edd2 100644 --- a/test_runner/src/test/kotlin/Debug.kt +++ b/test_runner/src/test/kotlin/Debug.kt @@ -1,6 +1,6 @@ @file:Suppress("InvalidPackageDeclaration") -import ftl.cli.MainCommand +import ftl.presentation.cli.MainCommand import ftl.run.exception.withGlobalExceptionHandling import ftl.util.disableCrashReporting import picocli.CommandLine @@ -18,7 +18,7 @@ fun main() { ?: "YOUR PROJECT ID" withGlobalExceptionHandling { - CommandLine(MainCommand()).execute( + CommandLine(ftl.presentation.cli.MainCommand()).execute( // "--debug", "firebase", "test", diff --git a/test_runner/src/test/kotlin/ftl/MainTest.kt b/test_runner/src/test/kotlin/ftl/MainTest.kt index cea5ee0641..a084d999e1 100644 --- a/test_runner/src/test/kotlin/ftl/MainTest.kt +++ b/test_runner/src/test/kotlin/ftl/MainTest.kt @@ -2,7 +2,7 @@ package ftl import com.google.common.truth.Truth.assertThat import flank.common.normalizeLineEnding -import ftl.cli.MainCommand +import ftl.presentation.cli.MainCommand import ftl.test.util.FlankTestRunner import org.junit.Rule import org.junit.Test @@ -40,7 +40,7 @@ class MainTest { private fun runCommand(vararg args: String): String { systemErrRule.clearLog() systemOutRule.clearLog() - CommandLine(MainCommand()).execute(*args) + CommandLine(ftl.presentation.cli.MainCommand()).execute(*args) return systemOutRule.log.normalizeLineEnding() + systemErrRule.log.normalizeLineEnding() } diff --git a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt index d218a102e6..8144d9405a 100644 --- a/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt @@ -6,13 +6,13 @@ import ftl.args.IArgs.Companion.AVAILABLE_PHYSICAL_SHARD_COUNT_RANGE import ftl.args.IArgs.Companion.AVAILABLE_VIRTUAL_SHARD_COUNT_RANGE import ftl.args.yml.AppTestPair import ftl.args.yml.Type -import ftl.cli.firebase.test.android.AndroidRunCommand import ftl.config.Device import ftl.config.FtlConstants.defaultAndroidModel import ftl.config.FtlConstants.defaultAndroidVersion import ftl.gc.GcStorage import ftl.gc.GcStorage.exist import ftl.gc.android.setupAndroidTest +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand import ftl.run.exception.FlankConfigurationError import ftl.run.exception.FlankGeneralError import ftl.run.exception.IncompatibleTestDimensionError diff --git a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt index c6071a7739..47ebe5f04f 100644 --- a/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt @@ -2,13 +2,13 @@ package ftl.args import com.google.common.truth.Truth.assertThat import flank.common.isWindows -import ftl.cli.firebase.test.ios.IosRunCommand import ftl.config.Device import ftl.config.FtlConstants.defaultIosModel import ftl.config.FtlConstants.defaultIosVersion import ftl.config.defaultIosConfig import ftl.gc.GcStorage import ftl.ios.xctest.flattenShardChunks +import ftl.presentation.cli.firebase.test.ios.IosRunCommand import ftl.run.exception.FlankConfigurationError import ftl.run.status.OutputStyle import ftl.test.util.FlankTestRunner diff --git a/test_runner/src/test/kotlin/ftl/cli/AuthCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/AuthCommandTest.kt index bfe816808c..de03eea44f 100644 --- a/test_runner/src/test/kotlin/ftl/cli/AuthCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/AuthCommandTest.kt @@ -16,7 +16,7 @@ class AuthCommandTest { @Test fun firebaseCommandPrintsHelp() { - AuthCommand().run() + ftl.presentation.cli.AuthCommand().run() val output = systemOutRule.log.normalizeLineEnding() assertThat(output).startsWith( "Manage oauth2 credentials for Google Cloud\n\n" + diff --git a/test_runner/src/test/kotlin/ftl/cli/FirebaseCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/FirebaseCommandTest.kt index 10dfa9b40c..720cc1519c 100644 --- a/test_runner/src/test/kotlin/ftl/cli/FirebaseCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/FirebaseCommandTest.kt @@ -16,7 +16,7 @@ class FirebaseCommandTest { @Test fun firebaseCommandPrintsHelp() { - FirebaseCommand().run() + ftl.presentation.cli.FirebaseCommand().run() val output = systemOutRule.log.normalizeLineEnding() assertThat(output).startsWith( "firebase [COMMAND]\n" + diff --git a/test_runner/src/test/kotlin/ftl/cli/auth/LoginCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/auth/LoginCommandTest.kt index 9fe77d3bd1..19fc591672 100644 --- a/test_runner/src/test/kotlin/ftl/cli/auth/LoginCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/auth/LoginCommandTest.kt @@ -21,7 +21,7 @@ class LoginCommandTest { @Test fun cancelCommandPrintsHelp() { - val command = LoginCommand() + val command = ftl.presentation.cli.auth.LoginCommand() assertThat(command.usageHelpRequested).isFalse() CommandLine(command).execute("-h") @@ -39,12 +39,12 @@ login [-h] @Test fun commandRuns() { - LoginCommand().run() + ftl.presentation.cli.auth.LoginCommand().run() } @Test fun cancelCommandOptions() { - val cmd = LoginCommand() + val cmd = ftl.presentation.cli.auth.LoginCommand() assertThat(cmd.usageHelpRequested).isFalse() cmd.usageHelpRequested = true assertThat(cmd.usageHelpRequested).isTrue() diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/CancelCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/CancelCommandTest.kt index 3e6675b5ba..2cdedd499e 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/CancelCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/CancelCommandTest.kt @@ -2,7 +2,7 @@ package ftl.cli.firebase import com.google.common.truth.Truth.assertThat import flank.common.normalizeLineEnding -import ftl.cli.firebase.test.android.AndroidRunCommand +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand import ftl.test.util.FlankTestRunner import org.junit.Rule import org.junit.Test @@ -18,7 +18,7 @@ class CancelCommandTest { @Test fun cancelCommandPrintsHelp() { - val command = CancelCommand() + val command = ftl.presentation.cli.firebase.CancelCommand() assertThat(command.usageHelpRequested).isFalse() CommandLine(command).execute("-h") @@ -46,14 +46,14 @@ class CancelCommandTest { val runCmd = AndroidRunCommand() runCmd.configPath = "./src/test/kotlin/ftl/fixtures/simple-android-flank.yml" runCmd.run() - CancelCommand().run() + ftl.presentation.cli.firebase.CancelCommand().run() val output = systemOutRule.log assertThat(output).contains("No matrices to cancel") } @Test fun cancelCommandOptions() { - val cmd = CancelCommand() + val cmd = ftl.presentation.cli.firebase.CancelCommand() assertThat(cmd.usageHelpRequested).isFalse() cmd.usageHelpRequested = true assertThat(cmd.usageHelpRequested).isTrue() diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/RefreshCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/RefreshCommandTest.kt index 5b66116b57..2748bd0985 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/RefreshCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/RefreshCommandTest.kt @@ -64,7 +64,7 @@ class RefreshCommandTest { @Test fun refreshCommandPrintsHelp() { - val refresh = RefreshCommand() + val refresh = ftl.presentation.cli.firebase.RefreshCommand() assertThat(refresh.usageHelpRequested).isFalse() CommandLine(refresh).execute("-h") @@ -91,7 +91,7 @@ class RefreshCommandTest { fun refreshCommandRuns() { // TODO: ':' is an illegal character on windows setupResultsDir() - val cmd = RefreshCommand() + val cmd = ftl.presentation.cli.firebase.RefreshCommand() cmd.usageHelpRequested cmd.run() val output = systemOutRule.log @@ -100,7 +100,7 @@ class RefreshCommandTest { @Test fun refreshCommandOptions() { - val cmd = RefreshCommand() + val cmd = ftl.presentation.cli.firebase.RefreshCommand() assertThat(cmd.usageHelpRequested).isFalse() cmd.usageHelpRequested = true assertThat(cmd.usageHelpRequested).isTrue() diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/TestCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/TestCommandTest.kt index 664cd06ab1..4750a50f80 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/TestCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/TestCommandTest.kt @@ -16,7 +16,7 @@ class TestCommandTest { @Test fun testCommandPrintsHelp() { - TestCommand().run() + ftl.presentation.cli.firebase.TestCommand().run() val output = systemOutRule.log.normalizeLineEnding() assertThat(output).startsWith( "test [COMMAND]\n" + 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 index f33faddf81..76e8697bc5 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/IPBlocksCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/IPBlocksCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test import ftl.doctor.assertEqualsIgnoreNewlineStyle +import ftl.presentation.cli.firebase.test.IPBlocksCommand import org.junit.Rule import org.junit.Test import org.junit.contrib.java.lang.system.SystemOutRule 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 index 59bb93c65d..14fd20cd52 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/NetworkProfilesCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/NetworkProfilesCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test import flank.common.normalizeLineEnding +import ftl.presentation.cli.firebase.test.NetworkProfilesCommand import org.junit.Assert.assertEquals import org.junit.Rule import org.junit.Test diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommandTest.kt index c0d7990776..cf9cd10235 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommandTest.kt @@ -5,6 +5,7 @@ import flank.common.normalizeLineEnding import ftl.cli.firebase.test.INVALID_YML_PATH import ftl.cli.firebase.test.SUCCESS_VALIDATION_MESSAGE import ftl.config.FtlConstants +import ftl.presentation.cli.firebase.test.android.AndroidDoctorCommand import ftl.run.exception.YmlValidationError import ftl.test.util.FlankTestRunner import org.junit.Rule diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt index b1c025be92..700a9bb7d3 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidRunCommandTest.kt @@ -7,6 +7,7 @@ import ftl.args.yml.AppTestPair import ftl.config.Device import ftl.config.FtlConstants import ftl.gc.GcStorage +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand import ftl.run.ANDROID_SHARD_FILE import ftl.run.exception.FlankConfigurationError import ftl.run.platform.android.createAndroidTestContexts diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommandTest.kt index f8a6a5a4b8..206c3d982a 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.android import com.google.common.truth.Truth.assertThat +import ftl.presentation.cli.firebase.test.android.AndroidTestEnvironmentCommand import org.junit.Test import picocli.CommandLine diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt index cc40141ddc..f8ddf28360 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesDescribeCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.android.locales import ftl.android.AndroidCatalog +import ftl.presentation.cli.firebase.test.android.locales.AndroidLocalesDescribeCommand import ftl.run.exception.FlankConfigurationError import ftl.test.util.TestHelper.getThrowable import io.mockk.mockkObject diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt index ff43199353..898a214a5e 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/locales/AndroidLocalesListCommandTest.kt @@ -2,6 +2,7 @@ package ftl.cli.firebase.test.android.locales import com.google.common.truth.Truth.assertThat import ftl.android.AndroidCatalog +import ftl.presentation.cli.firebase.test.android.locales.AndroidLocalesListCommand import io.mockk.mockkObject import io.mockk.verify import org.junit.Test 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 82adef78dd..b16fcd9eb6 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 @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.android.models import com.google.common.truth.Truth.assertThat +import ftl.presentation.cli.firebase.test.android.models.AndroidModelsListCommand import org.junit.Test import picocli.CommandLine diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationCommandListTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationCommandListTest.kt index 335e0e9f93..b5becb1f41 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationCommandListTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/orientations/AndroidOrientationCommandListTest.kt @@ -1,7 +1,8 @@ package ftl.cli.firebase.test.android.orientations import ftl.android.AndroidCatalog -import ftl.cli.firebase.test.android.versions.AndroidVersionsListCommand +import ftl.presentation.cli.firebase.test.android.orientations.AndroidOrientationsListCommand +import ftl.presentation.cli.firebase.test.android.versions.AndroidVersionsListCommand import io.mockk.mockkObject import io.mockk.verify import org.junit.Assert.assertEquals diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommandTest.kt index ef5e0b4d92..513d68db61 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsDescribeCommandTest.kt @@ -1,7 +1,8 @@ package ftl.cli.firebase.test.android.versions import ftl.android.AndroidCatalog -import ftl.cli.firebase.test.ios.versions.IosVersionsDescribeCommand +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 diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommandTest.kt index 04cb02736f..8d7e1bd59e 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/android/versions/AndroidVersionsListCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.android.versions import com.google.common.truth.Truth.assertThat +import ftl.presentation.cli.firebase.test.android.versions.AndroidVersionsListCommand import org.junit.Test import picocli.CommandLine diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommandTest.kt index b7d5d1154a..6c5d570293 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommandTest.kt @@ -5,6 +5,7 @@ import flank.common.normalizeLineEnding import ftl.cli.firebase.test.INVALID_YML_PATH import ftl.cli.firebase.test.SUCCESS_VALIDATION_MESSAGE import ftl.config.FtlConstants +import ftl.presentation.cli.firebase.test.ios.IosDoctorCommand import ftl.run.exception.YmlValidationError import ftl.test.util.FlankTestRunner import org.junit.Rule diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt index b8981b8a67..1048c14ea7 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosRunCommandTest.kt @@ -7,6 +7,7 @@ import ftl.args.IosArgs import ftl.config.Device import ftl.config.FtlConstants import ftl.gc.GcStorage +import ftl.presentation.cli.firebase.test.ios.IosRunCommand import ftl.run.IOS_SHARD_FILE import ftl.run.dumpShards import ftl.test.util.FlankTestRunner diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommandTest.kt index 49973ae924..117fc67c9f 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.ios import com.google.common.truth.Truth +import ftl.presentation.cli.firebase.test.ios.IosTestEnvironmentCommand import org.junit.Test import picocli.CommandLine diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommandTest.kt index 2fd706c1a0..45af5284e2 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesDescribeCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.ios.configuration import ftl.ios.IosCatalog +import ftl.presentation.cli.firebase.test.ios.configuration.IosLocalesDescribeCommand import ftl.run.exception.FlankConfigurationError import ftl.test.util.TestHelper import ftl.test.util.TestHelper.getThrowable diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommandTest.kt index c73544dbdc..f6b0a7b21e 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/configuration/IosLocalesListCommandTest.kt @@ -2,6 +2,7 @@ package ftl.cli.firebase.test.ios.configuration import com.google.common.truth.Truth import ftl.ios.IosCatalog +import ftl.presentation.cli.firebase.test.ios.configuration.IosLocalesListCommand import io.mockk.mockkObject import io.mockk.verify import org.junit.Test diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommandTest.kt index 96060a0336..14092e2c39 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/models/IosModelsListCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.ios.models import com.google.common.truth.Truth.assertThat +import ftl.presentation.cli.firebase.test.ios.models.IosModelsListCommand import org.junit.Test import picocli.CommandLine diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationCommandListTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationCommandListTest.kt index 3be6aaec9b..fa7b62da6f 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationCommandListTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/orientations/IosOrientationCommandListTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.ios.orientations import ftl.ios.IosCatalog +import ftl.presentation.cli.firebase.test.ios.orientations.IosOrientationsListCommand import io.mockk.mockkObject import io.mockk.verify import org.junit.Assert.assertEquals diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommandTest.kt index 32a5df4f72..abd74f8e77 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsDescribeCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.ios.versions import ftl.ios.IosCatalog +import ftl.presentation.cli.firebase.test.ios.versions.IosVersionsDescribeCommand import ftl.run.exception.FlankConfigurationError import ftl.test.util.TestHelper.getThrowable import io.mockk.mockkObject diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommandTest.kt index aa0db5ca1c..6244419281 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/ios/versions/IosVersionsListCommandTest.kt @@ -1,6 +1,7 @@ package ftl.cli.firebase.test.ios.versions import com.google.common.truth.Truth.assertThat +import ftl.presentation.cli.firebase.test.ios.versions.IosVersionsListCommand import org.junit.Test import picocli.CommandLine diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfileDescribeTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfileDescribeTest.kt index 4a8b3892c2..3d1658e178 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfileDescribeTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfileDescribeTest.kt @@ -3,6 +3,7 @@ package ftl.cli.firebase.test.networkprofiles import com.google.testing.model.NetworkConfiguration import com.google.testing.model.TrafficRule import ftl.environment.getNetworkConfiguration +import ftl.presentation.cli.firebase.test.networkprofiles.NetworkProfilesDescribeCommand import ftl.run.exception.FlankConfigurationError import ftl.test.util.assertThrowsWithMessage import ftl.test.util.runMainCommand diff --git a/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommandTest.kt b/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommandTest.kt index 2d62c77049..377aa1a7cf 100644 --- a/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommandTest.kt +++ b/test_runner/src/test/kotlin/ftl/cli/firebase/test/networkprofiles/NetworkProfilesListCommandTest.kt @@ -2,6 +2,7 @@ package ftl.cli.firebase.test.networkprofiles import ftl.environment.networkConfigurationAsTable import ftl.gc.GcTesting +import ftl.presentation.cli.firebase.test.networkprofiles.NetworkProfilesListCommand import io.mockk.every import io.mockk.mockkObject import io.mockk.mockkStatic diff --git a/test_runner/src/test/kotlin/ftl/ios/xctest/XcTestDataTest.kt b/test_runner/src/test/kotlin/ftl/ios/xctest/XcTestDataTest.kt index 6bffec1c76..450c895262 100644 --- a/test_runner/src/test/kotlin/ftl/ios/xctest/XcTestDataTest.kt +++ b/test_runner/src/test/kotlin/ftl/ios/xctest/XcTestDataTest.kt @@ -3,7 +3,7 @@ package ftl.ios.xctest import flank.common.isWindows import ftl.args.IosArgs import ftl.args.validate -import ftl.cli.firebase.test.ios.IosRunCommand +import ftl.presentation.cli.firebase.test.ios.IosRunCommand import org.junit.Assume import org.junit.Test import java.io.StringReader diff --git a/test_runner/src/test/kotlin/ftl/run/DumpShardsKtTest.kt b/test_runner/src/test/kotlin/ftl/run/DumpShardsKtTest.kt index ac35168a77..9a91625bd4 100644 --- a/test_runner/src/test/kotlin/ftl/run/DumpShardsKtTest.kt +++ b/test_runner/src/test/kotlin/ftl/run/DumpShardsKtTest.kt @@ -4,9 +4,9 @@ import com.google.common.truth.Truth.assertThat import flank.common.isWindows import ftl.args.AndroidArgs import ftl.args.IosArgs -import ftl.cli.firebase.test.android.AndroidRunCommand -import ftl.cli.firebase.test.ios.IosRunCommand import ftl.doctor.assertEqualsIgnoreNewlineStyle +import ftl.presentation.cli.firebase.test.android.AndroidRunCommand +import ftl.presentation.cli.firebase.test.ios.IosRunCommand import ftl.test.util.FlankTestRunner import ftl.test.util.ios2ConfigYaml import ftl.test.util.mixedConfigYaml diff --git a/test_runner/src/test/kotlin/ftl/test/util/TestHelper.kt b/test_runner/src/test/kotlin/ftl/test/util/TestHelper.kt index d2a84b9f1c..cbdd9ad658 100644 --- a/test_runner/src/test/kotlin/ftl/test/util/TestHelper.kt +++ b/test_runner/src/test/kotlin/ftl/test/util/TestHelper.kt @@ -2,7 +2,7 @@ package ftl.test.util -import ftl.cli.MainCommand +import ftl.presentation.cli.MainCommand import io.mockk.every import io.mockk.mockk import io.mockk.slot @@ -66,4 +66,4 @@ internal fun assertThrowsWithMessage(clazz: KClass, message: assertThrows(clazz.java) { block() }.also { assertTrue(it.message?.contains(message) ?: false) } } -internal fun runMainCommand(vararg args: String) = CommandLine(MainCommand()).execute(*args) +internal fun runMainCommand(vararg args: String) = CommandLine(ftl.presentation.cli.MainCommand()).execute(*args)