JAMES-2242 Memory mail queue should preserve mail names This is for instance enforced in AbstractJMSMailQueueTest
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/70ec6ca8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/70ec6ca8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/70ec6ca8 Branch: refs/heads/master Commit: 70ec6ca8a6efb98093d0a343ace7370315669342 Parents: 4936fb0 Author: benwa <btell...@linagora.com> Authored: Thu Nov 30 14:42:20 2017 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Mon Dec 4 14:42:21 2017 +0100 ---------------------------------------------------------------------- .../modules/server/MemoryMailQueueFactory.java | 1 + .../james/server/MemoryMailQueueFactoryTest.java | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/70ec6ca8/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueFactory.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueFactory.java b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueFactory.java index 5918d5b..957c934 100644 --- a/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueFactory.java +++ b/server/container/guice/memory-guice/src/main/java/org/apache/james/modules/server/MemoryMailQueueFactory.java @@ -88,6 +88,7 @@ public class MemoryMailQueueFactory implements MailQueueFactory { private Mail cloneMail(Mail mail) throws MessagingException { MailImpl mailImpl = MailImpl.duplicate(mail); + mailImpl.setName(mail.getName()); mailImpl.setState(mail.getState()); Optional.ofNullable(mail.getMessage()) .ifPresent(Throwing.consumer(message -> mailImpl.setMessage(new MimeMessage(message)))); http://git-wip-us.apache.org/repos/asf/james-project/blob/70ec6ca8/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java b/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java index 62357bb..b236a84 100644 --- a/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java +++ b/server/container/guice/memory-guice/src/test/java/org/apache/james/server/MemoryMailQueueFactoryTest.java @@ -115,6 +115,22 @@ public class MemoryMailQueueFactoryTest { } @Test + public void dequeueShouldPreserveName() throws Exception{ + Mail mail = FakeMail.builder() + .name(NAME_1) + .build(); + memoryMailQueueFactory.getQueue(KEY).enQueue(mail); + + String newName = memoryMailQueueFactory + .getQueue(KEY) + .deQueue() + .getMail() + .getName(); + + assertThat(newName).isEqualTo(NAME_1); + } + + @Test public void dequeueShouldWorkWithMultipleMessages() throws Exception{ Mail mail1 = FakeMail.builder() .name(NAME_1) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
