add test for DeleteRecursive

jean-philippe-martin · jean-philippe-martin · commit 2a218c2d0128 · 2017-02-17T13:05:57.000-08:00
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java b/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemTest.java
@@ -38,6 +38,9 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.FileVisitResult;
+import java.nio.file.attribute.BasicFileAttributes;
 
 /**
  * Unit tests for {@link CloudStorageFileSystem}.
@@ -250,6 +253,45 @@ public void testDeleteEmptiedFolder() throws IOException {
     }
   }
 
+  @Test
+  public void testDeleteRecursive() throws IOException {
+    try (FileSystem fs = CloudStorageFileSystem.forBucket("bucket")) {
+      List<Path> paths = new ArrayList<>();
+      paths.add(fs.getPath("atroot"));
+      paths.add(fs.getPath("dir/angel"));
+      paths.add(fs.getPath("dir/dir2/another_angel"));
+      paths.add(fs.getPath("dir/dir2/angel3"));
+      paths.add(fs.getPath("dir/dir3/cloud"));
+      for (Path path : paths) {
+        Files.write(path, ALONE.getBytes(UTF_8));
+      }
+
+      deleteRecursive(fs.getPath("dir/"));
+      assertThat(Files.exists(fs.getPath("dir/angel"))).isFalse();
+      assertThat(Files.exists(fs.getPath("dir/dir3/cloud"))).isFalse();
+      assertThat(Files.exists(fs.getPath("atroot"))).isTrue();
+    }
+  }
+
+  /**
+   * Delete the given directory and all of its contents if non-empty.
+   * @param directory the directory to delete
+   * @throws IOException
+   */
+  static private void deleteRecursive(Path directory) throws IOException {
+    Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+      @Override
+      public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        Files.delete(file);
+        return FileVisitResult.CONTINUE;
+      }
+      @Override
+      public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+        Files.delete(dir);
+        return FileVisitResult.CONTINUE;
+      }
+    });
+  }
 
   private void assertMatches(FileSystem fs, PathMatcher matcher, String toMatch, boolean expected) {
     assertThat(matcher.matches(fs.getPath(toMatch).getFileName())).isEqualTo(expected);
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java b/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/it/ITGcsNio.java
@@ -44,10 +44,13 @@
 import java.nio.channels.ReadableByteChannel;
 import java.nio.channels.SeekableByteChannel;
 import java.nio.file.FileSystem;
+import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
+import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.BasicFileAttributes;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -354,6 +357,45 @@ public void testListFiles() throws IOException {
     }
   }
 
+
+  @Test
+  public void testDeleteRecursive() throws IOException {
+    try (FileSystem fs = getTestBucket()) {
+      List<Path> paths = new ArrayList<>();
+      paths.add(fs.getPath("Racine"));
+      paths.add(fs.getPath("playwrights/Moliere"));
+      paths.add(fs.getPath("playwrights/French/Corneille"));
+      for (Path path : paths) {
+        Files.write(path, FILE_CONTENTS, UTF_8);
+      }
+      deleteRecursive(fs.getPath("playwrights/"));
+      assertThat(Files.exists(fs.getPath("playwrights/Moliere"))).isFalse();
+      assertThat(Files.exists(fs.getPath("playwrights/French/Corneille"))).isFalse();
+      assertThat(Files.exists(fs.getPath("Racine"))).isTrue();
+      Files.deleteIfExists(fs.getPath("Racine"));
+    }
+  }
+
+  /**
+   * Delete the given directory and all of its contents if non-empty.
+   * @param directory the directory to delete
+   * @throws IOException
+   */
+  static private void deleteRecursive(Path directory) throws IOException {
+    Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
+      @Override
+      public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        Files.delete(file);
+        return FileVisitResult.CONTINUE;
+      }
+      @Override
+      public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOException {
+        Files.delete(dir);
+        return FileVisitResult.CONTINUE;
+      }
+    });
+  }
+
   private int readFully(ReadableByteChannel chan, byte[] outputBuf) throws IOException {
     ByteBuffer buf = ByteBuffer.wrap(outputBuf);
     int sofar = 0;
