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 ad...@apache.org on 2017/11/29 14:23:35 UTC
[4/5] james-project git commit: JAMES-2237 display size with
appropriate unit in bouncing mail
JAMES-2237 display size with appropriate unit in bouncing mail
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0c5985b1
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0c5985b1
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0c5985b1
Branch: refs/heads/master
Commit: 0c5985b12f0734ef9d38b7fa3b4658afba875938
Parents: bda8373
Author: Luc DUZAN <ld...@linagora.com>
Authored: Mon Nov 27 14:17:33 2017 +0100
Committer: Luc DUZAN <ld...@linagora.com>
Committed: Wed Nov 29 15:20:33 2017 +0100
----------------------------------------------------------------------
.../mailets/redirect/NotifyMailetsMessage.java | 3 +-
.../redirect/NotifyMailetsMessageTest.java | 37 +++++++++++++++-----
2 files changed, 30 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c5985b1/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java
index 5f02575..edb7d11 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessage.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
+import org.apache.james.transport.util.SizeUtils;
import org.apache.mailet.Mail;
import org.apache.james.core.MailAddress;
import org.apache.mailet.base.RFC2822Headers;
@@ -78,7 +79,7 @@ public class NotifyMailetsMessage {
appendAddresses(builder, "To", message.getHeader(RFC2822Headers.TO));
appendAddresses(builder, "CC", message.getHeader(RFC2822Headers.CC));
- builder.append(" Size (in bytes): " + message.getSize())
+ builder.append(" Size: " + SizeUtils.humanReadableSize(message.getSize()))
.append(LINE_BREAK);
if (message.getLineCount() >= 0) {
builder.append(" Number of lines: " + message.getLineCount())
http://git-wip-us.apache.org/repos/asf/james-project/blob/0c5985b1/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java
index 0619cf8..37f7b60 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/mailets/redirect/NotifyMailetsMessageTest.java
@@ -22,6 +22,7 @@ package org.apache.james.transport.mailets.redirect;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayInputStream;
+import java.util.Collections;
import java.util.Properties;
import java.util.TimeZone;
@@ -68,7 +69,7 @@ public class NotifyMailetsMessageTest {
"\n" +
"Message details:\n" +
" MAIL FROM: user@james.org\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -86,7 +87,7 @@ public class NotifyMailetsMessageTest {
"\n" +
"Message details:\n" +
" MAIL FROM: null\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -102,7 +103,7 @@ public class NotifyMailetsMessageTest {
"Message details:\n" +
" Subject: my subject\n" +
" MAIL FROM: null\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -118,7 +119,7 @@ public class NotifyMailetsMessageTest {
"Message details:\n" +
" Sent date: Thu Sep 08 14:25:52 UTC 2016\n" +
" MAIL FROM: null\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -135,7 +136,7 @@ public class NotifyMailetsMessageTest {
" MAIL FROM: null\n" +
" RCPT TO: user@james.org\n" +
" user2@james.org\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -153,7 +154,7 @@ public class NotifyMailetsMessageTest {
" From: \n" +
"user@james.org \n" +
"\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -172,7 +173,7 @@ public class NotifyMailetsMessageTest {
"user@james.org \n" +
"user2@james.org \n" +
"\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -191,7 +192,7 @@ public class NotifyMailetsMessageTest {
"user@james.org \n" +
"user2@james.org \n" +
"\n" +
- " Size (in bytes): -1\n");
+ " Size: -1 B\n");
}
@Test
@@ -209,6 +210,24 @@ public class NotifyMailetsMessageTest {
"\n" +
"Message details:\n" +
" MAIL FROM: null\n" +
- " Size (in bytes): 6\n");
+ " Size: 6 B\n");
+ }
+
+ @Test
+ public void generateMessageShouldSpecifySizeInAReadableWay() throws Exception {
+ String content = "MIME-Version: 1.0\r\n" +
+ "Content-Type: text/plain; charset=utf-8\r\n" +
+ "\r\n" +
+ String.join("", Collections.nCopies(1000, "test\r\n"));
+ MimeMessage message = new MimeMessage(Session.getDefaultInstance(new Properties()), new ByteArrayInputStream(content.getBytes()));
+ FakeMail mail = FakeMail.from(message);
+
+ String generateMessage = new NotifyMailetsMessage().generateMessage("my message", mail);
+
+ assertThat(generateMessage).isEqualTo("my message\n" +
+ "\n" +
+ "Message details:\n" +
+ " MAIL FROM: null\n" +
+ " Size: 5.9 KiB\n");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org