JAMES-2285 FakeMail should handle remoteHost
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/eeae0a05 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/eeae0a05 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/eeae0a05 Branch: refs/heads/master Commit: eeae0a05c67eff204745b70599abc7d06adb52ac Parents: 8f197a4 Author: benwa <[email protected]> Authored: Thu Jan 11 16:09:26 2018 +0700 Committer: benwa <[email protected]> Committed: Mon Jan 15 17:04:03 2018 +0700 ---------------------------------------------------------------------- .../org/apache/mailet/base/test/FakeMail.java | 21 ++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/eeae0a05/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java ---------------------------------------------------------------------- diff --git a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java index 04530a8..31e65c2 100644 --- a/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java +++ b/mailet/base/src/test/java/org/apache/mailet/base/test/FakeMail.java @@ -56,6 +56,9 @@ import com.google.common.collect.Maps; public class FakeMail implements Mail { + private static final String DEFAULT_REMOTE_HOST = "111.222.333.444"; + public static final String DEFAULT_REMOTE_ADDRESS = "127.0.0.1"; + public static FakeMail fromMessage(MimeMessageBuilder message) throws MessagingException { return FakeMail.builder() .mimeMessage(message) @@ -82,7 +85,8 @@ public class FakeMail implements Mail { mail.getLastUpdated(), attributes(mail), mail.getMessageSize(), - mail.getRemoteAddr()); + mail.getRemoteAddr(), + mail.getRemoteHost()); } public static FakeMail from(MimeMessage message) throws MessagingException { @@ -108,6 +112,7 @@ public class FakeMail implements Mail { private Map<String, Serializable> attributes; private Optional<Long> size; private Optional<String> remoteAddr; + private Optional<String> remoteHost; private Builder() { fileName = Optional.empty(); @@ -121,6 +126,7 @@ public class FakeMail implements Mail { attributes = Maps.newHashMap(); size = Optional.empty(); remoteAddr = Optional.empty(); + remoteHost = Optional.empty(); } public Builder size(long size) { @@ -214,9 +220,14 @@ public class FakeMail implements Mail { return this; } + public Builder remoteHost(String remoteHost) { + this.remoteHost = Optional.of(remoteHost); + return this; + } + public FakeMail build() throws MessagingException { return new FakeMail(getMimeMessage(), recipients, name.orElse(null), sender.orElse(null), state.orElse(null), errorMessage.orElse(null), lastUpdated.orElse(null), - attributes, size.orElse(0L), remoteAddr.orElse("127.0.0.1")); + attributes, size.orElse(0L), remoteAddr.orElse(DEFAULT_REMOTE_ADDRESS), remoteHost.orElse(DEFAULT_REMOTE_HOST)); } private MimeMessage getMimeMessage() throws MessagingException { @@ -250,10 +261,11 @@ public class FakeMail implements Mail { private Map<String, Serializable> attributes; private long size; private String remoteAddr; + private String remoteHost; private PerRecipientHeaders perRecipientHeaders; public FakeMail(MimeMessage msg, List<MailAddress> recipients, String name, MailAddress sender, String state, String errorMessage, Date lastUpdated, - Map<String, Serializable> attributes, long size, String remoteAddr) { + Map<String, Serializable> attributes, long size, String remoteAddr, String remoteHost) { this.msg = msg; this.recipients = recipients; this.name = name; @@ -265,6 +277,7 @@ public class FakeMail implements Mail { this.size = size; this.remoteAddr = remoteAddr; this.perRecipientHeaders = new PerRecipientHeaders(); + this.remoteHost = remoteHost; } @Override @@ -304,7 +317,7 @@ public class FakeMail implements Mail { @Override public String getRemoteHost() { - return "111.222.333.444"; + return remoteHost; } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
