This is an automated email from the ASF dual-hosted git repository.
rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit e76f49e29342167b77c7caf643a42633fd83e151
Author: Lan <dlkh...@linagora.com>
AuthorDate: Fri Mar 6 17:03:21 2020 +0700
JAMES-3072 Simplify test setup
---
.../james/webadmin/service/ExportServiceTest.java | 88 +++------------
.../webadmin/service/ExportServiceTestSystem.java | 109 ++++++++++++++++++
.../service/MailboxesExportRequestToTaskTest.java | 124 +++++----------------
3 files changed, 149 insertions(+), 172 deletions(-)
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
index ce15b01..acf02a2 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTest.java
@@ -20,59 +20,35 @@
package org.apache.james.webadmin.service;
import static org.apache.james.mailbox.DefaultMailboxes.INBOX;
+import static org.apache.james.webadmin.service.ExportServiceTestSystem.BOB;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
import java.io.File;
import java.io.FileInputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import javax.mail.MessagingException;
import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.BlobStore;
import org.apache.james.blob.api.HashBlobId;
import org.apache.james.blob.api.ObjectNotFoundException;
-import org.apache.james.blob.export.api.BlobExportMechanism;
import org.apache.james.blob.export.api.FileExtension;
import org.apache.james.blob.export.file.FileSystemExtension;
-import org.apache.james.blob.export.file.LocalFileBlobExportMechanism;
-import org.apache.james.blob.memory.MemoryBlobStore;
-import org.apache.james.blob.memory.MemoryDumbBlobStore;
import org.apache.james.core.Domain;
import org.apache.james.core.Username;
-import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.domainlist.memory.MemoryDomainList;
import org.apache.james.filesystem.api.FileSystem;
-import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.backup.ArchiveService;
-import org.apache.james.mailbox.backup.DefaultMailboxBackup;
-import org.apache.james.mailbox.backup.MailArchivesLoader;
-import org.apache.james.mailbox.backup.MailboxBackup;
import org.apache.james.mailbox.backup.ZipAssert;
-import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
-import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
-import org.apache.james.mailbox.backup.zip.Zipper;
import org.apache.james.mailbox.exception.MailboxException;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
-import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.MailboxPath;
import org.apache.james.task.Task;
-import org.apache.james.user.memory.MemoryUsersRepository;
-import org.apache.mailet.base.MailAddressFixture;
-import org.apache.mailet.base.test.FakeMailContext;
import org.assertj.core.api.SoftAssertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
import com.google.common.base.Strings;
import com.google.common.io.Files;
@@ -84,7 +60,6 @@ class ExportServiceTest {
private static final String JAMES_HOST = "james-host";
private static final Domain DOMAIN = Domain.of("domain.tld");
- private static final Username BOB =
Username.fromLocalPartWithDomain("bob", DOMAIN);
private static final Username UNKNOWN_USER =
Username.fromLocalPartWithDomain("unknown", DOMAIN);
private static final String PASSWORD = "password";
private static final String CORRESPONDING_FILE_HEADER =
"corresponding-file";
@@ -98,53 +73,16 @@ class ExportServiceTest {
private static final BlobId.Factory FACTORY = new HashBlobId.Factory();
private ExportService testee;
- private InMemoryMailboxManager mailboxManager;
- private MailboxSession bobSession;
- private BlobStore blobStore;
- private FakeMailContext mailetContext;
+ private ExportServiceTestSystem testSystem;
@BeforeEach
void setUp(FileSystem fileSystem) throws Exception {
- mailboxManager =
InMemoryIntegrationResources.defaultResources().getMailboxManager();
- bobSession = mailboxManager.createSystemSession(BOB);
-
- MailboxBackup backup = createMailboxBackup();
- DNSService dnsService = createDnsService();
- blobStore = Mockito.spy(new MemoryBlobStore(FACTORY, new
MemoryDumbBlobStore()));
- mailetContext =
FakeMailContext.builder().postmaster(MailAddressFixture.POSTMASTER_AT_JAMES).build();
- BlobExportMechanism blobExport = new
LocalFileBlobExportMechanism(mailetContext, blobStore, fileSystem, dnsService,
- LocalFileBlobExportMechanism.Configuration.DEFAULT_CONFIGURATION);
- MemoryUsersRepository usersRepository =
createUsersRepository(dnsService);
-
- testee = new ExportService(backup, blobStore, blobExport,
usersRepository);
- }
-
- private MemoryUsersRepository createUsersRepository(DNSService dnsService)
throws Exception {
- MemoryDomainList domainList = new MemoryDomainList(dnsService);
- MemoryUsersRepository usersRepository =
MemoryUsersRepository.withVirtualHosting(domainList);
-
- domainList.addDomain(DOMAIN);
- usersRepository.addUser(BOB, PASSWORD);
- return usersRepository;
- }
-
- private DNSService createDnsService() throws UnknownHostException {
- InetAddress localHost = mock(InetAddress.class);
- when(localHost.getHostName()).thenReturn(JAMES_HOST);
- DNSService dnsService = mock(DNSService.class);
- when(dnsService.getLocalHost()).thenReturn(localHost);
- return dnsService;
- }
-
- private DefaultMailboxBackup createMailboxBackup() {
- ArchiveService archiveService = new Zipper();
- MailArchivesLoader archiveLoader = new ZipArchivesLoader();
- ZipMailArchiveRestorer archiveRestorer = new
ZipMailArchiveRestorer(mailboxManager, archiveLoader);
- return new DefaultMailboxBackup(mailboxManager, archiveService,
archiveRestorer);
+ testSystem = new ExportServiceTestSystem(fileSystem);
+ testee = new ExportService(testSystem.backup, testSystem.blobStore,
testSystem.blobExport, testSystem.usersRepository);
}
private String getFileUrl() throws MessagingException {
- return
mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
+ return
testSystem.mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
}
@Test
@@ -169,11 +107,11 @@ class ExportServiceTest {
private ComposedMessageId createAMailboxWithAMail(String message) throws
MailboxException {
MailboxPath bobInboxPath = MailboxPath.inbox(BOB);
- mailboxManager.createMailbox(bobInboxPath, bobSession);
- return mailboxManager.getMailbox(bobInboxPath, bobSession)
+ testSystem.mailboxManager.createMailbox(bobInboxPath,
testSystem.bobSession);
+ return testSystem.mailboxManager.getMailbox(bobInboxPath,
testSystem.bobSession)
.appendMessage(MessageManager.AppendCommand.builder()
.build(message),
- bobSession);
+ testSystem.bobSession);
}
@Test
@@ -246,10 +184,10 @@ class ExportServiceTest {
String blobId = fileName.substring(fileName.lastIndexOf("-") + 1);
SoftAssertions.assertSoftly(softly -> {
- assertThatThrownBy(() ->
blobStore.read(blobStore.getDefaultBucketName(), FACTORY.from(blobId)))
+ assertThatThrownBy(() ->
testSystem.blobStore.read(testSystem.blobStore.getDefaultBucketName(),
FACTORY.from(blobId)))
.isInstanceOf(ObjectNotFoundException.class);
- assertThatThrownBy(() ->
blobStore.read(blobStore.getDefaultBucketName(), FACTORY.from(blobId)))
- .hasMessage(String.format("blob '%s' not found in bucket
'%s'", blobId, blobStore.getDefaultBucketName().asString()));
+ assertThatThrownBy(() ->
testSystem.blobStore.read(testSystem.blobStore.getDefaultBucketName(),
FACTORY.from(blobId)))
+ .hasMessage(String.format("blob '%s' not found in bucket
'%s'", blobId, testSystem.blobStore.getDefaultBucketName().asString()));
});
}
@@ -258,7 +196,7 @@ class ExportServiceTest {
createAMailboxWithAMail(MESSAGE_CONTENT);
doReturn(Mono.error(new RuntimeException()))
- .when(blobStore)
+ .when(testSystem.blobStore)
.delete(any(), any());
Task.Result result = testee.export(BOB).block();
@@ -266,7 +204,7 @@ class ExportServiceTest {
String fileName = Files.getNameWithoutExtension(getFileUrl());
String blobId = fileName.substring(fileName.lastIndexOf("-") + 1);
- blobStore.read(blobStore.getDefaultBucketName(), FACTORY.from(blobId));
+ testSystem.blobStore.read(testSystem.blobStore.getDefaultBucketName(),
FACTORY.from(blobId));
assertThat(result).isEqualTo(Task.Result.COMPLETED);
}
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java
new file mode 100644
index 0000000..77049c9
--- /dev/null
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/ExportServiceTestSystem.java
@@ -0,0 +1,109 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.webadmin.service;
+
+import static org.mockito.Mockito.mock;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+import org.apache.james.blob.api.BlobId;
+import org.apache.james.blob.api.BlobStore;
+import org.apache.james.blob.api.HashBlobId;
+import org.apache.james.blob.export.api.BlobExportMechanism;
+import org.apache.james.blob.export.file.LocalFileBlobExportMechanism;
+import org.apache.james.blob.memory.MemoryBlobStore;
+import org.apache.james.blob.memory.MemoryDumbBlobStore;
+import org.apache.james.core.Domain;
+import org.apache.james.core.Username;
+import org.apache.james.dnsservice.api.DNSService;
+import org.apache.james.domainlist.memory.MemoryDomainList;
+import org.apache.james.filesystem.api.FileSystem;
+import org.apache.james.mailbox.MailboxSession;
+import org.apache.james.mailbox.backup.ArchiveService;
+import org.apache.james.mailbox.backup.DefaultMailboxBackup;
+import org.apache.james.mailbox.backup.MailArchivesLoader;
+import org.apache.james.mailbox.backup.MailboxBackup;
+import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
+import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
+import org.apache.james.mailbox.backup.zip.Zipper;
+import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
+import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
+import org.apache.james.user.memory.MemoryUsersRepository;
+import org.apache.mailet.base.MailAddressFixture;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.mockito.Mockito;
+
+public class ExportServiceTestSystem {
+
+ public static final Domain DOMAIN = Domain.of("domain.tld");
+ public static final Username BOB = Username.fromLocalPartWithDomain("bob",
DOMAIN);
+ public static final Username CEDRIC =
Username.fromLocalPartWithDomain("cedric", DOMAIN);
+ public static final String PASSWORD = "password";
+ private static final String JAMES_HOST = "james-host";
+ private static final BlobId.Factory FACTORY = new HashBlobId.Factory();
+
+ final FakeMailContext mailetContext;
+ final InMemoryMailboxManager mailboxManager;
+ final MemoryUsersRepository usersRepository;
+ final MailboxSession bobSession;
+ final BlobStore blobStore;
+ final MailboxBackup backup;
+ final BlobExportMechanism blobExport;
+
+ ExportServiceTestSystem(FileSystem fileSystem) throws Exception {
+ mailboxManager =
InMemoryIntegrationResources.defaultResources().getMailboxManager();
+ backup = createMailboxBackup();
+ DNSService dnsService = createDnsService();
+
+ usersRepository = createUsersRepository(dnsService);
+
+ bobSession = mailboxManager.createSystemSession(BOB);
+
+ blobStore = Mockito.spy(new MemoryBlobStore(FACTORY, new
MemoryDumbBlobStore()));
+ mailetContext =
FakeMailContext.builder().postmaster(MailAddressFixture.POSTMASTER_AT_JAMES).build();
+ blobExport = new LocalFileBlobExportMechanism(mailetContext,
blobStore, fileSystem, dnsService,
+ LocalFileBlobExportMechanism.Configuration.DEFAULT_CONFIGURATION);
+ }
+
+ private MemoryUsersRepository createUsersRepository(DNSService dnsService)
throws Exception {
+ MemoryDomainList domainList = new MemoryDomainList(dnsService);
+ MemoryUsersRepository usersRepository =
MemoryUsersRepository.withVirtualHosting(domainList);
+
+ domainList.addDomain(DOMAIN);
+ usersRepository.addUser(BOB, PASSWORD);
+ return usersRepository;
+ }
+
+ private DefaultMailboxBackup createMailboxBackup() {
+ ArchiveService archiveService = new Zipper();
+ MailArchivesLoader archiveLoader = new ZipArchivesLoader();
+ ZipMailArchiveRestorer archiveRestorer = new
ZipMailArchiveRestorer(mailboxManager, archiveLoader);
+ return new DefaultMailboxBackup(mailboxManager, archiveService,
archiveRestorer);
+ }
+
+ private DNSService createDnsService() throws UnknownHostException {
+ InetAddress localHost = mock(InetAddress.class);
+ Mockito.when(localHost.getHostName()).thenReturn(JAMES_HOST);
+ DNSService dnsService = mock(DNSService.class);
+ Mockito.when(dnsService.getLocalHost()).thenReturn(localHost);
+ return dnsService;
+ }
+}
diff --git
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
index 3eb81ed..76d3b9d 100644
---
a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
+++
b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/service/MailboxesExportRequestToTaskTest.java
@@ -23,40 +23,20 @@ import static io.restassured.RestAssured.given;
import static io.restassured.RestAssured.when;
import static io.restassured.RestAssured.with;
import static org.apache.james.mailbox.DefaultMailboxes.INBOX;
+import static org.apache.james.webadmin.service.ExportServiceTestSystem.BOB;
+import static org.apache.james.webadmin.service.ExportServiceTestSystem.CEDRIC;
+import static
org.apache.james.webadmin.service.ExportServiceTestSystem.PASSWORD;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Mockito.mock;
import java.io.FileInputStream;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
import java.util.Optional;
-import org.apache.james.blob.api.BlobId;
-import org.apache.james.blob.api.BlobStore;
-import org.apache.james.blob.api.HashBlobId;
-import org.apache.james.blob.export.api.BlobExportMechanism;
import org.apache.james.blob.export.file.FileSystemExtension;
-import org.apache.james.blob.export.file.LocalFileBlobExportMechanism;
-import org.apache.james.blob.memory.MemoryBlobStore;
-import org.apache.james.blob.memory.MemoryDumbBlobStore;
-import org.apache.james.core.Domain;
-import org.apache.james.core.Username;
-import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.domainlist.memory.MemoryDomainList;
import org.apache.james.filesystem.api.FileSystem;
import org.apache.james.mailbox.MailboxSession;
import org.apache.james.mailbox.MessageManager;
-import org.apache.james.mailbox.backup.ArchiveService;
-import org.apache.james.mailbox.backup.DefaultMailboxBackup;
-import org.apache.james.mailbox.backup.MailArchivesLoader;
-import org.apache.james.mailbox.backup.MailboxBackup;
import org.apache.james.mailbox.backup.ZipAssert;
-import org.apache.james.mailbox.backup.ZipMailArchiveRestorer;
-import org.apache.james.mailbox.backup.zip.ZipArchivesLoader;
-import org.apache.james.mailbox.backup.zip.Zipper;
-import org.apache.james.mailbox.inmemory.InMemoryMailboxManager;
-import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources;
import org.apache.james.mailbox.model.ComposedMessageId;
import org.apache.james.mailbox.model.MailboxId;
import org.apache.james.mailbox.model.MailboxPath;
@@ -64,7 +44,6 @@ import org.apache.james.task.Hostname;
import org.apache.james.task.MemoryTaskManager;
import org.apache.james.task.TaskManager;
import org.apache.james.user.api.UsersRepository;
-import org.apache.james.user.memory.MemoryUsersRepository;
import org.apache.james.webadmin.Routes;
import org.apache.james.webadmin.WebAdminServer;
import org.apache.james.webadmin.WebAdminUtils;
@@ -72,14 +51,11 @@ import org.apache.james.webadmin.routes.TasksRoutes;
import org.apache.james.webadmin.tasks.TaskFromRequestRegistry;
import org.apache.james.webadmin.utils.ErrorResponder;
import org.apache.james.webadmin.utils.JsonTransformer;
-import org.apache.mailet.base.MailAddressFixture;
-import org.apache.mailet.base.test.FakeMailContext;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mockito;
import io.restassured.RestAssured;
import io.restassured.filter.log.LogDetail;
@@ -115,48 +91,26 @@ class MailboxesExportRequestToTaskTest {
}
private static final String BASE_PATH = "users/:username/mailboxes";
- private static final String JAMES_HOST = "james-host";
- private static final Domain DOMAIN = Domain.of("domain.tld");
private static final String CORRESPONDING_FILE_HEADER =
"corresponding-file";
- private static final Username BOB =
Username.fromLocalPartWithDomain("bob", DOMAIN);
- private static final Username CEDRIC =
Username.fromLocalPartWithDomain("cedric", DOMAIN);
- private static final String PASSWORD = "password";
- private static final BlobId.Factory FACTORY = new HashBlobId.Factory();
private static final String MESSAGE_CONTENT = "header: value\n" +
"\n" +
"body";
- private FakeMailContext mailetContext;
private WebAdminServer webAdminServer;
private MemoryTaskManager taskManager;
- private InMemoryMailboxManager mailboxManager;
- private MemoryUsersRepository usersRepository;
- private MailboxSession bobSession;
- private BlobStore blobStore;
+ private ExportServiceTestSystem testSystem;
@BeforeEach
void setUp(FileSystem fileSystem) throws Exception {
- JsonTransformer jsonTransformer = new JsonTransformer();
+ testSystem = new ExportServiceTestSystem(fileSystem);
taskManager = new MemoryTaskManager(new Hostname("foo"));
- mailboxManager =
InMemoryIntegrationResources.defaultResources().getMailboxManager();
- MailboxBackup backup = createMailboxBackup();
- DNSService dnsService = createDnsService();
-
- usersRepository = createUsersRepository(dnsService);
-
- bobSession = mailboxManager.createSystemSession(BOB);
-
- blobStore = new MemoryBlobStore(FACTORY, new MemoryDumbBlobStore());
- mailetContext =
FakeMailContext.builder().postmaster(MailAddressFixture.POSTMASTER_AT_JAMES).build();
- BlobExportMechanism blobExport = new
LocalFileBlobExportMechanism(mailetContext, blobStore, fileSystem, dnsService,
- LocalFileBlobExportMechanism.Configuration.DEFAULT_CONFIGURATION);
-
+ JsonTransformer jsonTransformer = new JsonTransformer();
webAdminServer = WebAdminUtils.createWebAdminServer(
new TasksRoutes(taskManager, jsonTransformer),
new ExportRoutes(
- new ExportService(backup, blobStore, blobExport,
usersRepository),
- taskManager, usersRepository))
+ new ExportService(testSystem.backup, testSystem.blobStore,
testSystem.blobExport, testSystem.usersRepository),
+ taskManager, testSystem.usersRepository))
.start();
RestAssured.requestSpecification =
WebAdminUtils.buildRequestSpecification(webAdminServer)
@@ -165,30 +119,6 @@ class MailboxesExportRequestToTaskTest {
.build();
}
- private MemoryUsersRepository createUsersRepository(DNSService dnsService)
throws Exception {
- MemoryDomainList domainList = new MemoryDomainList(dnsService);
- MemoryUsersRepository usersRepository =
MemoryUsersRepository.withVirtualHosting(domainList);
-
- domainList.addDomain(DOMAIN);
- usersRepository.addUser(BOB, PASSWORD);
- return usersRepository;
- }
-
- private DefaultMailboxBackup createMailboxBackup() {
- ArchiveService archiveService = new Zipper();
- MailArchivesLoader archiveLoader = new ZipArchivesLoader();
- ZipMailArchiveRestorer archiveRestorer = new
ZipMailArchiveRestorer(mailboxManager, archiveLoader);
- return new DefaultMailboxBackup(mailboxManager, archiveService,
archiveRestorer);
- }
-
- private DNSService createDnsService() throws UnknownHostException {
- InetAddress localHost = mock(InetAddress.class);
- Mockito.when(localHost.getHostName()).thenReturn(JAMES_HOST);
- DNSService dnsService = mock(DNSService.class);
- Mockito.when(dnsService.getLocalHost()).thenReturn(localHost);
- return dnsService;
- }
-
@AfterEach
void afterEach() {
webAdminServer.destroy();
@@ -300,14 +230,14 @@ class MailboxesExportRequestToTaskTest {
.jsonPath()
.get("taskId");
- String fileUrl =
mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
+ String fileUrl =
testSystem.mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
ZipAssert.assertThatZip(new FileInputStream(fileUrl))
.hasNoEntry();
}
@Test
void exportMailboxesShouldCompleteWhenUserHasNoMessage() throws Exception {
- mailboxManager.createMailbox(MailboxPath.inbox(BOB), bobSession);
+ testSystem.mailboxManager.createMailbox(MailboxPath.inbox(BOB),
testSystem.bobSession);
String taskId = with()
.queryParam("action", "export")
@@ -331,7 +261,7 @@ class MailboxesExportRequestToTaskTest {
@Test
void exportMailboxesShouldProduceAZipFileWhenUserHasNoMessage() throws
Exception {
- mailboxManager.createMailbox(MailboxPath.inbox(BOB), bobSession);
+ testSystem.mailboxManager.createMailbox(MailboxPath.inbox(BOB),
testSystem.bobSession);
String taskId = with()
.queryParam("action", "export")
@@ -344,7 +274,7 @@ class MailboxesExportRequestToTaskTest {
.when()
.get(taskId + "/await");
- String fileUrl =
mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
+ String fileUrl =
testSystem.mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
ZipAssert.assertThatZip(new FileInputStream(fileUrl))
.containsOnlyEntriesMatching(
ZipAssert.EntryChecks.hasName(INBOX + "/").isDirectory());
@@ -352,12 +282,12 @@ class MailboxesExportRequestToTaskTest {
@Test
void exportMailboxesShouldCompleteWhenUserHasMessage() throws Exception {
- MailboxId bobInboxboxId =
mailboxManager.createMailbox(MailboxPath.inbox(BOB), bobSession)
+ MailboxId bobInboxboxId =
testSystem.mailboxManager.createMailbox(MailboxPath.inbox(BOB),
testSystem.bobSession)
.get();
- mailboxManager.getMailbox(bobInboxboxId, bobSession).appendMessage(
+ testSystem.mailboxManager.getMailbox(bobInboxboxId,
testSystem.bobSession).appendMessage(
MessageManager.AppendCommand.builder().build("header:
value\r\n\r\nbody"),
- bobSession);
+ testSystem.bobSession);
String taskId = with()
.queryParam("action", "export")
@@ -381,12 +311,12 @@ class MailboxesExportRequestToTaskTest {
@Test
void exportMailboxesShouldProduceAZipFileWhenUserHasMessage() throws
Exception {
- MailboxId bobInboxboxId =
mailboxManager.createMailbox(MailboxPath.inbox(BOB), bobSession)
+ MailboxId bobInboxboxId =
testSystem.mailboxManager.createMailbox(MailboxPath.inbox(BOB),
testSystem.bobSession)
.get();
- ComposedMessageId id = mailboxManager.getMailbox(bobInboxboxId,
bobSession).appendMessage(
+ ComposedMessageId id =
testSystem.mailboxManager.getMailbox(bobInboxboxId,
testSystem.bobSession).appendMessage(
MessageManager.AppendCommand.builder().build(MESSAGE_CONTENT),
- bobSession);
+ testSystem.bobSession);
String taskId = with()
.queryParam("action", "export")
@@ -399,7 +329,7 @@ class MailboxesExportRequestToTaskTest {
.when()
.get(taskId + "/await");
- String fileUrl =
mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
+ String fileUrl =
testSystem.mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
ZipAssert.assertThatZip(new FileInputStream(fileUrl))
.containsOnlyEntriesMatching(
ZipAssert.EntryChecks.hasName(INBOX + "/").isDirectory(),
@@ -408,17 +338,17 @@ class MailboxesExportRequestToTaskTest {
@Test
void exportMailboxesShouldBeUserBound() throws Exception {
- MailboxId bobInboxboxId =
mailboxManager.createMailbox(MailboxPath.inbox(BOB), bobSession)
+ MailboxId bobInboxboxId =
testSystem.mailboxManager.createMailbox(MailboxPath.inbox(BOB),
testSystem.bobSession)
.get();
- ComposedMessageId id = mailboxManager.getMailbox(bobInboxboxId,
bobSession).appendMessage(
+ ComposedMessageId id =
testSystem.mailboxManager.getMailbox(bobInboxboxId,
testSystem.bobSession).appendMessage(
MessageManager.AppendCommand.builder().build(MESSAGE_CONTENT),
- bobSession);
+ testSystem.bobSession);
- usersRepository.addUser(CEDRIC, PASSWORD);
- MailboxSession cedricSession =
mailboxManager.createSystemSession(CEDRIC);
- Optional<MailboxId> mailboxIdCedric =
mailboxManager.createMailbox(MailboxPath.inbox(CEDRIC), cedricSession);
- mailboxManager.getMailbox(mailboxIdCedric.get(),
cedricSession).appendMessage(
+ testSystem.usersRepository.addUser(CEDRIC, PASSWORD);
+ MailboxSession cedricSession =
testSystem.mailboxManager.createSystemSession(CEDRIC);
+ Optional<MailboxId> mailboxIdCedric =
testSystem.mailboxManager.createMailbox(MailboxPath.inbox(CEDRIC),
cedricSession);
+ testSystem.mailboxManager.getMailbox(mailboxIdCedric.get(),
cedricSession).appendMessage(
MessageManager.AppendCommand.builder().build(MESSAGE_CONTENT +
CEDRIC.asString()),
cedricSession);
@@ -433,7 +363,7 @@ class MailboxesExportRequestToTaskTest {
.when()
.get(taskId + "/await");
- String fileUrl =
mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
+ String fileUrl =
testSystem.mailetContext.getSentMails().get(0).getMsg().getHeader(CORRESPONDING_FILE_HEADER)[0];
ZipAssert.assertThatZip(new FileInputStream(fileUrl))
.containsOnlyEntriesMatching(
ZipAssert.EntryChecks.hasName(INBOX + "/").isDirectory(),
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
