Delete implicit dir integration test

tools/integration_tests/explicit_dir/list_test.go

@@ -40,8 +40,8 @@ func TestListOnlyExplicitObjectsFromBucket(t *testing.T) {
 	// testBucket/explicitDirectory/fileInExplicitDir1                               -- File
 	// testBucket/explicitDirectory/fileInExplicitDir2                               -- File
 
-	implicit_and_explicit_dir_setup.CreateImplicitDirectory()
-	implicit_and_explicit_dir_setup.CreateExplicitDirectory(t)
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure()
+	implicit_and_explicit_dir_setup.CreateExplicitDirectoryStructure(t)
 
 	err := filepath.WalkDir(setup.MntDir(), func(path string, dir fs.DirEntry, err error) error {
 		if err != nil {

tools/integration_tests/implicit_dir/delete_test.go

@@ -0,0 +1,140 @@
+// Copyright 2023 Google Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Provide test for deleting implicit directory.
+package implicit_dir_test
+
+import (
+	"path"
+	"testing"
+
+	"github.com/googlecloudplatform/gcsfuse/tools/integration_tests/util/operations"
+	"github.com/googlecloudplatform/gcsfuse/tools/integration_tests/util/setup"
+	"github.com/googlecloudplatform/gcsfuse/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup"
+)
+
+// Directory Structure
+// testBucket/implicitDirectory                                                  -- Dir
+// testBucket/implicitDirectory/fileInImplicitDir1                               -- File
+// testBucket/implicitDirectory/implicitSubDirectory                             -- Dir
+// testBucket/implicitDirectory/implicitSubDirectory/fileInImplicitDir2          -- File
+func TestDeleteNonEmptyImplicitDir(t *testing.T) {
+	// Clean the mountedDirectory before running test.
+	setup.CleanMntDir()
+
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure()
+
+	dirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ImplicitDirectory)
+
+	implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
+}
+
+// Directory Structure
+// testBucket/implicitDirectory                                                  -- Dir
+// testBucket/implicitDirectory/fileInImplicitDir1                               -- File
+// testBucket/implicitDirectory/implicitSubDirectory                             -- Dir
+// testBucket/implicitDirectory/implicitSubDirectory/fileInImplicitDir2          -- File
+func TestDeleteNonEmptyImplicitSubDir(t *testing.T) {
+	// Clean the mountedDirectory before running test.
+	setup.CleanMntDir()
+
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure()
+
+	subDirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ImplicitDirectory, implicit_and_explicit_dir_setup.ImplicitSubDirectory)
+
+	implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(subDirPath, implicit_and_explicit_dir_setup.ImplicitSubDirectory, t)
+}
+
+// Directory Structure
+// testBucket/implicitDirectory                                                                    -- Dir
+// testBucket/implicitDirectory/explicitDirInImplicitDir                                           -- Dir
+// testBucket/implicitDirectory/explicitDirInImplicitDir/fileInExplicitDirInImplicitDir            -- File
+// testBucket/implicitDirectory/fileInImplicitDir1                                                 -- File
+// testBucket/implicitDirectory/implicitSubDirectory                                               -- Dir
+// testBucket/implicitDirectory/implicitSubDirectory/fileInImplicitDir2                            -- File
+func TestDeleteImplicitDirWithExplicitSubDir(t *testing.T) {
+	// Clean the mountedDirectory before running test.
+	setup.CleanMntDir()
+
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure()
+
+	explicitDirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ImplicitDirectory, ExplicitDirInImplicitDir)
+
+	operations.CreateDirectoryWithNFiles(NumberOfFilesInExplicitDirInImplicitDir, explicitDirPath, PrefixFileInExplicitDirInImplicitDir, t)
+
+	dirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ImplicitDirectory)
+
+	implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
+}
+
+// Directory Structure
+// testBucket/implicitDirectory                                                                                         -- Dir
+// testBucket/implicitDirectory/fileInImplicitDir1                                                                      -- File
+// testBucket/implicitDirectory/implicitSubDirectory                                                                    -- Dir
+// testBucket/implicitDirectory/implicitSubDirectory/fileInImplicitDir2                                                 -- File
+// testBucket/implicitDirectory/implicitSubDirectory/explicitDirInImplicitDir                                           -- Dir
+// testBucket/implicitDirectory/implicitSubDirectory/explicitDirInImplicitDir/fileInExplicitDirInImplicitDir            -- File
+func TestDeleteImplicitDirWithImplicitSubDirContainingExplicitDir(t *testing.T) {
+	// Clean the mountedDirectory before running test.
+	setup.CleanMntDir()
+
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure()
+	explicitDirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ImplicitDirectory, implicit_and_explicit_dir_setup.ImplicitSubDirectory, ExplicitDirInImplicitSubDir)
+
+	operations.CreateDirectoryWithNFiles(NumberOfFilesInExplicitDirInImplicitSubDir, explicitDirPath, PrefixFileInExplicitDirInImplicitSubDir, t)
+
+	dirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ImplicitDirectory)
+
+	implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
+}
+
+// Directory Structure
+// testBucket/explicitDirectory                                                                   -- Dir
+// testBucket/explictFile                                                                         -- File
+// testBucket/explicitDirectory/fileInExplicitDir1                                                -- File
+// testBucket/explicitDirectory/fileInExplicitDir2                                                -- File
+// testBucket/explicitDirectory/implicitDirectory                                                 -- Dir
+// testBucket/explicitDirectory/implicitDirectory/fileInImplicitDir1                              -- File
+// testBucket/explicitDirectory/implicitDirectory/implicitSubDirectory                            -- Dir
+// testBucket/explicitDirectory/implicitDirectory/implicitSubDirectory/fileInImplicitDir2         -- File
+func TestDeleteImplicitDirInExplicitDir(t *testing.T) {
+	// Clean the mountedDirectory before running test.
+	setup.CleanMntDir()
+
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryInExplicitDirectoryStructure(t)
+
+	dirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ExplicitDirectory, implicit_and_explicit_dir_setup.ImplicitDirectory)
+
+	implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ImplicitDirectory, t)
+}
+
+// Directory Structure
+// testBucket/explicitDirectory                                                                   -- Dir
+// testBucket/explictFile                                                                         -- File
+// testBucket/explicitDirectory/fileInExplicitDir1                                                -- File
+// testBucket/explicitDirectory/fileInExplicitDir2                                                -- File
+// testBucket/explicitDirectory/implicitDirectory                                                 -- Dir
+// testBucket/explicitDirectory/implicitDirectory/fileInImplicitDir1                              -- File
+// testBucket/explicitDirectory/implicitDirectory/implicitSubDirectory                            -- Dir
+// testBucket/explicitDirectory/implicitDirectory/implicitSubDirectory/fileInImplicitDir2         -- File
+func TestDeleteExplicitDirContainingImplicitSubDir(t *testing.T) {
+	// Clean the mountedDirectory before running test.
+	setup.CleanMntDir()
+
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryInExplicitDirectoryStructure(t)
+
+	dirPath := path.Join(setup.MntDir(), implicit_and_explicit_dir_setup.ExplicitDirectory)
+
+	implicit_and_explicit_dir_setup.RemoveAndCheckIfDirIsDeleted(dirPath, implicit_and_explicit_dir_setup.ExplicitDirectory, t)
+}

tools/integration_tests/implicit_dir/implicit_dir_test.go

@@ -21,6 +21,13 @@ import (
 	"github.com/googlecloudplatform/gcsfuse/tools/integration_tests/util/setup/implicit_and_explicit_dir_setup"
 )
 
+const ExplicitDirInImplicitDir = "explicitDirInImplicitDir"
+const ExplicitDirInImplicitSubDir = "explicitDirInImplicitSubDir"
+const PrefixFileInExplicitDirInImplicitDir = "fileInExplicitDirInImplicitDir"
+const PrefixFileInExplicitDirInImplicitSubDir = "fileInExplicitDirInImplicitSubDir"
+const NumberOfFilesInExplicitDirInImplicitSubDir = 1
+const NumberOfFilesInExplicitDirInImplicitDir = 1
+
 func TestMain(m *testing.M) {
 	flags := [][]string{{"--implicit-dirs"}, {"--enable-storage-client-library=false", "--implicit-dirs"}}
 

tools/integration_tests/implicit_dir/list_test.go

@@ -40,8 +40,8 @@ func TestListImplicitObjectsFromBucket(t *testing.T) {
 	// testBucket/explicitDirectory/fileInExplicitDir1                               -- File
 	// testBucket/explicitDirectory/fileInExplicitDir2                               -- File
 
-	implicit_and_explicit_dir_setup.CreateImplicitDirectory()
-	implicit_and_explicit_dir_setup.CreateExplicitDirectory(t)
+	implicit_and_explicit_dir_setup.CreateImplicitDirectoryStructure()
+	implicit_and_explicit_dir_setup.CreateExplicitDirectoryStructure(t)
 
 	err := filepath.WalkDir(setup.MntDir(), func(path string, dir fs.DirEntry, err error) error {
 		if err != nil {

tools/integration_tests/util/setup/implicit_and_explicit_dir_setup/implicit_and_explicit_dir_setup.go

@@ -61,7 +61,16 @@ func RunTestsForImplicitDirAndExplicitDir(flags [][]string, m *testing.M) {
 	os.Exit(successCode)
 }
 
-func CreateImplicitDirectory() {
+func RemoveAndCheckIfDirIsDeleted(dirPath string, dirName string, t *testing.T) {
+	operations.RemoveDir(dirPath)
+
+	dir, err := os.Stat(dirPath)
+	if err == nil && dir.Name() == dirName && dir.IsDir() {
+		t.Errorf("Directory is not deleted.")
+	}
+}
+
+func CreateImplicitDirectoryStructure() {
 	// Implicit Directory Structure
 	// testBucket/implicitDirectory                                                  -- Dir
 	// testBucket/implicitDirectory/fileInImplicitDir1                               -- File
@@ -75,7 +84,7 @@ func CreateImplicitDirectory() {
 	setup.RunScriptForTestData("../util/setup/implicit_and_explicit_dir_setup/testdata/create_objects.sh", setup.TestBucket())
 }
 
-func CreateExplicitDirectory(t *testing.T) {
+func CreateExplicitDirectoryStructure(t *testing.T) {
 	// Explicit Directory structure
 	// testBucket/explicitDirectory                            -- Dir
 	// testBucket/explictFile                                  -- File
@@ -93,3 +102,18 @@ func CreateExplicitDirectory(t *testing.T) {
 	// Closing file at the end.
 	defer operations.CloseFile(file)
 }
+
+func CreateImplicitDirectoryInExplicitDirectoryStructure(t *testing.T) {
+	// testBucket/explicitDirectory                                                                   -- Dir
+	// testBucket/explictFile                                                                         -- File
+	// testBucket/explicitDirectory/fileInExplicitDir1                                                -- File
+	// testBucket/explicitDirectory/fileInExplicitDir2                                                -- File
+	// testBucket/explicitDirectory/implicitDirectory                                                 -- Dir
+	// testBucket/explicitDirectory/implicitDirectory/fileInImplicitDir1                              -- File
+	// testBucket/explicitDirectory/implicitDirectory/implicitSubDirectory                            -- Dir
+	// testBucket/explicitDirectory/implicitDirectory/implicitSubDirectory/fileInImplicitDir2         -- File
+
+	CreateExplicitDirectoryStructure(t)
+	dirPathInBucket := path.Join(setup.TestBucket(), ExplicitDirectory)
+	setup.RunScriptForTestData("../util/setup/implicit_and_explicit_dir_setup/testdata/create_objects.sh", dirPathInBucket)
+}