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 da9ad591ed06a698d6457f530c81cebbd3d19a60 Author: Rene Cordier <[email protected]> AuthorDate: Thu Nov 21 15:02:21 2019 +0700 JAMES-2987 Get rid of mocks in MessageFullViewFactoryTest --- .../model/message/view/MessageFullViewFactoryTest.java | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java index 40f375b..a19e46a 100644 --- a/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java +++ b/server/protocols/jmap-draft/src/test/java/org/apache/james/jmap/draft/model/message/view/MessageFullViewFactoryTest.java @@ -19,9 +19,6 @@ package org.apache.james.jmap.draft.model.message.view; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; import java.io.ByteArrayInputStream; import java.nio.charset.StandardCharsets; @@ -39,13 +36,12 @@ import org.apache.james.jmap.draft.model.Number; import org.apache.james.jmap.draft.model.message.view.MessageFullViewFactory.MetaDataWithContent; import org.apache.james.jmap.draft.utils.HtmlTextExtractor; import org.apache.james.jmap.draft.utils.JsoupHtmlTextExtractor; -import org.apache.james.mailbox.BlobManager; import org.apache.james.mailbox.MessageUid; import org.apache.james.mailbox.inmemory.InMemoryId; +import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; import org.apache.james.mailbox.model.AttachmentId; import org.apache.james.mailbox.model.Cid; import org.apache.james.mailbox.model.MessageAttachment; -import org.apache.james.mailbox.model.MessageId; import org.apache.james.mailbox.model.TestMessageId; import org.apache.james.util.mime.MessageContentExtractor; import org.junit.jupiter.api.BeforeEach; @@ -68,9 +64,9 @@ class MessageFullViewFactoryTest { MessagePreviewGenerator messagePreview = new MessagePreviewGenerator(); MessageContentExtractor messageContentExtractor = new MessageContentExtractor(); - BlobManager blobManager = mock(BlobManager.class); - when(blobManager.toBlobId(any(MessageId.class))).thenReturn(org.apache.james.mailbox.model.BlobId.fromString("blobId")); - messageFullViewFactory = new MessageFullViewFactory(blobManager, messagePreview, messageContentExtractor, htmlTextExtractor); + InMemoryIntegrationResources resources = InMemoryIntegrationResources.defaultResources(); + + messageFullViewFactory = new MessageFullViewFactory(resources.getBlobManager(), messagePreview, messageContentExtractor, htmlTextExtractor); } @Test @@ -155,7 +151,7 @@ class MessageFullViewFactoryTest { MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); MessageFullView expected = MessageFullView.builder() .id(TestMessageId.of(2)) - .blobId(BlobId.of("blobId")) + .blobId(BlobId.of("2")) .threadId("2") .mailboxId(MAILBOX_ID) .inReplyToMessageId("<[email protected]>") @@ -209,7 +205,7 @@ class MessageFullViewFactoryTest { MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); MessageFullView expected = MessageFullView.builder() .id(TestMessageId.of(2)) - .blobId(BlobId.of("blobId")) + .blobId(BlobId.of("2")) .threadId("2") .mailboxId(MAILBOX_ID) .headers(headersMap) @@ -259,7 +255,7 @@ class MessageFullViewFactoryTest { MessageFullView testee = messageFullViewFactory.fromMetaDataWithContent(testMail); MessageFullView expected = MessageFullView.builder() .id(TestMessageId.of(2)) - .blobId(BlobId.of("blobId")) + .blobId(BlobId.of("2")) .threadId("2") .mailboxId(MAILBOX_ID) .headers(headersMap) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
