Apply reviewer comments

jean-philippe-martin · jean-philippe-martin · commit 05b8bee60360 · 2017-03-10T14:21:26.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
@@ -24,7 +24,9 @@
 import com.google.common.testing.NullPointerTester;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -58,6 +60,9 @@ public class CloudStorageFileSystemTest {
           + "The Heart-ache, and the thousand Natural shocks\n"
           + "That Flesh is heir to? 'Tis a consummation\n";
 
+  @Rule
+  public ExpectedException thrown = ExpectedException.none();
+
   @Before
   public void before() {
     CloudStorageFileSystemProvider.setStorageOptions(LocalStorageHelper.getOptions());
@@ -204,8 +209,9 @@ public void testDeleteEmptyFolder() throws IOException {
     }
   }
 
-  @Test(expected = CloudStoragePseudoDirectoryException.class)
+  @Test
   public void testDeleteFullFolder() throws IOException {
+    thrown.expect(CloudStoragePseudoDirectoryException.class);
     try (FileSystem fs = CloudStorageFileSystem.forBucket("bucket")) {
       Files.write(fs.getPath("dir/angel"), ALONE.getBytes(UTF_8));
       // we cannot delete existing folders if they contain something
@@ -278,7 +284,7 @@ public void testDeleteRecursive() throws IOException {
    * @param directory the directory to delete
    * @throws IOException
    */
-  static private void deleteRecursive(Path directory) throws IOException {
+  private static void deleteRecursive(Path directory) throws IOException {
     Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
       @Override
       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
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
@@ -373,6 +373,7 @@ public void testDeleteRecursive() throws IOException {
       assertThat(Files.exists(fs.getPath("playwrights/French/Corneille"))).isFalse();
       assertThat(Files.exists(fs.getPath("Racine"))).isTrue();
       Files.deleteIfExists(fs.getPath("Racine"));
+      assertThat(Files.exists(fs.getPath("Racine"))).isFalse();
     }
   }
 
@@ -381,7 +382,7 @@ public void testDeleteRecursive() throws IOException {
    * @param directory the directory to delete
    * @throws IOException
    */
-  static private void deleteRecursive(Path directory) throws IOException {
+  private static void deleteRecursive(Path directory) throws IOException {
     Files.walkFileTree(directory, new SimpleFileVisitor<Path>() {
       @Override
       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
