Author: rdonkin
Date: Wed Jan 28 21:50:10 2009
New Revision: 738636
URL: http://svn.apache.org/viewvc?rev=738636&view=rev
Log:
These are fakes, not mocks, as per Fowler
Added:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMail.java
- copied, changed from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMail.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
- copied, changed from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailContext.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
- copied, changed from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailetConfig.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java
- copied, changed from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMatcherConfig.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
- copied, changed from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMimeMessage.java
Removed:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMail.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailContext.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailetConfig.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMatcherConfig.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMimeMessage.java
Modified:
james/mailet/base/trunk/src/site/site.xml
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/MailetUtilTest.java
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MailUtil.java
Modified: james/mailet/base/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/site/site.xml?rev=738636&r1=738635&r2=738636&view=diff
==============================================================================
--- james/mailet/base/trunk/src/site/site.xml (original)
+++ james/mailet/base/trunk/src/site/site.xml Wed Jan 28 21:50:10 2009
@@ -36,7 +36,7 @@
<item name="Overview" href="index.html"/>
<item
name="DOAP"
- href="doap_apache-james-mailet-base.rdf"
+ href="doap_apache-mailet-base.rdf"
img='http://www.w3.org/RDF/icons/rdf_metadata_button.32'/>
</menu>
Modified:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/MailetUtilTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/MailetUtilTest.java?rev=738636&r1=738635&r2=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/MailetUtilTest.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/MailetUtilTest.java
Wed Jan 28 21:50:10 2009
@@ -19,7 +19,7 @@
package org.apache.mailet.base;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMailetConfig;
import junit.framework.TestCase;
@@ -27,11 +27,11 @@
private static final String A_PARAMETER = "aParameter";
- MockMailetConfig config;
+ FakeMailetConfig config;
protected void setUp() throws Exception {
super.setUp();
- config = new MockMailetConfig();
+ config = new FakeMailetConfig();
}
protected void tearDown() throws Exception {
Copied:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMail.java
(from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMail.java)
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMail.java?p2=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMail.java&p1=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMail.java&r1=738289&r2=738636&rev=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMail.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMail.java
Wed Jan 28 21:50:10 2009
@@ -33,7 +33,7 @@
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
-public class MockMail implements Mail {
+public class FakeMail implements Mail {
private MimeMessage msg = null;
@@ -57,11 +57,11 @@
private String remoteAddr ="127.0.0.1";
- public MockMail() {
+ public FakeMail() {
super();
}
- public MockMail(MimeMessage msg) {
+ public FakeMail(MimeMessage msg) {
this();
this.msg = msg;
}
Copied:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
(from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailContext.java)
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailContext.java?p2=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailContext.java&p1=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailContext.java&r1=738289&r2=738636&rev=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailContext.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailContext.java
Wed Jan 28 21:50:10 2009
@@ -29,7 +29,7 @@
import java.util.HashMap;
import java.util.Iterator;
-public class MockMailContext implements MailetContext {
+public class FakeMailContext implements MailetContext {
HashMap attributes = new HashMap();
Copied:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
(from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailetConfig.java)
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java?p2=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java&p1=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailetConfig.java&r1=738289&r2=738636&rev=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMailetConfig.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMailetConfig.java
Wed Jan 28 21:50:10 2009
@@ -28,22 +28,22 @@
/**
* MailetConfig over Properties
*/
-public class MockMailetConfig extends Properties implements MailetConfig {
+public class FakeMailetConfig extends Properties implements MailetConfig {
public String mailetName;
public MailetContext mc;
- public MockMailetConfig() {
- this("A Mailet", new MockMailContext());
+ public FakeMailetConfig() {
+ this("A Mailet", new FakeMailContext());
}
- public MockMailetConfig(String mailetName, MailetContext mc) {
+ public FakeMailetConfig(String mailetName, MailetContext mc) {
super();
this.mailetName = mailetName;
this.mc = mc;
}
- public MockMailetConfig(String mailetName, MailetContext mc, Properties
arg0) {
+ public FakeMailetConfig(String mailetName, MailetContext mc, Properties
arg0) {
super(arg0);
this.mailetName = mailetName;
this.mc = mc;
Copied:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java
(from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMatcherConfig.java)
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java?p2=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java&p1=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMatcherConfig.java&r1=738289&r2=738636&rev=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMatcherConfig.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMatcherConfig.java
Wed Jan 28 21:50:10 2009
@@ -25,13 +25,13 @@
/**
* MatcherConfig
*/
-public class MockMatcherConfig implements MatcherConfig {
+public class FakeMatcherConfig implements MatcherConfig {
private String matcherName;
private MailetContext mc;
- public MockMatcherConfig(String matcherName, MailetContext mc) {
+ public FakeMatcherConfig(String matcherName, MailetContext mc) {
super();
this.matcherName = matcherName;
this.mc = mc;
Copied:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
(from r738289,
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMimeMessage.java)
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java?p2=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java&p1=james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMimeMessage.java&r1=738289&r2=738636&rev=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MockMimeMessage.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/FakeMimeMessage.java
Wed Jan 28 21:50:10 2009
@@ -36,7 +36,7 @@
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
-public class MockMimeMessage extends MimeMessage {
+public class FakeMimeMessage extends MimeMessage {
private final List m_fromAddresses = new ArrayList();
private Address m_senderAddress;
@@ -56,16 +56,16 @@
private Flags m_setFlags = new Flags();
private boolean m_doMatch;
- public MockMimeMessage() throws MessagingException {
+ public FakeMimeMessage() throws MessagingException {
super((Session)null);
}
- public MockMimeMessage(int messageNumber) throws MessagingException {
+ public FakeMimeMessage(int messageNumber) throws MessagingException {
super((Session)null);
m_iMessageNumber = messageNumber;
}
- public MockMimeMessage(MimeMessage mimeMessage) throws MessagingException {
+ public FakeMimeMessage(MimeMessage mimeMessage) throws MessagingException {
super(mimeMessage); // trivial implementation
}
@@ -306,7 +306,7 @@
}
public Message reply(boolean b) throws MessagingException {
- return new MockMimeMessage(this); // trivial implementation
+ return new FakeMimeMessage(this); // trivial implementation
}
public void writeTo(OutputStream outputStream) throws IOException,
MessagingException {
Modified:
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MailUtil.java
URL:
http://svn.apache.org/viewvc/james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MailUtil.java?rev=738636&r1=738635&r2=738636&view=diff
==============================================================================
---
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MailUtil.java
(original)
+++
james/mailet/base/trunk/src/test/java/org/apache/mailet/base/test/MailUtil.java
Wed Jan 28 21:50:10 2009
@@ -40,8 +40,8 @@
return "MockMailUtil-ID-" + m_counter;
}
- public static MockMail createMockMail2Recipients(MimeMessage m) throws
ParseException {
- MockMail mockedMail = new MockMail();
+ public static FakeMail createMockMail2Recipients(MimeMessage m) throws
ParseException {
+ FakeMail mockedMail = new FakeMail();
mockedMail.setName(newId());
mockedMail.setMessage(m);
mockedMail.setRecipients(Arrays.asList(new MailAddress[] {
@@ -50,27 +50,27 @@
return mockedMail;
}
- public static MockMimeMessage createMimeMessage() throws
MessagingException {
+ public static FakeMimeMessage createMimeMessage() throws
MessagingException {
return createMimeMessage(null, null);
}
- public static MockMimeMessage createMimeMessageWithSubject(String subject)
throws MessagingException {
+ public static FakeMimeMessage createMimeMessageWithSubject(String subject)
throws MessagingException {
return createMimeMessage(null, null, subject, 0);
}
- public static MockMimeMessage createMimeMessage(String subject, int
number) throws MessagingException {
+ public static FakeMimeMessage createMimeMessage(String subject, int
number) throws MessagingException {
return createMimeMessage(null, null, subject, number);
}
- public static MockMimeMessage createMimeMessage(String headerName, String
headerValue) throws MessagingException {
+ public static FakeMimeMessage createMimeMessage(String headerName, String
headerValue) throws MessagingException {
return createMimeMessage(headerName, headerValue, "testmail", 0);
}
- public static MockMimeMessage createMimeMessage(String headerName, String
headerValue, String subject, int number) throws MessagingException {
+ public static FakeMimeMessage createMimeMessage(String headerName, String
headerValue, String subject, int number) throws MessagingException {
String sender = "[email protected]";
String rcpt = "[email protected]";
- MockMimeMessage mockedMimeMessage = new MockMimeMessage(number);
+ FakeMimeMessage mockedMimeMessage = new FakeMimeMessage(number);
mockedMimeMessage.setFrom(new InternetAddress(sender));
mockedMimeMessage.setRecipients(MimeMessage.RecipientType.TO, rcpt);
if (headerName != null) mockedMimeMessage.setHeader(headerName,
headerValue);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
