Fix test

jean-philippe-martin · jean-philippe-martin · commit ba248b0e11ae · 2017-03-10T17:07:29.000-08:00
diff --git a/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java b/google-cloud-contrib/google-cloud-nio/src/test/java/com/google/cloud/storage/contrib/nio/CloudStorageFileSystemProviderTest.java
@@ -412,7 +412,6 @@ public void testDelete_dotDirNotNormalized_throwsIae() throws Exception {
 
   @Test
   public void testDelete_trailingSlash() throws Exception {
-    thrown.expect(CloudStoragePseudoDirectoryException.class);
     Files.delete(Paths.get(URI.create("gs://love/passion/")));
   }
 
@@ -437,14 +436,19 @@ public void testDelete_notFound() throws Exception {
   public void testDeleteIfExists() throws Exception {
     Files.write(Paths.get(URI.create("gs://love/passionz")), "(✿◕ ‿◕ )ノ".getBytes(UTF_8));
     assertThat(Files.deleteIfExists(Paths.get(URI.create("gs://love/passionz")))).isTrue();
-  }
-
-  public void testDeleteIfExists_trailingSlash() throws Exception {
-    thrown.expect(CloudStoragePseudoDirectoryException.class);
+    // call does not fail, the folder just doesn't exist
     Files.deleteIfExists(Paths.get(URI.create("gs://love/passion/")));
   }
 
   @Test
+  public void testDeleteIfExists_trailingSlash_disablePseudoDirectories() throws Exception {
+    try (CloudStorageFileSystem fs = forBucket("doodle", usePseudoDirectories(false))) {
+      // Doesn't exist, no error
+      Files.deleteIfExists(Paths.get(URI.create("gs://love/passion/")));
+    }
+  }
+
+    @Test
   public void testCopy() throws Exception {
     Path source = Paths.get(URI.create("gs://military/fashion.show"));
     Path target = Paths.get(URI.create("gs://greenbean/adipose"));
