[james-project] 20/37: JAMES-2997 Renable BlobTest AbstractMailboxManagerAttachmentTest

[btellier]

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 09c2ebb5037abdec25b7fb5dd33891395239b2f5
Author: Benoit Tellier <btell...@linagora.com>
AuthorDate: Mon Jan 20 10:22:50 2020 +0700

    JAMES-2997 Renable BlobTest AbstractMailboxManagerAttachmentTest
---
 .../cassandra/mail/CassandraMailboxManagerAttachmentTest.java    | 3 ---
 .../inmemory/mail/InMemoryMailboxManagerAttachmentTest.java      | 3 ---
 .../mailbox/store/AbstractMailboxManagerAttachmentTest.java      | 9 ++++-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
index 2e4821e..9ea857c 100644
--- 
a/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
+++ 
b/mailbox/cassandra/src/test/java/org/apache/james/mailbox/cassandra/mail/CassandraMailboxManagerAttachmentTest.java
@@ -56,7 +56,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 class CassandraMailboxManagerAttachmentTest extends 
AbstractMailboxManagerAttachmentTest {
-/*
     @RegisterExtension
     static CassandraClusterExtension cassandraCluster = new 
CassandraClusterExtension(MailboxAggregateModule.MODULE);
 
@@ -117,6 +116,4 @@ class CassandraMailboxManagerAttachmentTest extends 
AbstractMailboxManagerAttach
     protected AttachmentMapperFactory getAttachmentMapperFactory() {
         return mailboxSessionMapperFactory;
     }
-
- */
 }
diff --git 
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
 
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
index dcf5c69..0ea7f7b 100644
--- 
a/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
+++ 
b/mailbox/memory/src/test/java/org/apache/james/mailbox/inmemory/mail/InMemoryMailboxManagerAttachmentTest.java
@@ -35,7 +35,6 @@ import 
org.apache.james.mailbox.store.mail.model.impl.MessageParser;
 import org.junit.jupiter.api.BeforeEach;
 
 class InMemoryMailboxManagerAttachmentTest extends 
AbstractMailboxManagerAttachmentTest {
-/*
     InMemoryMailboxManager mailboxManager;
     InMemoryMailboxManager parseFailingMailboxManager;
 
@@ -80,6 +79,4 @@ class InMemoryMailboxManagerAttachmentTest extends 
AbstractMailboxManagerAttachm
     protected AttachmentMapperFactory getAttachmentMapperFactory() {
         return (AttachmentMapperFactory) mailboxManager.getMapperFactory();
     }
-
- */
 }
diff --git 
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
 
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
index a6c864d..ea6bef1 100644
--- 
a/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
+++ 
b/mailbox/store/src/test/java/org/apache/james/mailbox/store/AbstractMailboxManagerAttachmentTest.java
@@ -51,7 +51,6 @@ import com.github.fge.lambdas.Throwing;
 import com.google.common.collect.ImmutableList;
 
 public abstract class AbstractMailboxManagerAttachmentTest {
-/*
     private static final Username USERNAME = Username.of("u...@domain.tld");
 
     private MailboxManager mailboxManager;
@@ -130,7 +129,7 @@ public abstract class AbstractMailboxManagerAttachmentTest {
         assertThat(messages.hasNext()).isTrue();
         List<MessageAttachment> attachments = messages.next().getAttachments();
         assertThat(attachments).hasSize(1);
-        
assertThat(attachmentMapper.getAttachment(attachments.get(0).getAttachmentId()).getStream())
+        
assertThat(attachmentMapper.loadAttachmentContent(attachments.get(0).getAttachmentId()))
             
.hasSameContentAs(ClassLoader.getSystemResourceAsStream("eml/gimp.png"));
     }
 
@@ -161,7 +160,9 @@ public abstract class AbstractMailboxManagerAttachmentTest {
             .stream()
             .map(MessageAttachment::getAttachmentId)
             .map(Throwing.function(attachmentMapper::getAttachment))
-            .map(Attachment::getBytes)
+            .map(Attachment::getAttachmentId)
+            .map(Throwing.function(attachmentMapper::loadAttachmentContent))
+            .map(Throwing.function(IOUtils::toByteArray))
             .collect(ImmutableList.toImmutableList());
 
         ImmutableList<byte[]> files = Stream.of("eml/4037_014.jpg", 
"eml/4037_015.jpg")
@@ -199,7 +200,5 @@ public abstract class AbstractMailboxManagerAttachmentTest {
         List<MessageAttachment> attachments = messages.next().getAttachments();
         assertThat(attachments).hasSize(0);
     }
-
- */
 }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org