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 2017/01/24 01:26:21 UTC

[07/10] james-project git commit: MAILET-149 Solving ICS ordering issue

MAILET-149 Solving ICS ordering issue


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/03c8f69b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/03c8f69b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/03c8f69b

Branch: refs/heads/master
Commit: 03c8f69b209b2a0267bf390cb2ecd3e70c13c1d9
Parents: b1b4631
Author: Benoit Tellier <bt...@linagora.com>
Authored: Fri Jan 20 10:33:23 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Jan 23 16:19:24 2017 +0100

----------------------------------------------------------------------
 .../transport/mailets/ICSAttachmentWorkflowTest.java     | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/03c8f69b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
index a6b03e5..2a6ffe1 100644
--- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
+++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/ICSAttachmentWorkflowTest.java
@@ -41,7 +41,6 @@ import org.apache.mailet.base.test.FakeMail;
 import org.apache.mailet.base.test.MimeMessageBuilder;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -417,7 +416,6 @@ public class ICSAttachmentWorkflowTest {
         }
     }
 
-    @Ignore("See JIRA issue MAILET-151")
     @Test
     public void headersShouldBeFilledOnlyWithOneICalAttachmentWhenMailHasSeveral() throws Exception {
         MimeMessage messageWithThreeICSAttached = MimeMessageBuilder.mimeMessageBuilder()
@@ -427,17 +425,17 @@ public class ICSAttachmentWorkflowTest {
                     .build(),
                 MimeMessageBuilder.bodyPartBuilder()
                     .data(ICS_1.getBytes(Charsets.UTF_8))
-                    .filename("test.txt")
+                    .filename("test1.txt")
                     .disposition("attachment")
                     .build(),
                 MimeMessageBuilder.bodyPartBuilder()
                     .data(ICS_2.getBytes(Charsets.UTF_8))
-                    .filename("test.txt")
+                    .filename("test2.txt")
                     .disposition("attachment")
                     .build(),
                 MimeMessageBuilder.bodyPartBuilder()
                     .data(ICS_3.getBytes(Charsets.UTF_8))
-                    .filename("test.txt")
+                    .filename("test3.txt")
                     .disposition("attachment")
                     .build())
             .setSubject("test")
@@ -456,8 +454,7 @@ public class ICSAttachmentWorkflowTest {
             calmlyAwait.atMost(Duration.ONE_MINUTE).until(() -> imapMessageReader.userReceivedMessage(RECIPIENT, PASSWORD));
 
             String receivedHeaders = imapMessageReader.readFirstMessageHeadersInInbox(RECIPIENT, PASSWORD);
-            
-            //Here only the third ICal attachment is used to fill headers
+
             assertThat(receivedHeaders).contains("X-MEETING-UID: " + ICS_UID);
             assertThat(receivedHeaders).contains("X-MEETING-METHOD: " + ICS_METHOD);
             assertThat(receivedHeaders).contains("X-MEETING-SEQUENCE: " + ICS_SEQUENCE);


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