From ffc20dbe5ce58da1df9ec110456e19f0c43bed5c Mon Sep 17 00:00:00 2001 From: Nitin Garg Date: Thu, 13 Jun 2024 11:52:52 +0000 Subject: [PATCH] optimize runtime, fix comments --- .../implicit_dir/list_test.go | 4 +- .../implicit_and_explicit_dir_setup.go | 50 +++++++++++-------- 2 files changed, 32 insertions(+), 22 deletions(-) diff --git a/tools/integration_tests/implicit_dir/list_test.go b/tools/integration_tests/implicit_dir/list_test.go index 2d362acbb9..74960142ae 100644 --- a/tools/integration_tests/implicit_dir/list_test.go +++ b/tools/integration_tests/implicit_dir/list_test.go @@ -37,8 +37,8 @@ func TestListImplicitObjectsFromBucket(t *testing.T) { // testBucket/dirForImplicitDirTests/explicitFile -- File // testBucket/dirForImplicitDirTests/explicitDirectory/fileInExplicitDir1 -- File // testBucket/dirForImplicitDirTests/explicitDirectory/fileInExplicitDir2 -- File - // testBucket/dirForImplicitDirTests// -- Dir - // testBucket/dirForImplicitDirTests//fileInUnsupportedImplicitDir1 -- File + // testBucket/dirForImplicitDirTests/implicitDirectory//fileInUnsupportedImplicitDir1 -- File + // testBucket//fileInUnsupportedPathInRootDirectory -- File implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure(DirForImplicitDirTests, t) implicit_and_explicit_dir_setup.CreateExplicitDirectoryStructure(DirForImplicitDirTests, t) diff --git a/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup/implicit_and_explicit_dir_setup.go b/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup/implicit_and_explicit_dir_setup.go index 709973a52a..b557a06a3f 100644 --- a/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup/implicit_and_explicit_dir_setup.go +++ b/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup/implicit_and_explicit_dir_setup.go @@ -76,7 +76,9 @@ func RemoveAndCheckIfDirIsDeleted(dirPath string, dirName string, t *testing.T) } } -func createObjectOnGcs(content, completeObjectName string, t *testing.T) { +type objectCreationMetadata struct{ content, completeObjectName string } + +func createObjectsOnGcs(objects []objectCreationMetadata, t *testing.T) { ctx := context.Background() sgClient, err := client.CreateStorageClient(ctx) if sgClient == nil || err != nil { @@ -84,14 +86,21 @@ func createObjectOnGcs(content, completeObjectName string, t *testing.T) { } defer sgClient.Close() - if err = client.CreateObjectOnGCS(ctx, sgClient, completeObjectName, content); err != nil { - t.Fatalf("Failed to create object %s: %v", completeObjectName, err) + for _, object := range objects { + if err = client.CreateObjectOnGCS(ctx, sgClient, object.completeObjectName, object.content); err != nil { + t.Fatalf("Failed to create object %s: %v", object.completeObjectName, err) + } } } -func createObjectsInImplicitDir(implicitDirName string, t *testing.T) { - createObjectOnGcs("This is from directory fileInImplicitDir1 file implicitDirectory", path.Join(implicitDirName, FileInImplicitDirectory), t) - createObjectOnGcs("This is from directory implicitDirectory/implicitSubDirectory file fileInImplicitDir2", path.Join(implicitDirName, ImplicitSubDirectory, FileInImplicitSubDirectory), t) +func createObjectsInImplicitDir(completeTestDirName string, t *testing.T) { + implicitDirName := path.Join(completeTestDirName, ImplicitDirectory) + createObjectsOnGcs( + []objectCreationMetadata{ + {"This is from directory fileInImplicitDir1 file implicitDirectory", path.Join(implicitDirName, FileInImplicitDirectory)}, + {"This is from directory implicitDirectory/implicitSubDirectory file fileInImplicitDir2", path.Join(implicitDirName, ImplicitSubDirectory, FileInImplicitSubDirectory)}, + }, + t) } func CreateImplicitDirectoryStructure(testDir string, t *testing.T) { @@ -102,25 +111,26 @@ func CreateImplicitDirectoryStructure(testDir string, t *testing.T) { // testBucket/testDir/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File // Create implicit directory in bucket for testing. - createObjectsInImplicitDir(path.Join(testDir, ImplicitDirectory), t) + createObjectsInImplicitDir(testDir, t) } func CreateUnsupportedImplicitDirectoryStructure(testDir string, t *testing.T) { // Unsupported Implicit Directory Structure - // testBucket/testDir// -- Dir - // testBucket/testDir//fileInUnsupportedImplicitDir1 -- File + // testBucket/testDir/implicitDirectory -- Dir + // testBucket/testDir/implicitDirectory//fileInUnsupportedImplicitDir1 -- File + // testBucket//FileInUnsupportedPathInRootDirectory -- File completeGcsTestDirName := path.Join(testDir, ImplicitDirectory) - for _, objectToBeCreated := range []struct { - content string - completeObjectName string - }{{ - "This is testBucket/testDir//fileInUnsupportedImplicitDir1", completeGcsTestDirName + "//" + FileInUnsupportedImplicitDirectory1}, - { - "This is testBucket//fileInUnsupportedPathInRootDirectory", "/" + FileInUnsupportedPathInRootDirectory, - }} { - createObjectOnGcs(objectToBeCreated.content, objectToBeCreated.completeObjectName, t) - } + createObjectsOnGcs( + []objectCreationMetadata{ + { + "This is testBucket/testDir//fileInUnsupportedImplicitDir1", completeGcsTestDirName + "//" + FileInUnsupportedImplicitDirectory1, + }, + { + "This is testBucket//fileInUnsupportedPathInRootDirectory", "/" + FileInUnsupportedPathInRootDirectory, + }, + }, + t) } func CreateExplicitDirectoryStructure(testDir string, t *testing.T) { @@ -153,5 +163,5 @@ func CreateImplicitDirectoryInExplicitDirectoryStructure(testDir string, t *test // testBucket/testDir/explicitDirectory/implicitDirectory/implicitSubDirectory/fileInImplicitDir2 -- File CreateExplicitDirectoryStructure(testDir, t) - createObjectsInImplicitDir(path.Join(testDir, ExplicitDirectory, ImplicitDirectory), t) + createObjectsInImplicitDir(path.Join(testDir, ExplicitDirectory), t) }