Skip to content

Commit bcfc6d9

Browse files
committed
feat: add test methods for the newly added method to delete directories from templates.
1 parent a07bec0 commit bcfc6d9

File tree

4 files changed

+33
-1
lines changed

4 files changed

+33
-1
lines changed

modules/storage-s3/src/test/java/eu/cloudnetservice/modules/s3/S3TemplateStorageTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,15 @@ void testTemplateDelete() {
201201
Assertions.assertFalse(storage.contains(TEMPLATE));
202202
Assertions.assertFalse(storage.hasFile(TEMPLATE, "test.txt"));
203203
}
204+
205+
@Test
206+
@Order(120)
207+
void testDeleteDirectory() {
208+
var directory = "hello";
209+
Assertions.assertTrue(storage.createDirectory(TEMPLATE, directory));
210+
Assertions.assertTrue(storage.createFile(TEMPLATE, directory + "/test.txt"));
211+
Assertions.assertTrue(storage.hasFile(TEMPLATE, directory + "/test.txt"));
212+
Assertions.assertTrue(storage.deleteDirectory(TEMPLATE, directory));
213+
Assertions.assertFalse(storage.hasFile(TEMPLATE, directory + "/test.txt"));
214+
}
204215
}

modules/storage-sftp/src/main/java/eu/cloudnetservice/modules/sftp/SFTPTemplateStorage.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,6 @@ public boolean deleteFile(@NonNull ServiceTemplate template, @NonNull String pat
277277
public boolean deleteDirectory(@NonNull ServiceTemplate template, @NonNull String path) {
278278
return this.executeWithClient(client -> {
279279
this.deleteDir(client, this.constructRemotePath(template, path));
280-
client.rmdir(this.constructRemotePath(template, path));
281280
return true;
282281
}, false);
283282
}

modules/storage-sftp/src/test/java/eu/cloudnetservice/modules/sftp/SFTPTemplateStorageTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,4 +193,15 @@ void testTemplateDelete() {
193193
Assertions.assertFalse(storage.contains(TEMPLATE));
194194
Assertions.assertFalse(storage.hasFile(TEMPLATE, "test.txt"));
195195
}
196+
197+
@Test
198+
@Order(120)
199+
void testDeleteDirectory() {
200+
var directory = "hello";
201+
Assertions.assertTrue(storage.createDirectory(TEMPLATE, directory));
202+
Assertions.assertTrue(storage.createFile(TEMPLATE, directory + "/test.txt"));
203+
Assertions.assertTrue(storage.hasFile(TEMPLATE, directory + "/test.txt"));
204+
Assertions.assertTrue(storage.deleteDirectory(TEMPLATE, directory));
205+
Assertions.assertFalse(storage.hasFile(TEMPLATE, directory + "/test.txt"));
206+
}
196207
}

node/src/test/java/eu/cloudnetservice/node/template/LocalTemplateStorageTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,4 +177,15 @@ void testTemplateDelete() {
177177
Assertions.assertFalse(storage.contains(TEMPLATE));
178178
Assertions.assertFalse(storage.hasFile(TEMPLATE, "test.txt"));
179179
}
180+
181+
@Test
182+
@Order(120)
183+
void testDeleteDirectory() {
184+
var directory = "hello";
185+
Assertions.assertTrue(storage.createDirectory(TEMPLATE, directory));
186+
Assertions.assertTrue(storage.createFile(TEMPLATE, directory + "/test.txt"));
187+
Assertions.assertTrue(storage.hasFile(TEMPLATE, directory + "/test.txt"));
188+
Assertions.assertTrue(storage.deleteDirectory(TEMPLATE, directory));
189+
Assertions.assertFalse(storage.hasFile(TEMPLATE, directory + "/test.txt"));
190+
}
180191
}

0 commit comments

Comments
 (0)