james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [6/6] james-project git commit: JAMES-1900 Enable header unscrambling testing with JSieve
Date Tue, 06 Jun 2017 02:04:29 GMT
JAMES-1900 Enable header unscrambling testing with JSieve


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

Branch: refs/heads/master
Commit: 747e671547cdb99b4d26774021b89fc9e4addc8c
Parents: f832b99
Author: benwa <btellier@linagora.com>
Authored: Fri May 5 17:06:49 2017 +0700
Committer: benwa <btellier@linagora.com>
Committed: Mon Jun 5 21:18:39 2017 +0700

----------------------------------------------------------------------
 .../james/transport/mailets/delivery/SieveIntegrationTest.java    | 2 --
 .../src/main/java/org/apache/james/jmap/model/MessageFactory.java | 2 --
 .../test/java/org/apache/james/jmap/model/MessageFactoryTest.java | 3 +--
 3 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/747e6715/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
index 8d7c43b..3d26130 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/delivery/SieveIntegrationTest.java
@@ -44,7 +44,6 @@ import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 
@@ -265,7 +264,6 @@ public class SieveIntegrationTest {
         assertThat(mail.getAttribute(MailStore.DELIVERY_PATH_PREFIX + LOCAL_PART)).isEqualTo(expressMailboxNameWithSlash(NOT_SELECTED_MAILBOX.getName()));
     }
 
-    @Ignore("Waiting for JAMES-1900 JSieve part to be merged")
     @Test
     public void headerInstructionShouldSupportFoldedEncodedHeaders() throws Exception {
         prepareTestUsingScript("org/apache/james/transport/mailets/delivery/headerEncodedFolded.script");

http://git-wip-us.apache.org/repos/asf/james-project/blob/747e6715/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
index e39e78e..18f4695 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/model/MessageFactory.java
@@ -71,8 +71,6 @@ public class MessageFactory {
         .setMaxLineLen(-1)
         .build();
 
-    private static final ZoneId UTC_ZONE_ID = ZoneId.of("Z");
-
     private final MessagePreviewGenerator messagePreview;
     private final MessageContentExtractor messageContentExtractor;
     private final HtmlTextExtractor htmlTextExtractor;

http://git-wip-us.apache.org/repos/asf/james-project/blob/747e6715/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
index 5076774..bd08b57 100644
--- a/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
+++ b/server/protocols/jmap/src/test/java/org/apache/james/jmap/model/MessageFactoryTest.java
@@ -195,7 +195,6 @@ public class MessageFactoryTest {
             .put("Subject", "test subject")
             .put("From", "user <user@domain>")
             .put("To", "user1 <user1@domain>, user2 <user2@domain>")
-            .put("Date", "Tue, 14 Jul 2015 12:30:42 +0000")
             .put("MIME-Version", "1.0")
             .build();
         Message testee = messageFactory.fromMetaDataWithContent(testMail);
@@ -209,7 +208,7 @@ public class MessageFactoryTest {
             .to(ImmutableList.of(user1, user2))
             .cc(ImmutableList.of(usercc))
             .subject("test subject")
-            .date(ZONED_DATE)
+            .date(Instant.parse("2012-02-03T14:30:42.000Z"))
             .size(headers.length())
             .preview("(Empty)")
             .textBody(Optional.of(""))


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


Mime
View raw message