You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/07/24 10:34:37 UTC
[james-project] 06/07: JAMES-3314 Rewrite
DeletedMessagesVaultRoutesTest so that it do not hard code BlobId
generation logic
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ddd3be5fcd5d754be9c671bc5bd5263937bbd844
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Jul 23 09:06:20 2020 +0700
JAMES-3314 Rewrite DeletedMessagesVaultRoutesTest so that it do not hard code BlobId generation logic
---
.../vault/routes/DeletedMessagesVaultRoutesTest.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
index 3cf3d00..1c8d463 100644
--- a/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
+++ b/server/protocols/webadmin/webadmin-mailbox-deleted-message-vault/src/test/java/org/apache/james/webadmin/vault/routes/DeletedMessagesVaultRoutesTest.java
@@ -138,19 +138,24 @@ import reactor.core.publisher.Mono;
class DeletedMessagesVaultRoutesTest {
- private class NoopBlobExporting implements BlobExportMechanism {
+ private static class NoopBlobExporting implements BlobExportMechanism {
+ private Optional<BlobId> exportedBlobId = Optional.empty();
+
@Override
public ShareeStage blobId(BlobId blobId) {
- return exportTo -> explanation -> fileCustomPrefix -> fileExtension -> () -> export(exportTo, explanation);
+ return exportTo -> explanation -> fileCustomPrefix -> fileExtension -> () -> export(exportTo, explanation, blobId);
+ }
+
+ void export(MailAddress exportTo, String explanation, BlobId blobId) {
+ this.exportedBlobId = Optional.of(blobId);
}
- void export(MailAddress exportTo, String explanation) {
- // do nothing
+ public Optional<BlobId> getExportedBlobId() {
+ return exportedBlobId;
}
}
private static final ZonedDateTime NOW = ZonedDateTime.parse("2015-10-30T16:12:00Z");
- private static final ZonedDateTime OLD_DELIVERY_DATE = ZonedDateTime.parse("2010-10-30T14:12:00Z");
private static final ZonedDateTime OLD_DELETION_DATE = ZonedDateTime.parse("2010-10-30T15:12:00Z");
private static final String MATCH_ALL_QUERY = "{" +
"\"combinator\": \"and\"," +
@@ -1891,7 +1896,7 @@ class DeletedMessagesVaultRoutesTest {
.get(taskId + "/await");
verify(blobExporting, times(1))
- .export(eq(USERNAME_2.asMailAddress()), any());
+ .export(eq(USERNAME_2.asMailAddress()), any(), any());
}
@Test
@@ -1935,7 +1940,7 @@ class DeletedMessagesVaultRoutesTest {
byte[] expectedZippedData = zippedMessagesData();
- assertThat(blobStore.read(blobStore.getDefaultBucketName(), blobIdFactory.forPayload(expectedZippedData)))
+ assertThat(blobStore.read(blobStore.getDefaultBucketName(), blobExporting.getExportedBlobId().get()))
.hasSameContentAs(new ByteArrayInputStream(expectedZippedData));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org