This is an automated email from the ASF dual-hosted git repository. rouazana pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 3a35368f43b5cd36db1376bec4457f858c02824f Author: Rene Cordier <[email protected]> AuthorDate: Tue Jul 16 17:32:39 2019 +0700 JAMES-2829 refactor BlobStoreContract for more clarity --- .../apache/james/blob/api/BlobStoreContract.java | 87 +++++++++++++++------- 1 file changed, 60 insertions(+), 27 deletions(-) diff --git a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java index 07d4588..cd63407 100644 --- a/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java +++ b/server/blob/blob-api/src/test/java/org/apache/james/blob/api/BlobStoreContract.java @@ -44,134 +44,167 @@ public interface BlobStoreContract { @Test default void saveShouldThrowWhenNullData() { - assertThatThrownBy(() -> testee().save(testee().getDefaultBucketName(), (byte[]) null).block()) + BucketName defaultBucketName = testee().getDefaultBucketName(); + + assertThatThrownBy(() -> testee().save(defaultBucketName, (byte[]) null).block()) .isInstanceOf(NullPointerException.class); } @Test default void saveShouldThrowWhenNullString() { - assertThatThrownBy(() -> testee().save(testee().getDefaultBucketName(), (String) null).block()) + BucketName defaultBucketName = testee().getDefaultBucketName(); + + assertThatThrownBy(() -> testee().save(defaultBucketName, (String) null).block()) .isInstanceOf(NullPointerException.class); } @Test default void saveShouldThrowWhenNullInputStream() { - assertThatThrownBy(() -> testee().save(testee().getDefaultBucketName(), (InputStream) null).block()) + BucketName defaultBucketName = testee().getDefaultBucketName(); + + assertThatThrownBy(() -> testee().save(defaultBucketName, (InputStream) null).block()) .isInstanceOf(NullPointerException.class); } @Test default void saveShouldSaveEmptyData() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), EMPTY_BYTEARRAY).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); - byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block(); + BlobId blobId = testee().save(defaultBucketName, EMPTY_BYTEARRAY).block(); + + byte[] bytes = testee().readBytes(defaultBucketName, blobId).block(); assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty(); } @Test default void saveShouldSaveEmptyString() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), new String()).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, new String()).block(); - byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block(); + byte[] bytes = testee().readBytes(defaultBucketName, blobId).block(); assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty(); } @Test default void saveShouldSaveEmptyInputStream() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), new ByteArrayInputStream(EMPTY_BYTEARRAY)).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); - byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block(); + BlobId blobId = testee().save(defaultBucketName, new ByteArrayInputStream(EMPTY_BYTEARRAY)).block(); + + byte[] bytes = testee().readBytes(defaultBucketName, blobId).block(); assertThat(new String(bytes, StandardCharsets.UTF_8)).isEmpty(); } @Test default void saveShouldReturnBlobId() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_BYTEARRAY).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block(); assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66")); } @Test default void saveShouldReturnBlobIdOfString() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_STRING).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, SHORT_STRING).block(); assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66")); } @Test default void saveShouldReturnBlobIdOfInputStream() { - BlobId blobId = - testee().save(testee().getDefaultBucketName(), new ByteArrayInputStream(SHORT_BYTEARRAY)).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, new ByteArrayInputStream(SHORT_BYTEARRAY)).block(); assertThat(blobId).isEqualTo(blobIdFactory().from("31f7a65e315586ac198bd798b6629ce4903d0899476d5741a9f32e2e521b6a66")); } @Test default void readBytesShouldThrowWhenNoExisting() { - assertThatThrownBy(() -> testee().readBytes(testee().getDefaultBucketName(), blobIdFactory().from("unknown")).block()) + BucketName defaultBucketName = testee().getDefaultBucketName(); + + assertThatThrownBy(() -> testee().readBytes(defaultBucketName, blobIdFactory().from("unknown")).block()) .isExactlyInstanceOf(ObjectStoreException.class); } @Test default void readBytesShouldReturnSavedData() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_BYTEARRAY).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block(); - byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block(); + byte[] bytes = testee().readBytes(defaultBucketName, blobId).block(); assertThat(bytes).isEqualTo(SHORT_BYTEARRAY); } @Test default void readBytesShouldReturnLongSavedData() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), ELEVEN_KILOBYTES).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); - byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block(); + BlobId blobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block(); + + byte[] bytes = testee().readBytes(defaultBucketName, blobId).block(); assertThat(bytes).isEqualTo(ELEVEN_KILOBYTES); } @Test default void readBytesShouldReturnBigSavedData() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), TWELVE_MEGABYTES).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block(); - byte[] bytes = testee().readBytes(testee().getDefaultBucketName(), blobId).block(); + byte[] bytes = testee().readBytes(defaultBucketName, blobId).block(); assertThat(bytes).isEqualTo(TWELVE_MEGABYTES); } @Test default void readShouldThrowWhenNoExistingStream() { - assertThatThrownBy(() -> testee().read(testee().getDefaultBucketName(), blobIdFactory().from("unknown"))) + BucketName defaultBucketName = testee().getDefaultBucketName(); + + assertThatThrownBy(() -> testee().read(defaultBucketName, blobIdFactory().from("unknown"))) .isInstanceOf(ObjectStoreException.class); } @Test default void readShouldReturnSavedData() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), SHORT_BYTEARRAY).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); + + BlobId blobId = testee().save(defaultBucketName, SHORT_BYTEARRAY).block(); - InputStream read = testee().read(testee().getDefaultBucketName(), blobId); + InputStream read = testee().read(defaultBucketName, blobId); assertThat(read).hasSameContentAs(new ByteArrayInputStream(SHORT_BYTEARRAY)); } @Test default void readShouldReturnLongSavedData() { - BlobId blobId = testee().save(testee().getDefaultBucketName(), ELEVEN_KILOBYTES).block(); + BucketName defaultBucketName = testee().getDefaultBucketName(); - InputStream read = testee().read(testee().getDefaultBucketName(), blobId); + BlobId blobId = testee().save(defaultBucketName, ELEVEN_KILOBYTES).block(); + + InputStream read = testee().read(defaultBucketName, blobId); assertThat(read).hasSameContentAs(new ByteArrayInputStream(ELEVEN_KILOBYTES)); } @Test default void readShouldReturnBigSavedData() { + BucketName defaultBucketName = testee().getDefaultBucketName(); + // 12 MB of text - BlobId blobId = testee().save(testee().getDefaultBucketName(), TWELVE_MEGABYTES).block(); + BlobId blobId = testee().save(defaultBucketName, TWELVE_MEGABYTES).block(); - InputStream read = testee().read(testee().getDefaultBucketName(), blobId); + InputStream read = testee().read(defaultBucketName, blobId); assertThat(read).hasSameContentAs(new ByteArrayInputStream(TWELVE_MEGABYTES)); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
