feat: add test methods for the newly added method to delete directori…

…es from templates.
CloudNetService · Oct 2, 2023 · bcfc6d9 · bcfc6d9
1 parent a07bec0
commit bcfc6d9
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 1 deletion.
diff --git a/modules/storage-s3/src/test/java/eu/cloudnetservice/modules/s3/S3TemplateStorageTest.java b/modules/storage-s3/src/test/java/eu/cloudnetservice/modules/s3/S3TemplateStorageTest.java
@@ -201,4 +201,15 @@ void testTemplateDelete() {
     Assertions.assertFalse(storage.contains(TEMPLATE));
     Assertions.assertFalse(storage.hasFile(TEMPLATE, "test.txt"));
   }
+
+  @Test
+  @Order(120)
+  void testDeleteDirectory() {
+    var directory = "hello";
+    Assertions.assertTrue(storage.createDirectory(TEMPLATE, directory));
+    Assertions.assertTrue(storage.createFile(TEMPLATE, directory + "/test.txt"));
+    Assertions.assertTrue(storage.hasFile(TEMPLATE, directory + "/test.txt"));
+    Assertions.assertTrue(storage.deleteDirectory(TEMPLATE, directory));
+    Assertions.assertFalse(storage.hasFile(TEMPLATE, directory + "/test.txt"));
+  }
 }
diff --git a/modules/storage-sftp/src/main/java/eu/cloudnetservice/modules/sftp/SFTPTemplateStorage.java b/modules/storage-sftp/src/main/java/eu/cloudnetservice/modules/sftp/SFTPTemplateStorage.java
@@ -277,7 +277,6 @@ public boolean deleteFile(@NonNull ServiceTemplate template, @NonNull String pat
   public boolean deleteDirectory(@NonNull ServiceTemplate template, @NonNull String path) {
     return this.executeWithClient(client -> {
       this.deleteDir(client, this.constructRemotePath(template, path));
-      client.rmdir(this.constructRemotePath(template, path));
       return true;
     }, false);
   }

diff --git a/...s/storage-sftp/src/test/java/eu/cloudnetservice/modules/sftp/SFTPTemplateStorageTest.java b/...s/storage-sftp/src/test/java/eu/cloudnetservice/modules/sftp/SFTPTemplateStorageTest.java
@@ -193,4 +193,15 @@ void testTemplateDelete() {
     Assertions.assertFalse(storage.contains(TEMPLATE));
     Assertions.assertFalse(storage.hasFile(TEMPLATE, "test.txt"));
   }
+
+  @Test
+  @Order(120)
+  void testDeleteDirectory() {
+    var directory = "hello";
+    Assertions.assertTrue(storage.createDirectory(TEMPLATE, directory));
+    Assertions.assertTrue(storage.createFile(TEMPLATE, directory + "/test.txt"));
+    Assertions.assertTrue(storage.hasFile(TEMPLATE, directory + "/test.txt"));
+    Assertions.assertTrue(storage.deleteDirectory(TEMPLATE, directory));
+    Assertions.assertFalse(storage.hasFile(TEMPLATE, directory + "/test.txt"));
+  }
 }
diff --git a/node/src/test/java/eu/cloudnetservice/node/template/LocalTemplateStorageTest.java b/node/src/test/java/eu/cloudnetservice/node/template/LocalTemplateStorageTest.java
@@ -177,4 +177,15 @@ void testTemplateDelete() {
     Assertions.assertFalse(storage.contains(TEMPLATE));
     Assertions.assertFalse(storage.hasFile(TEMPLATE, "test.txt"));
   }
+
+  @Test
+  @Order(120)
+  void testDeleteDirectory() {
+    var directory = "hello";
+    Assertions.assertTrue(storage.createDirectory(TEMPLATE, directory));
+    Assertions.assertTrue(storage.createFile(TEMPLATE, directory + "/test.txt"));
+    Assertions.assertTrue(storage.hasFile(TEMPLATE, directory + "/test.txt"));
+    Assertions.assertTrue(storage.deleteDirectory(TEMPLATE, directory));
+    Assertions.assertFalse(storage.hasFile(TEMPLATE, directory + "/test.txt"));
+  }
 }