Skip to content

Commit 7d86ac2

Browse files
committed
Adapt tests
1 parent b8acb67 commit 7d86ac2

File tree

2 files changed

+27
-50
lines changed

2 files changed

+27
-50
lines changed

integration-tests/src/test/kotlin/com/adobe/testing/s3mock/its/GetPutDeleteObjectIT.kt

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -313,56 +313,6 @@ internal class GetPutDeleteObjectIT : S3TestBase() {
313313
}
314314
}
315315

316-
@Test
317-
@S3VerifiedSuccess(year = 2025)
318-
fun testDeleteObjects_quiet(testInfo: TestInfo) {
319-
val key = UPLOAD_FILE_NAME
320-
val bucketName = givenBucket(testInfo)
321-
givenObject(bucketName, key)
322-
323-
s3Client
324-
.deleteObjects {
325-
it.bucket(bucketName)
326-
it.delete {
327-
it.objects(
328-
{ it.key(key) },
329-
)
330-
}
331-
}.also {
332-
assertThat(it.hasDeleted()).isEqualTo(true)
333-
}
334-
335-
givenObject(bucketName, key)
336-
337-
s3Client
338-
.deleteObjects {
339-
it.bucket(bucketName)
340-
it.delete {
341-
it.objects(
342-
{ it.key(key) },
343-
)
344-
false
345-
}
346-
}.also {
347-
assertThat(it.hasDeleted()).isEqualTo(true)
348-
}
349-
350-
givenObject(bucketName, key)
351-
352-
s3Client
353-
.deleteObjects {
354-
it.bucket(bucketName)
355-
it.delete {
356-
it.objects(
357-
{ it.key(key) },
358-
)
359-
true
360-
}
361-
}.also {
362-
assertThat(it.hasDeleted()).isEqualTo(false)
363-
}
364-
}
365-
366316
/**
367317
* Test safe characters in object keys
368318
*

server/src/test/kotlin/com/adobe/testing/s3mock/service/ObjectServiceTest.kt

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,33 @@ internal class ObjectServiceTest : ServiceTestBase() {
7979
assertThat(deleted.deletedObjects).hasSize(2)
8080
}
8181

82+
@Test
83+
fun testDeleteObjects_quiet() {
84+
val bucketName = "bucket"
85+
val key = "key"
86+
val key2 = "key2"
87+
givenBucketWithContents(
88+
bucketName, "", listOf(
89+
givenS3Object(key),
90+
givenS3Object(key2)
91+
)
92+
)
93+
val delete = Delete(
94+
listOf(
95+
givenS3ObjectIdentifier(key),
96+
givenS3ObjectIdentifier(key2)
97+
),
98+
true
99+
)
100+
101+
whenever(objectStore.deleteObject(any(), any(), isNull()))
102+
.thenReturn(true)
103+
whenever(bucketStore.removeFromBucket(key, bucketName)).thenReturn(true)
104+
whenever(bucketStore.removeFromBucket(key2, bucketName)).thenReturn(true)
105+
val deleted = iut.deleteObjects(bucketName, delete)
106+
assertThat(deleted.deletedObjects).hasSize(0)
107+
}
108+
82109
private fun givenS3ObjectIdentifier(key: String?) = S3ObjectIdentifier(key, null, null, null, null)
83110

84111
@Test

0 commit comments

Comments
 (0)