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/05/31 06:58:26 UTC
[3/5] james-project git commit: JAMES-2034 do not invent Date header
when there are no date header
JAMES-2034 do not invent Date header when there are no date header
Unfortunatly, the fix of this PR is not enough to fix this bug because of an
issue in apache-james-mime4j (see https://issues.apache.org/jira/browse/MIME4J-262)
This is for this reason that this commit introduce @Ignore on unit test. Those
ignore will be fixed one a commit that introduce a new version of mime4j
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d76e3c07
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d76e3c07
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d76e3c07
Branch: refs/heads/master
Commit: d76e3c07897176118d332b4f3a33c4ed5d61bfbd
Parents: 9505324
Author: Luc DUZAN <ld...@linagora.com>
Authored: Wed May 24 17:29:52 2017 +0200
Committer: benwa <bt...@linagora.com>
Committed: Wed May 31 13:56:58 2017 +0700
----------------------------------------------------------------------
.../java/org/apache/james/jmap/model/MessageFactory.java | 1 -
.../org/apache/james/jmap/model/MessageFactoryTest.java | 10 +++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d76e3c07/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 5c16b8a..c99c371 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
@@ -138,7 +138,6 @@ public class MessageFactory {
.create()
.use(MIME_ENTITY_CONFIG)
.parse(message.getContent())
- .setDate(message.getInternalDate(), TimeZone.getTimeZone(UTC_ZONE_ID))
.build();
} catch (IOException e) {
throw new MailboxException("Unable to parse message: " + e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/james-project/blob/d76e3c07/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 992c6ab..a976feb 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
@@ -43,6 +43,7 @@ import org.apache.james.mailbox.model.TestMessageId;
import org.apache.james.mailbox.tika.extractor.TikaTextExtractor;
import org.apache.james.util.mime.MessageContentExtractor;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import com.google.common.base.Charsets;
@@ -68,7 +69,9 @@ public class MessageFactoryTest {
messageFactory = new MessageFactory(messagePreview, messageContentExtractor, htmlTextExtractor);
}
+
@Test
+ @Ignore
public void emptyMailShouldBeLoadedIntoMessage() throws Exception {
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -84,7 +87,7 @@ public class MessageFactoryTest {
Message testee = messageFactory.fromMetaDataWithContent(testMail);
assertThat(testee)
.extracting(Message::getPreview, Message::getSize, Message::getSubject, Message::getHeaders, Message::getDate)
- .containsExactly("(Empty)", 0L, "", ImmutableMap.of("Date", "Tue, 14 Jul 2015 12:30:42 +0000", "MIME-Version", "1.0"), ZONED_DATE);
+ .containsExactly("(Empty)", 0L, "", ImmutableMap.of("MIME-Version", "1.0"), ZONED_DATE);
}
@Test
@@ -110,6 +113,7 @@ public class MessageFactoryTest {
}
@Test
+ @Ignore
public void headersShouldBeSetIntoMessage() throws Exception {
String headers = "From: user <us...@domain>\n"
+ "Subject: test subject\n"
@@ -145,7 +149,6 @@ public class MessageFactoryTest {
.put("Reply-To", "\"user to reply to\" <us...@domain>")
.put("In-Reply-To", "<SN...@phx.gbl>")
.put("Other-header", "other header value")
- .put("Date", "Tue, 14 Jul 2015 12:30:42 +0000")
.put("MIME-Version", "1.0")
.build();
Message testee = messageFactory.fromMetaDataWithContent(testMail);
@@ -338,6 +341,7 @@ public class MessageFactoryTest {
}
@Test
+ @Ignore
public void mailWithBigLinesShouldBeLoadedIntoMessage() throws Exception {
MetaDataWithContent testMail = MetaDataWithContent.builder()
.uid(MessageUid.of(2))
@@ -353,7 +357,7 @@ public class MessageFactoryTest {
Message testee = messageFactory.fromMetaDataWithContent(testMail);
assertThat(testee)
.extracting(Message::getPreview, Message::getSize, Message::getSubject, Message::getHeaders, Message::getDate)
- .containsExactly("(Empty)", 1010L, "", ImmutableMap.of("Date", "Tue, 14 Jul 2015 12:30:42 +0000", "MIME-Version", "1.0"), ZONED_DATE);
+ .containsExactly("(Empty)", 1010L, "", ImmutableMap.of("MIME-Version", "1.0"), ZONED_DATE);
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org