JAMES-2340 Get a ride of MockMail implementation

This adds unecessary implementation of the mail object


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

Branch: refs/heads/master
Commit: 8e2b81904faeaa5ae16884335bd36a8025a8f370
Parents: e441c5d
Author: benwa <btell...@linagora.com>
Authored: Mon Mar 12 13:47:56 2018 +0700
Committer: benwa <btell...@linagora.com>
Committed: Mon Mar 12 14:55:35 2018 +0700

----------------------------------------------------------------------
 .../smtpserver/SpamAssassinHandlerTest.java     |  10 +-
 .../james/smtpserver/URIRBLHandlerTest.java     |  10 +-
 .../java/org/apache/james/smtpserver/Util.java  |  19 +-
 .../james/smtpserver/mock/mailet/MockMail.java  | 180 -------------------
 4 files changed, 18 insertions(+), 201 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/8e2b8190/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
index d908e71..eeb79af 100644
--- 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
+++ 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/SpamAssassinHandlerTest.java
@@ -32,11 +32,11 @@ import org.apache.james.protocols.smtp.hook.HookResult;
 import org.apache.james.protocols.smtp.hook.HookReturnCode;
 import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
 import org.apache.james.smtpserver.fastfail.SpamAssassinHandler;
-import org.apache.james.smtpserver.mock.mailet.MockMail;
 import org.apache.james.util.scanner.SpamAssassinResult;
 import org.apache.james.utils.MockSpamd;
 import org.apache.james.utils.MockSpamdTestRule;
 import org.apache.mailet.Mail;
+import org.apache.mailet.base.test.FakeMail;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -95,10 +95,10 @@ public class SpamAssassinHandlerTest {
     @Rule
     public MockSpamdTestRule spamd = new MockSpamdTestRule();
 
-    private Mail setupMockedMail(MimeMessage message) {
-        MockMail mail = new MockMail();
-        mail.setMessage(message);
-        return mail;
+    private Mail setupMockedMail(MimeMessage message) throws 
MessagingException {
+        return FakeMail.builder()
+            .mimeMessage(message)
+            .build();
     }
 
     public MimeMessage setupMockedMimeMessage(String text) throws 
MessagingException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/8e2b8190/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
index dca95e4..9f6f5c6 100644
--- 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
+++ 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/URIRBLHandlerTest.java
@@ -39,8 +39,8 @@ import org.apache.james.protocols.smtp.hook.HookResult;
 import org.apache.james.protocols.smtp.hook.HookReturnCode;
 import org.apache.james.protocols.smtp.utils.BaseFakeSMTPSession;
 import org.apache.james.smtpserver.fastfail.URIRBLHandler;
-import org.apache.james.smtpserver.mock.mailet.MockMail;
 import org.apache.mailet.Mail;
+import org.apache.mailet.base.test.FakeMail;
 import org.junit.Test;
 
 public class URIRBLHandlerTest {
@@ -100,10 +100,10 @@ public class URIRBLHandlerTest {
 
     }
 
-    private Mail setupMockedMail(MimeMessage message) {
-        MockMail mail = new MockMail();
-        mail.setMessage(message);
-        return mail;
+    private Mail setupMockedMail(MimeMessage message) throws 
MessagingException {
+       return FakeMail.builder()
+            .mimeMessage(message)
+            .build();
     }
 
     public MimeMessage setupMockedMimeMessage(String text) throws 
MessagingException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/8e2b8190/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
index e9f95ca..dc16c40 100644
--- 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
+++ 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/Util.java
@@ -18,16 +18,14 @@
  ****************************************************************/
 package org.apache.james.smtpserver;
 
-import java.util.Arrays;
 import java.util.Random;
 
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
-import javax.mail.internet.ParseException;
 
-import org.apache.james.core.MailAddress;
 import org.apache.james.core.builder.MimeMessageBuilder;
-import org.apache.james.smtpserver.mock.mailet.MockMail;
+import org.apache.mailet.Mail;
+import org.apache.mailet.base.test.FakeMail;
 
 /**
  * some utilities for James unit testing
@@ -36,13 +34,12 @@ public class Util {
 
     private static final Random RANDOM = new Random();
 
-    public static MockMail createMockMail2Recipients(MimeMessage m) throws 
ParseException {
-        MockMail mockedMail = new MockMail();
-        mockedMail.setName("ID=" + RANDOM.nextLong());
-        mockedMail.setMessage(m);
-        mockedMail.setRecipients(Arrays.asList(new 
MailAddress("t...@james.apache.org"),
-                new MailAddress("te...@james.apache.org")));
-        return mockedMail;
+    public static Mail createMockMail2Recipients(MimeMessage m) throws 
MessagingException {
+        return FakeMail.builder()
+            .name("ID=" + RANDOM.nextLong())
+            .mimeMessage(m)
+            .recipients("t...@james.apache.org", "te...@james.apache.org")
+            .build();
     }
 
     public static MimeMessage createMimeMessage(String headerName, String 
headerValue) throws MessagingException {

http://git-wip-us.apache.org/repos/asf/james-project/blob/8e2b8190/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
----------------------------------------------------------------------
diff --git 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
 
b/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
deleted file mode 100644
index a28fbe5..0000000
--- 
a/server/protocols/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one   *
- * or more contributor license agreements.  See the NOTICE file *
- * distributed with this work for additional information        *
- * regarding copyright ownership.  The ASF licenses this file   *
- * to you under the Apache License, Version 2.0 (the            *
- * "License"); you may not use this file except in compliance   *
- * with the License.  You may obtain a copy of the License at   *
- *                                                              *
- *   http://www.apache.org/licenses/LICENSE-2.0                 *
- *                                                              *
- * Unless required by applicable law or agreed to in writing,   *
- * software distributed under the License is distributed on an  *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
- * KIND, either express or implied.  See the License for the    *
- * specific language governing permissions and limitations      *
- * under the License.                                           *
- ****************************************************************/
-package org.apache.james.smtpserver.mock.mailet;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Iterator;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.MimeMessage;
-
-import org.apache.commons.lang.NotImplementedException;
-import org.apache.james.core.MailAddress;
-import org.apache.mailet.Mail;
-import org.apache.mailet.PerRecipientHeaders;
-import org.apache.mailet.PerRecipientHeaders.Header;
-
-public class MockMail implements Mail {
-
-    private MimeMessage msg = null;
-    private Collection<MailAddress> recipients = new ArrayList<>();
-    private String name = null;
-    private final MailAddress sender = null;
-    private String state = null;
-    private String errorMessage;
-    private Date lastUpdated;
-    private final HashMap<String, Serializable> attributes = new HashMap<>();
-    private static final long serialVersionUID = 1L;
-    private long size = 0;
-    private String remoteAddr = "127.0.0.1";
-
-    @Override
-    public String getName() {
-        return name;
-    }
-
-    @Override
-    public void setName(String newName) {
-        this.name = newName;
-    }
-
-    @Override
-    public MimeMessage getMessage() throws MessagingException {
-        return msg;
-    }
-
-    @Override
-    public Collection<MailAddress> getRecipients() {
-        return recipients;
-    }
-
-    @Override
-    public void setRecipients(Collection<MailAddress> recipients) {
-        this.recipients = recipients;
-    }
-
-    @Override
-    public MailAddress getSender() {
-        return sender;
-    }
-
-    @Override
-    public String getState() {
-        return state;
-    }
-
-    @Override
-    public String getRemoteHost() {
-        return "111.222.333.444";
-    }
-
-    @Override
-    public String getRemoteAddr() {
-        return remoteAddr;
-    }
-
-    @Override
-    public String getErrorMessage() {
-        return errorMessage;
-    }
-
-    @Override
-    public void setErrorMessage(String msg) {
-        this.errorMessage = msg;
-    }
-
-    @Override
-    public void setMessage(MimeMessage message) {
-        this.msg = message;
-    }
-
-    @Override
-    public void setState(String state) {
-        this.state = state;
-    }
-
-    @Override
-    public Serializable getAttribute(String name) {
-        return (Serializable) attributes.get(name);
-    }
-
-    @Override
-    public Iterator<String> getAttributeNames() {
-        return attributes.keySet().iterator();
-    }
-
-    @Override
-    public boolean hasAttributes() {
-        return !attributes.isEmpty();
-    }
-
-    @Override
-    public Serializable removeAttribute(String name) {
-        return (Serializable) attributes.remove(name);
-
-    }
-
-    @Override
-    public void removeAllAttributes() {
-        attributes.clear();
-    }
-
-    @Override
-    public Serializable setAttribute(String name, Serializable object) {
-
-        return (Serializable) attributes.put(name, object);
-    }
-
-    @Override
-    public long getMessageSize() throws MessagingException {
-        return size;
-    }
-
-    @Override
-    public Date getLastUpdated() {
-        return lastUpdated;
-    }
-
-    @Override
-    public void setLastUpdated(Date lastUpdated) {
-        this.lastUpdated = lastUpdated;
-    }
-
-    public void setMessageSize(long size) {
-        this.size = size;
-    }
-
-    public void setRemoteAddr(String remoteAddr) {
-        this.remoteAddr = remoteAddr;
-    }
-
-    @Override
-    public PerRecipientHeaders getPerRecipientSpecificHeaders() {
-        throw new NotImplementedException();
-    }
-
-    @Override
-    public void addSpecificHeaderForRecipient(Header header, MailAddress 
recipient) {
-        throw new NotImplementedException();
-    }
-}


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

Reply via email to