From 56e09a1a69de2a33d8bbcd832be9d1b8b08fa113 Mon Sep 17 00:00:00 2001 From: ashmrtn <3891298+ashmrtn@users.noreply.github.com> Date: Mon, 13 Nov 2023 14:34:47 -0800 Subject: [PATCH] Helper functions to test generic backup flags (#4602) Follow up on #4557 [comment](https://github.com/alcionai/corso/pull/4557#pullrequestreview-1701971318) to consolidate test code for ease of use --- #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [x] :robot: Supportability/Tests - [ ] :computer: CI/Deployment - [x] :broom: Tech Debt/Cleanup #### Test Plan - [ ] :muscle: Manual - [x] :zap: Unit test - [ ] :green_heart: E2E --- src/cli/backup/exchange_test.go | 5 ++--- src/cli/backup/groups_test.go | 5 ++--- src/cli/backup/onedrive_test.go | 5 ++--- src/cli/backup/sharepoint_test.go | 5 ++--- src/cli/flags/testdata/repo.go | 16 +++++++++++++++- 5 files changed, 23 insertions(+), 13 deletions(-) diff --git a/src/cli/backup/exchange_test.go b/src/cli/backup/exchange_test.go index 1ed8f718e..194e6a8d2 100644 --- a/src/cli/backup/exchange_test.go +++ b/src/cli/backup/exchange_test.go @@ -106,13 +106,11 @@ func (suite *ExchangeUnitSuite) TestBackupCreateFlags() { "--" + flags.DeltaPageSizeFN, flagsTD.DeltaPageSize, // bool flags - "--" + flags.FailFastFN, - "--" + flags.DisableIncrementalsFN, - "--" + flags.ForceItemDataDownloadFN, "--" + flags.DisableDeltaFN, "--" + flags.EnableImmutableIDFN, "--" + flags.DisableConcurrencyLimiterFN, }, + flagsTD.PreparedGenericBackupFlags(), flagsTD.PreparedProviderFlags(), flagsTD.PreparedStorageFlags())) @@ -128,6 +126,7 @@ func (suite *ExchangeUnitSuite) TestBackupCreateFlags() { assert.True(t, co.ToggleFeatures.DisableDelta) assert.True(t, co.ToggleFeatures.ExchangeImmutableIDs) assert.True(t, co.ToggleFeatures.DisableConcurrencyLimiter) + flagsTD.AssertGenericBackupFlags(t, cmd) flagsTD.AssertProviderFlags(t, cmd) flagsTD.AssertStorageFlags(t, cmd) } diff --git a/src/cli/backup/groups_test.go b/src/cli/backup/groups_test.go index 996a9126f..1bf77ce08 100644 --- a/src/cli/backup/groups_test.go +++ b/src/cli/backup/groups_test.go @@ -143,11 +143,9 @@ func (suite *GroupsUnitSuite) TestBackupCreateFlags() { "--" + flags.GroupFN, flagsTD.FlgInputs(flagsTD.GroupsInput), "--" + flags.CategoryDataFN, flagsTD.FlgInputs(flagsTD.GroupsCategoryDataInput), "--" + flags.FetchParallelismFN, flagsTD.FetchParallelism, - "--" + flags.FailFastFN, - "--" + flags.DisableIncrementalsFN, - "--" + flags.ForceItemDataDownloadFN, "--" + flags.DisableDeltaFN, }, + flagsTD.PreparedGenericBackupFlags(), flagsTD.PreparedProviderFlags(), flagsTD.PreparedStorageFlags())) @@ -160,6 +158,7 @@ func (suite *GroupsUnitSuite) TestBackupCreateFlags() { assert.True(t, co.ToggleFeatures.DisableIncrementals) assert.True(t, co.ToggleFeatures.ForceItemDataDownload) assert.True(t, co.ToggleFeatures.DisableDelta) + flagsTD.AssertGenericBackupFlags(t, cmd) flagsTD.AssertProviderFlags(t, cmd) flagsTD.AssertStorageFlags(t, cmd) } diff --git a/src/cli/backup/onedrive_test.go b/src/cli/backup/onedrive_test.go index 8c1bb583f..cfd12e57d 100644 --- a/src/cli/backup/onedrive_test.go +++ b/src/cli/backup/onedrive_test.go @@ -101,10 +101,8 @@ func (suite *OneDriveUnitSuite) TestBackupCreateFlags() { []string{ "--" + flags.RunModeFN, flags.RunModeFlagTest, "--" + flags.UserFN, flagsTD.FlgInputs(flagsTD.UsersInput), - "--" + flags.FailFastFN, - "--" + flags.DisableIncrementalsFN, - "--" + flags.ForceItemDataDownloadFN, }, + flagsTD.PreparedGenericBackupFlags(), flagsTD.PreparedProviderFlags(), flagsTD.PreparedStorageFlags())) @@ -115,6 +113,7 @@ func (suite *OneDriveUnitSuite) TestBackupCreateFlags() { assert.Equal(t, control.FailFast, co.FailureHandling) assert.True(t, co.ToggleFeatures.DisableIncrementals) assert.True(t, co.ToggleFeatures.ForceItemDataDownload) + flagsTD.AssertGenericBackupFlags(t, cmd) flagsTD.AssertProviderFlags(t, cmd) flagsTD.AssertStorageFlags(t, cmd) } diff --git a/src/cli/backup/sharepoint_test.go b/src/cli/backup/sharepoint_test.go index f018a7ba2..19cf76fb6 100644 --- a/src/cli/backup/sharepoint_test.go +++ b/src/cli/backup/sharepoint_test.go @@ -105,10 +105,8 @@ func (suite *SharePointUnitSuite) TestBackupCreateFlags() { "--" + flags.SiteIDFN, flagsTD.FlgInputs(flagsTD.SiteIDInput), "--" + flags.SiteFN, flagsTD.FlgInputs(flagsTD.WebURLInput), "--" + flags.CategoryDataFN, flagsTD.FlgInputs(flagsTD.SharepointCategoryDataInput), - "--" + flags.FailFastFN, - "--" + flags.DisableIncrementalsFN, - "--" + flags.ForceItemDataDownloadFN, }, + flagsTD.PreparedGenericBackupFlags(), flagsTD.PreparedProviderFlags(), flagsTD.PreparedStorageFlags())) @@ -120,6 +118,7 @@ func (suite *SharePointUnitSuite) TestBackupCreateFlags() { assert.Equal(t, control.FailFast, co.FailureHandling) assert.True(t, co.ToggleFeatures.DisableIncrementals) assert.True(t, co.ToggleFeatures.ForceItemDataDownload) + flagsTD.AssertGenericBackupFlags(t, cmd) flagsTD.AssertProviderFlags(t, cmd) flagsTD.AssertStorageFlags(t, cmd) } diff --git a/src/cli/flags/testdata/repo.go b/src/cli/flags/testdata/repo.go index 98f99ec20..077eae069 100644 --- a/src/cli/flags/testdata/repo.go +++ b/src/cli/flags/testdata/repo.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/spf13/cobra" - "gotest.tools/v3/assert" + "github.com/stretchr/testify/assert" "github.com/alcionai/corso/src/cli/flags" ) @@ -40,3 +40,17 @@ func AssertProviderFlags(t *testing.T, cmd *cobra.Command) { assert.Equal(t, AzureTenantID, flags.AzureClientTenantFV) assert.Equal(t, AzureClientSecret, flags.AzureClientSecretFV) } + +func PreparedGenericBackupFlags() []string { + return []string{ + "--" + flags.FailFastFN, + "--" + flags.DisableIncrementalsFN, + "--" + flags.ForceItemDataDownloadFN, + } +} + +func AssertGenericBackupFlags(t *testing.T, cmd *cobra.Command) { + assert.True(t, flags.FailFastFV, "fail fast flag") + assert.True(t, flags.DisableIncrementalsFV, "disable incrementals flag") + assert.True(t, flags.ForceItemDataDownloadFV, "force item data download flag") +}