Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add ip-blocks command to test-environment command #1012

Merged
merged 1 commit into from
Aug 18, 2020
Merged

feat: Add ip-blocks command to test-environment command #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidTestEnvironmentCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import ftl.android.AndroidCatalog.localesAsTable
import ftl.android.AndroidCatalog.supportedVersionsAsTable
import ftl.args.AndroidArgs
import ftl.config.FtlConstants
import ftl.environment.ipBlocksListAsTable
import ftl.environment.providedSoftwareAsTable
import ftl.environment.networkConfigurationAsTable
import picocli.CommandLine
Expand All @@ -18,8 +19,10 @@ import java.nio.file.Paths
descriptionHeading = "%n@|bold,underline Description:|@%n%n",
parameterListHeading = "%n@|bold,underline Parameters:|@%n",
optionListHeading = "%n@|bold,underline Options:|@%n",
header = ["Print available devices, OS versions, locales, provided software list and network configuration to test against"],
description = ["Print available Android devices, Android OS versions list, locales, provided software and network configuration to test against"],
header = ["Print available Android devices, Android OS versions list, locales, provided software, network " +
"configuration, orientation and IP blocks to test against"],
description = ["Print available Android devices, Android OS versions list, locales, provided software, network " +
"configuration, orientation and IP blocks to test against"],
usageHelpAutoWidth = true
)
class AndroidTestEnvironmentCommand : Runnable {
Expand All @@ -31,6 +34,7 @@ class AndroidTestEnvironmentCommand : Runnable {
println(providedSoftwareAsTable())
println(networkConfigurationAsTable())
println(supportedOrientationsAsTable(projectId))
println(ipBlocksListAsTable())
}

@CommandLine.Option(names = ["-c", "--config"], description = ["YAML config file path"])
Expand Down
8 changes: 6 additions & 2 deletions test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosTestEnvironmentCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package ftl.cli.firebase.test.ios

import ftl.args.IosArgs
import ftl.config.FtlConstants
import ftl.environment.ipBlocksListAsTable
import ftl.environment.providedSoftwareAsTable
import ftl.environment.networkConfigurationAsTable
import ftl.ios.IosCatalog.devicesCatalogAsTable
Expand All @@ -18,8 +19,10 @@ import java.nio.file.Paths
descriptionHeading = "%n@|bold,underline Description:|@%n%n",
parameterListHeading = "%n@|bold,underline Parameters:|@%n",
optionListHeading = "%n@|bold,underline Options:|@%n",
header = ["Print available devices, OS versions, locales, provided software list and network configuration to test against"],
description = ["Print available iOS devices, iOS OS versions list, locales, provided software and network configuration to test against"],
header = ["Print available iOS devices, OS versions list, locales, provided software, network configuration, " +
"orientation and IP blocks to test against"],
description = ["Print available iOS devices, OS versions list, locales, provided software, network configuration, " +
"orientation and IP blocks to test against"],
usageHelpAutoWidth = true
)
class IosTestEnvironmentCommand : Runnable {
Expand All @@ -31,6 +34,7 @@ class IosTestEnvironmentCommand : Runnable {
println(providedSoftwareAsTable())
println(networkConfigurationAsTable())
println(supportedOrientationsAsTable(projectId))
println(ipBlocksListAsTable())
}

@CommandLine.Option(names = ["-c", "--config"], description = ["YAML config file path"])
Expand Down