Author: norman
Date: Tue May 30 01:31:53 2006
New Revision: 410217
URL: http://svn.apache.org/viewvc?rev=410217&view=rev
Log:
Add MockMail class and use this class if a mocked Mail object is needed
Added:
james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMail.java
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/AddHeaderHandlerTest.java
james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java
james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
Modified:
james/server/trunk/src/test/org/apache/james/smtpserver/AddHeaderHandlerTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/AddHeaderHandlerTest.java?rev=410217&r1=410216&r2=410217&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/smtpserver/AddHeaderHandlerTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/smtpserver/AddHeaderHandlerTest.java
Tue May 30 01:31:53 2006
@@ -19,11 +19,8 @@
import java.io.IOException;
import java.io.InputStream;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Date;
+import java.util.Arrays;
import java.util.HashMap;
-import java.util.Iterator;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
@@ -33,9 +30,9 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.util.watchdog.Watchdog;
import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
import junit.framework.TestCase;
@@ -57,7 +54,6 @@
protected void setUp() throws Exception {
super.setUp();
- setupMockedMail();
setupMockedSMTPSession();
}
@@ -83,121 +79,12 @@
}
- private void setupMockedMail() {
- mockedMail = new Mail() {
+ private void setupMockedMail(MimeMessage m) {
+ mockedMail = new MockMail();
+ mockedMail.setMessage(m);
+ mockedMail.setRecipients(Arrays.asList(new String[] {
+ "[EMAIL PROTECTED]", "[EMAIL PROTECTED]" }));
- private static final long serialVersionUID = 1L;
-
- public String getName() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setName(String newName) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MimeMessage getMessage() throws MessagingException {
- return mockedMimeMessage;
- }
-
- public Collection getRecipients() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setRecipients(Collection recipients) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MailAddress getSender() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getState() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getRemoteHost() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getRemoteAddr() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getErrorMessage() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setErrorMessage(String msg) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setMessage(MimeMessage message) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setState(String state) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable getAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Iterator getAttributeNames() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public boolean hasAttributes() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable removeAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void removeAllAttributes() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable setAttribute(String name, Serializable object)
{
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public long getMessageSize() throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Date getLastUpdated() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setLastUpdated(Date lastUpdated) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- };
}
private void setupMockedSMTPSession() {
@@ -348,7 +235,9 @@
public void testHeaderIsPresent() throws MessagingException {
setHeaderName(HEADER_NAME);
setHeaderValue(HEADER_VALUE);
+
setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
AddHeaderHandler header = new AddHeaderHandler();
@@ -366,7 +255,9 @@
public void testHeaderIsReplaced() throws MessagingException {
setHeaderName(HEADER_NAME);
setHeaderValue(headerValue);
+
setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
AddHeaderHandler header = new AddHeaderHandler();
Added:
james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMail.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMail.java?rev=410217&view=auto
==============================================================================
--- james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMail.java
(added)
+++ james/server/trunk/src/test/org/apache/james/test/mock/mailet/MockMail.java
Tue May 30 01:31:53 2006
@@ -0,0 +1,139 @@
+/***********************************************************************
+ * Copyright (c) 2006 The Apache Software Foundation. *
+ * All rights reserved. *
+ * ------------------------------------------------------------------- *
+ * Licensed 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.test.mock.mailet;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.MimeMessage;
+
+import org.apache.mailet.Mail;
+import org.apache.mailet.MailAddress;
+
+public class MockMail implements Mail {
+
+ private MimeMessage msg = null;
+
+ private Collection recipients = new ArrayList();
+
+ private String name = null;
+
+ private MailAddress sender = null;
+
+ private String state = null;
+
+ private String errorMessage;
+
+ private Date lastUpdated;
+
+ private static final long serialVersionUID = 1L;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String newName) {
+ this.name = newName;
+ }
+
+ public MimeMessage getMessage() throws MessagingException {
+ return msg;
+ }
+
+ public Collection getRecipients() {
+ return recipients;
+ }
+
+ public void setRecipients(Collection recipients) {
+ this.recipients = recipients;
+ }
+
+ public MailAddress getSender() {
+ return sender;
+ }
+
+ public String getState() {
+ return state;
+ }
+
+ public String getRemoteHost() {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public String getRemoteAddr() {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public String getErrorMessage() {
+ return errorMessage;
+ }
+
+ public void setErrorMessage(String msg) {
+ this.errorMessage = msg;
+ }
+
+ public void setMessage(MimeMessage message) {
+ this.msg = message;
+ }
+
+ public void setState(String state) {
+ this.state = state;
+ }
+
+ public Serializable getAttribute(String name) {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public Iterator getAttributeNames() {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public boolean hasAttributes() {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public Serializable removeAttribute(String name) {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public void removeAllAttributes() {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public Serializable setAttribute(String name, Serializable object) {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public long getMessageSize() throws MessagingException {
+ throw new UnsupportedOperationException("Unimplemented mock service");
+ }
+
+ public Date getLastUpdated() {
+ return lastUpdated;
+ }
+
+ public void setLastUpdated(Date lastUpdated) {
+ this.lastUpdated = lastUpdated;
+ }
+
+}
Modified:
james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java?rev=410217&r1=410216&r2=410217&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/transport/mailets/AddHeaderTest.java
Tue May 30 01:31:53 2006
@@ -18,10 +18,10 @@
package org.apache.james.transport.mailets;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMailetConfig;
import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
import org.apache.mailet.Mailet;
import javax.mail.MessagingException;
@@ -29,11 +29,8 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMessage.RecipientType;
-import java.io.Serializable;
import java.io.UnsupportedEncodingException;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
+import java.util.Arrays;
import junit.framework.TestCase;
@@ -79,121 +76,12 @@
}
- private void setupMockedMail() {
- mockedMail = new Mail() {
+ private void setupMockedMail(MimeMessage m) {
+ mockedMail = new MockMail();
+ mockedMail.setMessage(m);
+ mockedMail.setRecipients(Arrays.asList(new String[] {
+ "[EMAIL PROTECTED]", "[EMAIL PROTECTED]" }));
- private static final long serialVersionUID = 1L;
-
- public String getName() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setName(String newName) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MimeMessage getMessage() throws MessagingException {
- return mockedMimeMessage;
- }
-
- public Collection getRecipients() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setRecipients(Collection recipients) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MailAddress getSender() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getState() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getRemoteHost() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getRemoteAddr() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getErrorMessage() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setErrorMessage(String msg) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setMessage(MimeMessage message) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setState(String state) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable getAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Iterator getAttributeNames() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public boolean hasAttributes() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable removeAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void removeAllAttributes() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable setAttribute(String name, Serializable object)
{
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public long getMessageSize() throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Date getLastUpdated() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setLastUpdated(Date lastUpdated) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- };
}
private void setupMailet() throws MessagingException {
@@ -209,8 +97,8 @@
// test if the Header was add
public void testHeaderIsPresent() throws MessagingException {
- setupMockedMail();
setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
setupMailet();
mailet.service(mockedMail);
@@ -224,8 +112,9 @@
public void testHeaderIsReplaced() throws MessagingException {
setHeaderName(HEADER_NAME);
setHeaderValue(headerValue);
- setupMockedMail();
+
setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
setupMailet();
mailet.service(mockedMail);
Modified:
james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java?rev=410217&r1=410216&r2=410217&view=diff
==============================================================================
---
james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
(original)
+++
james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
Tue May 30 01:31:53 2006
@@ -18,10 +18,10 @@
package org.apache.james.transport.matchers;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMatcherConfig;
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
+
import org.apache.mailet.Matcher;
import javax.mail.MessagingException;
@@ -29,12 +29,8 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMessage.RecipientType;
-import java.io.Serializable;
import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
+import java.util.Arrays;
import junit.framework.TestCase;
@@ -42,7 +38,7 @@
private MimeMessage mockedMimeMessage;
- private Mail mockedMail;
+ private MockMail mockedMail;
private Matcher matcher;
@@ -80,120 +76,12 @@
}
- private void setupMockedMail() {
- mockedMail = new Mail() {
-
- private static final long serialVersionUID = 1L;
+ private void setupMockedMail(MimeMessage m) {
+ mockedMail = new MockMail();
+ mockedMail.setMessage(m);
+ mockedMail.setRecipients(Arrays.asList(new String[] {
+ "[EMAIL PROTECTED]", "[EMAIL PROTECTED]" }));
- public String getName() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setName(String newName) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MimeMessage getMessage() throws MessagingException {
- return mockedMimeMessage;
- }
-
- public Collection getRecipients() {
- return new ArrayList();
- }
-
- public void setRecipients(Collection recipients) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public MailAddress getSender() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getState() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getRemoteHost() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getRemoteAddr() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public String getErrorMessage() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setErrorMessage(String msg) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setMessage(MimeMessage message) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setState(String state) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable getAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Iterator getAttributeNames() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public boolean hasAttributes() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable removeAttribute(String name) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void removeAllAttributes() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Serializable setAttribute(String name, Serializable object)
{
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public long getMessageSize() throws MessagingException {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public Date getLastUpdated() {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- public void setLastUpdated(Date lastUpdated) {
- throw new UnsupportedOperationException(
- "Unimplemented mock service");
- }
-
- };
}
private void setupMatcher() throws MessagingException {
@@ -208,8 +96,9 @@
public void testHeaderIsMatched() throws MessagingException {
setHeaderName(HEADER_NAME);
setHeaderValue(HEADER_VALUE);
- setupMockedMail();
+
setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
setupMatcher();
assertTrue(matcher.match(mockedMail) != null);
@@ -217,8 +106,8 @@
// test if the Header was matched
public void testHeaderIsNotMatched() throws MessagingException {
- setupMockedMail();
setupMockedMimeMessage();
+ setupMockedMail(mockedMimeMessage);
setupMatcher();
assertTrue(matcher.match(mockedMail) == null);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
