james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rdon...@apache.org
Subject svn commit: r742456 - in /james/mailet/standard/trunk: src/test/java/org/apache/james/transport/mailets/ src/test/java/org/apache/james/transport/matchers/ stage/org.apache.james/jars/
Date Mon, 09 Feb 2009 12:47:52 GMT
Author: rdonkin
Date: Mon Feb  9 12:47:51 2009
New Revision: 742456

URL: http://svn.apache.org/viewvc?rev=742456&view=rev
Log:
Updated to latest base mailet SNAPSHOT

Modified:
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
    james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java
    james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar
    james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddFooterTest.java Mon Feb  9 12:47:51 2009
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 
@@ -288,12 +288,12 @@
             throws MessagingException, IOException {
         Mailet mailet = new AddFooter();
 
-        MockMailetConfig mci = new MockMailetConfig("Test",new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",new FakeMailContext());
         mci.setProperty("text",footer);
 
         mailet.init(mci);
 
-        Mail mail = new MockMail();
+        Mail mail = new FakeMail();
         mail.setMessage(new MimeMessage(Session
                 .getDefaultInstance(new Properties()),
                 new ByteArrayInputStream(asciisource.getBytes())));

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/AddSubjectPrefixTest.java Mon Feb  9 12:47:51 2009
@@ -21,8 +21,8 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
@@ -64,7 +64,7 @@
     private void setupMailet() throws MessagingException {
         setupMockedMimeMessage();
         mailet = new AddSubjectPrefix();
-        MockMailetConfig mci = new MockMailetConfig("Test", new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci.setProperty("subjectPrefix", SUBJECT_PREFIX);
 
         mailet.init(mci);
@@ -73,7 +73,7 @@
     private void setupInvalidMailet() throws MessagingException {
         setupMockedMimeMessage();
         mailet = new AddSubjectPrefix();
-        MockMailetConfig mci = new MockMailetConfig("Test", new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci.setProperty("subjectPrefix", "");
 
         mailet.init(mci);

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java Mon Feb  9 12:47:51 2009
@@ -21,9 +21,9 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mailet;
 
@@ -68,15 +68,15 @@
 
     private void setupMailet() throws MessagingException {
         mailet = new MailAttributesToMimeHeaders();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci.setProperty("simplemapping", getConfig1());
         mci.setProperty("simplemapping", config2);
         mailet.init(mci);
     }
 
-    private MockMail setupMail(MimeMessage m) throws ParseException {
-        MockMail mockedMail = MailUtil.createMockMail2Recipients(m);
+    private FakeMail setupMail(MimeMessage m) throws ParseException {
+        FakeMail mockedMail = MailUtil.createMockMail2Recipients(m);
         mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME1, MAIL_ATTRIBUTE_VALUE1);
         mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME2, MAIL_ATTRIBUTE_VALUE2);
         return mockedMail;
@@ -84,7 +84,7 @@
 
     // test if the Headers were added
     public void testHeadersArePresent() throws MessagingException {
-        MockMail mockedMail = setupMail(MailUtil.createMimeMessage());
+        FakeMail mockedMail = setupMail(MailUtil.createMimeMessage());
         setupMailet();
 
         mailet.service(mockedMail);
@@ -100,7 +100,7 @@
     // test if exception was thrown
     public void testInvalidConfig() throws MessagingException {
         boolean exception = false;
-        MockMail mockedMail = setupMail(MailUtil.createMimeMessage());
+        FakeMail mockedMail = setupMail(MailUtil.createMimeMessage());
         setConfig1("test");
 
         try {

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/NullTest.java Mon Feb  9 12:47:51 2009
@@ -29,7 +29,7 @@
 
 import junit.framework.TestCase;
 
-import org.apache.mailet.base.test.MockMail;
+import org.apache.mailet.base.test.FakeMail;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;
@@ -49,7 +49,7 @@
     }
 
     private void setupMockedMail(MimeMessage m) throws ParseException {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setMessage(m);
         mockedMail.setRecipients(Arrays.asList(new MailAddress[] {
                 new MailAddress("test@james.apache.org"),

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/OnlyTextTest.java Mon Feb  9 12:47:51 2009
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 
@@ -48,12 +48,12 @@
      */
     public void testService() throws MessagingException, IOException {
         Mailet mailet;
-        MockMailetConfig mci;
+        FakeMailetConfig mci;
         MimeMessage message;
         Mail mail;
 
         mailet = new OnlyText();
-        mci = new MockMailetConfig("Test", new MockMailContext());
+        mci = new FakeMailetConfig("Test", new FakeMailContext());
         mailet.init(mci);
 
         // ----------------
@@ -63,7 +63,7 @@
         message.setText("Questa \u00E8 una prova");
         message.saveChanges();
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("prova", mail.getMessage().getSubject());
@@ -88,7 +88,7 @@
         message.setContent(mp);
         message.saveChanges();
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("prova", mail.getMessage().getSubject());
@@ -119,7 +119,7 @@
         message.setContent(mpext);
         message.saveChanges();
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("prova", mail.getMessage().getSubject());
@@ -134,7 +134,7 @@
                 "text/html");
         message.saveChanges();
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("prova", mail.getMessage().getSubject());
@@ -157,7 +157,7 @@
         message.setContent(mp);
         message.saveChanges();
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("prova", mail.getMessage().getSubject());
@@ -168,7 +168,7 @@
 
     public void testHtml2Text() throws MessagingException {
         OnlyText mailet = new OnlyText();
-        mailet.init(new MockMailetConfig("Test", new MockMailContext()));
+        mailet.init(new FakeMailetConfig("Test", new FakeMailContext()));
 
         String html;
         html = "<b>Prova di html</b><br /><p>Un paragrafo</p><LI>e ci mettiamo anche una lista</LI><br>";

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java Mon Feb  9 12:47:51 2009
@@ -21,8 +21,8 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
@@ -51,8 +51,8 @@
 
     private void setupMailet() throws MessagingException {
         mailet = new RemoveAllMailAttributes();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mailet.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMailAttributeTest.java Mon Feb  9 12:47:51 2009
@@ -21,9 +21,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 
@@ -37,7 +37,7 @@
     public static final String MAIL_ATTRIBUTE_NAME2 = "org.apache.james.test.junit2";
 
     private Mail setupMockedMail() throws ParseException {
-        Mail mockedMail = new MockMail();
+        Mail mockedMail = new FakeMail();
         mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME1, "true");
         mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME2, "true");
         return mockedMail;
@@ -45,8 +45,8 @@
 
     private Mailet setupMailet(String attribute) throws MessagingException {
         Mailet mailet = new RemoveMailAttribute();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         if (attribute != null) {
             mci.setProperty("name", attribute);
         }

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java Mon Feb  9 12:47:51 2009
@@ -24,9 +24,9 @@
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.base.GenericMailet;
 import org.apache.mailet.Mail;
@@ -41,7 +41,7 @@
     
     private GenericMailet setupMockedMailet(String name1,String name2) throws MessagingException {
         GenericMailet mailet = new RemoveMimeHeader();
-        MockMailetConfig mci = new MockMailetConfig("Test", new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test", new FakeMailContext());
         if (name1 != null) mci.setProperty("name", name1);
         if (name2 != null) mci.setProperty("name", name2);
 
@@ -58,7 +58,7 @@
     }
     
     private Mail getMockedMail(MimeMessage message) {
-        Mail m = new MockMail();
+        Mail m = new FakeMail();
         m.setMessage(message);
         return m;
     }

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ReplaceContentTest.java Mon Feb  9 12:47:51 2009
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 
@@ -39,12 +39,12 @@
 
     public void testService() throws MessagingException, IOException {
         Mailet mailet;
-        MockMailetConfig mci;
+        FakeMailetConfig mci;
         MimeMessage message;
         Mail mail;
 
         mailet = new ReplaceContent();
-        mci = new MockMailetConfig("Test", new MockMailContext());
+        mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci.setProperty("subjectPattern", "/prova/PROVA/i/,/a/e//,/o/o/i/");
         mci.setProperty("bodyPattern", "/prova/PROVA/i/," + "/a/e//,"
                 + "/o/o/i/,/\\u00E8/e'//," + "/prova([^\\/]*?)ble/X$1Y/im/,"
@@ -57,7 +57,7 @@
                 .setText("Sto facendo una prova di scrittura/ \u00E8 solo una prova.\n"
                         + "Bla bla bla bla.\n");
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("une PRoVA", mail.getMessage().getSubject());
@@ -67,7 +67,7 @@
         // ------------------
 
         mailet = new ReplaceContent();
-        mci = new MockMailetConfig("Test", new MockMailContext());
+        mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci
                 .setProperty("subjectPatternFile",
                         "#/org/apache/james/transport/mailets/replaceSubject.patterns");
@@ -79,7 +79,7 @@
                 .setText("Sto facendo una prova di scrittura/ \u00E8 solo una prova.\n"
                         + "Bla bla bla bla.\n");
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("Re: Re: Re: una prova", mail.getMessage()
@@ -88,7 +88,7 @@
         // ------------------
 
         mailet = new ReplaceContent();
-        mci = new MockMailetConfig("Test", new MockMailContext());
+        mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci.setProperty("bodyPattern", "/--messaggio originale--/<quote>/i/,"
                 +
                 // "/<quote>([^\\0]*)(\\r\\n)([^>]+)/<quote>$1$2>$3/imr/,"+
@@ -102,7 +102,7 @@
                 + "parte del\r\n" + "messaggio\\ che\\0 deve0 essere\r\n"
                 + "quotato. Vediamo se\r\n" + "ce la fa.");
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("una prova", mail.getMessage().getSubject());
@@ -114,7 +114,7 @@
         // ------------------
 
         mailet = new ReplaceContent();
-        mci = new MockMailetConfig("Test", new MockMailContext());
+        mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci.setProperty("bodyPattern", "/\\u2026/...//");
         mailet.init(mci);
 
@@ -122,7 +122,7 @@
         message.setSubject("una prova");
         message.setText("Prova \u2026 di replace \u2026");
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("una prova", mail.getMessage().getSubject());
@@ -137,12 +137,12 @@
                 + "=93prova=94 con l=92apice";
 
         Mailet mailet;
-        MockMailetConfig mci;
+        FakeMailetConfig mci;
         MimeMessage message;
         Mail mail;
 
         mailet = new ReplaceContent();
-        mci = new MockMailetConfig("Test", new MockMailContext());
+        mci = new FakeMailetConfig("Test", new FakeMailContext());
         mci.setProperty("bodyPattern", "/[\\u2018\\u2019\\u201A]/'//,"
                 + "/[\\u201C\\u201D\\u201E]/\"//," + "/[\\x91\\x92\\x82]/'//,"
                 + "/[\\x93\\x94\\x84]/\"//," + "/\\x85/...//," + "/\\x8B/<//,"
@@ -152,7 +152,7 @@
         message = new MimeMessage(Session.getDefaultInstance(new Properties()),
                 new ByteArrayInputStream(messageSource.getBytes()));
 
-        mail = new MockMail(message);
+        mail = new FakeMail(message);
         mailet.service(mail);
 
         assertEquals("\"prova\" con l'apice", mail.getMessage().getContent());

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMailAttributeTest.java Mon Feb  9 12:47:51 2009
@@ -21,8 +21,8 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
@@ -47,8 +47,8 @@
 
     private void setupMailet() throws MessagingException {
         mailet = new SetMailAttribute();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci.setProperty(ATTRIBUTE_NAME1, "true");
         mci.setProperty(ATTRIBUTE_NAME2, "true");
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/SetMimeHeaderTest.java Mon Feb  9 12:47:51 2009
@@ -21,9 +21,9 @@
 package org.apache.james.transport.mailets;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Mailet;
 
@@ -57,8 +57,8 @@
 
     private void setupMailet() throws MessagingException {
         mailet = new SetMimeHeader();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci.setProperty("name", HEADER_NAME);
         mci.setProperty("value", HEADER_VALUE);
 
@@ -68,7 +68,7 @@
     // test if the Header was add
     public void testHeaderIsPresent() throws MessagingException {
         MimeMessage mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
-        MockMail mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
+        FakeMail mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
         setupMailet();
 
         mailet.service(mockedMail);
@@ -84,7 +84,7 @@
         setHeaderValue(headerValue);
 
         MimeMessage mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
-        MockMail mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
+        FakeMail mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
         setupMailet();
 
         mailet.service(mockedMail);

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/StripAttachmentTest.java Mon Feb  9 12:47:51 2009
@@ -19,9 +19,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.Mailet;
 
@@ -74,7 +74,7 @@
         message.setContent(mm);
         message.saveChanges();
 
-        Mail mail = new MockMail();
+        Mail mail = new FakeMail();
         mail.setMessage(message);
 
         mailet.service(mail);
@@ -115,8 +115,8 @@
     public void testSimpleAttachment2() throws MessagingException, IOException {
         Mailet mailet = new StripAttachment();
 
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci.setProperty("directory", "./");
         mci.setProperty("remove", "all");
         mci.setProperty("notpattern", "^(winmail\\.dat$)");
@@ -145,7 +145,7 @@
         message.setContent(mm);
         message.saveChanges();
 
-        Mail mail = new MockMail();
+        Mail mail = new FakeMail();
         mail.setMessage(message);
 
         mailet.service(mail);
@@ -205,7 +205,7 @@
         // message.writeTo(System.out);
         // System.out.println("--------------------------\n\n\n");
 
-        Mail mail = new MockMail();
+        Mail mail = new FakeMail();
         mail.setMessage(message);
 
         mailet.service(mail);
@@ -240,21 +240,21 @@
     public void testToAndFromAttributes() throws MessagingException,
             IOException {
         Mailet strip = new StripAttachment();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci.setProperty("attribute", "my.attribute");
         mci.setProperty("remove", "all");
         mci.setProperty("notpattern", ".*\\.tmp.*");
         strip.init(mci);
 
         Mailet recover = new RecoverAttachment();
-        MockMailetConfig mci2 = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci2 = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci2.setProperty("attribute", "my.attribute");
         recover.init(mci2);
 
         Mailet onlyText = new OnlyText();
-        onlyText.init(new MockMailetConfig("Test", new MockMailContext()));
+        onlyText.init(new FakeMailetConfig("Test", new FakeMailContext()));
 
         MimeMessage message = new MimeMessage(Session
                 .getDefaultInstance(new Properties()));
@@ -279,7 +279,7 @@
         message.setSubject("test");
         message.setContent(mm);
         message.saveChanges();
-        Mail mail = new MockMail();
+        Mail mail = new FakeMail();
         mail.setMessage(message);
 
         assertTrue(mail.getMessage().getContent() instanceof MimeMultipart);
@@ -328,8 +328,8 @@
     private Mailet initMailet() throws MessagingException {
         Mailet mailet = new StripAttachment();
 
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         mci.setProperty("directory", "./");
         mci.setProperty("remove", "all");
         mci.setProperty("pattern", ".*\\.tmp");

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/mailets/ToProcessorTest.java Mon Feb  9 12:47:51 2009
@@ -20,9 +20,9 @@
 
 package org.apache.james.transport.mailets;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMailetConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMailetConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Mailet;
@@ -61,7 +61,7 @@
     }
 
     private void setupMockedMail(MimeMessage m) throws ParseException {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setMessage(m);
         mockedMail.setRecipients(Arrays.asList(new MailAddress[] {
                 new MailAddress("test@james.apache.org"),
@@ -71,8 +71,8 @@
 
     private void setupMailet() throws MessagingException {
         mailet = new ToProcessor();
-        MockMailetConfig mci = new MockMailetConfig("Test",
-                new MockMailContext());
+        FakeMailetConfig mci = new FakeMailetConfig("Test",
+                new FakeMailContext());
         if (processor != null) {
             mci.setProperty("processor", processor);
         }

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java Mon Feb  9 12:47:51 2009
@@ -29,9 +29,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.base.GenericMatcher;
 import org.apache.mailet.Matcher;
@@ -39,7 +39,7 @@
 public abstract class AbstractHasMailAttributeTest extends TestCase {
     protected MimeMessage mockedMimeMessage;
 
-    protected MockMail mockedMail;
+    protected FakeMail mockedMail;
 
     protected Matcher matcher;
 
@@ -71,8 +71,8 @@
 
     protected void setupMatcher() throws MessagingException {
         matcher = createMatcher();
-        MockMatcherConfig mci = new MockMatcherConfig(getConfigOption()
-                + getHasMailAttribute(), new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig(getConfigOption()
+                + getHasMailAttribute(), new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractRecipientIsTest.java Mon Feb  9 12:47:51 2009
@@ -26,15 +26,15 @@
 
 import junit.framework.TestCase;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;
 
 public abstract class AbstractRecipientIsTest extends TestCase {
 
-    protected MockMail mockedMail;
+    protected FakeMail mockedMail;
 
     protected Matcher matcher;
 
@@ -50,15 +50,15 @@
     }
 
     protected void setupMockedMail() {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setRecipients(Arrays.asList(recipients));
 
     }
 
     protected void setupMatcher() throws MessagingException {
         matcher = createMatcher();
-        MockMatcherConfig mci = new MockMatcherConfig("RecipientIs="
-                + getRecipientName(), new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("RecipientIs="
+                + getRecipientName(), new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSenderIsTest.java Mon Feb  9 12:47:51 2009
@@ -33,8 +33,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;
@@ -180,8 +180,8 @@
 
     protected void setupMatcher() throws MessagingException {
         matcher = createMatcher();
-        MockMatcherConfig mci = new MockMatcherConfig(getConfigOption()
-                + getConfigValue(), new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig(getConfigOption()
+                + getConfigValue(), new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AbstractSubjectIsTest.java Mon Feb  9 12:47:51 2009
@@ -21,10 +21,10 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMimeMessage;
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMimeMessage;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
 
@@ -34,13 +34,13 @@
 
 public abstract class AbstractSubjectIsTest extends TestCase {
 
-    protected MockMail mockedMail;
+    protected FakeMail mockedMail;
 
     protected Matcher matcher;
 
     private String subject = null;
 
-    private MockMimeMessage mockedMimeMessage;
+    private FakeMimeMessage mockedMimeMessage;
 
     public AbstractSubjectIsTest(String arg0)
             throws UnsupportedEncodingException {
@@ -52,7 +52,7 @@
     }
 
     protected void setupMockedMail(MimeMessage m) {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setMessage(m);
 
     }
@@ -64,8 +64,8 @@
 
     protected void setupMatcher() throws MessagingException {
         matcher = createMatcher();
-        MockMatcherConfig mci = new MockMatcherConfig(getConfigOption()
-                + getSubjectName(), new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig(getConfigOption()
+                + getSubjectName(), new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/AllTest.java Mon Feb  9 12:47:51 2009
@@ -20,9 +20,9 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.base.test.MailUtil;
 
 import org.apache.mailet.Matcher;
@@ -36,7 +36,7 @@
 
 public class AllTest extends TestCase {
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -46,8 +46,8 @@
 
     private void setupMatcher() throws MessagingException {
         matcher = new All();
-        MockMatcherConfig mci = new MockMatcherConfig("All",
-                new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("All",
+                new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/FetchedFromTest.java Mon Feb  9 12:47:51 2009
@@ -21,9 +21,9 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
 
@@ -37,7 +37,7 @@
 
     private MimeMessage mockedMimeMessage;
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -72,8 +72,8 @@
     private void setupMatcher() throws MessagingException {
         setupMockedMimeMessage();
         matcher = new FetchedFrom();
-        MockMatcherConfig mci = new MockMatcherConfig("FetchedFrom="
-                + HEADER_VALUE, new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("FetchedFrom="
+                + HEADER_VALUE, new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HasHeaderTest.java Mon Feb  9 12:47:51 2009
@@ -21,9 +21,9 @@
 package org.apache.james.transport.matchers;
 
 import junit.framework.TestCase;
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.base.test.MailUtil;
 import org.apache.mailet.Matcher;
 
@@ -36,7 +36,7 @@
 
     private MimeMessage mockedMimeMessage;
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -67,8 +67,8 @@
     private void setupMatcher() throws MessagingException {
         setupMockedMimeMessage();
         matcher = new HasHeader();
-        MockMatcherConfig mci = new MockMatcherConfig("HasHeader="
-                + HEADER_NAME, new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("HasHeader="
+                + HEADER_NAME, new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java Mon Feb  9 12:47:51 2009
@@ -20,8 +20,8 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 
 import org.apache.mailet.Mail;
 import org.apache.mailet.MailAddress;
@@ -41,7 +41,7 @@
 
 public class HostIsLocalTest extends TestCase {
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -58,14 +58,14 @@
     }
 
     private void setupMockedMail() {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setRecipients(Arrays.asList(recipients));
 
     }
 
     private void setupMatcher() throws MessagingException {
 
-        MailetContext mockMailContext = new MailetContext() {
+        MailetContext FakeMailContext = new MailetContext() {
 
             Collection localServer = new ArrayList(Arrays.asList(LOCALSERVER));
 
@@ -188,8 +188,8 @@
         };
 
         matcher = new HostIsLocal();
-        MockMatcherConfig mci = new MockMatcherConfig("HostIsLocal",
-                mockMailContext);
+        FakeMatcherConfig mci = new FakeMatcherConfig("HostIsLocal",
+                FakeMailContext);
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsTest.java Mon Feb  9 12:47:51 2009
@@ -20,9 +20,9 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;
@@ -37,7 +37,7 @@
 
 public class HostIsTest extends TestCase {
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -54,15 +54,15 @@
     }
 
     private void setupMockedMail() {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setRecipients(Arrays.asList(recipients));
 
     }
 
     private void setupMatcher() throws MessagingException {
         matcher = new HostIs();
-        MockMatcherConfig mci = new MockMatcherConfig("HostIs=" + HOST_NAME,
-                new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("HostIs=" + HOST_NAME,
+                new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/IsSingleRecipientTest.java Mon Feb  9 12:47:51 2009
@@ -20,9 +20,9 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;
@@ -37,7 +37,7 @@
 
 public class IsSingleRecipientTest extends TestCase {
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -53,7 +53,7 @@
     }
 
     private void setupMockedMail() {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setRecipients(Arrays.asList(recipients));
 
     }
@@ -61,8 +61,8 @@
     private void setupMatcher() throws MessagingException {
 
         matcher = new IsSingleRecipient();
-        MockMatcherConfig mci = new MockMatcherConfig("IsSingleRecipient",
-                new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("IsSingleRecipient",
+                new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java Mon Feb  9 12:47:51 2009
@@ -29,14 +29,14 @@
 import junit.framework.TestCase;
 
 import org.apache.mailet.base.test.MailUtil;
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 import org.apache.mailet.Matcher;
 
 public class SMTPIsAuthNetworkTest extends TestCase {
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -62,8 +62,8 @@
 
     private void setupMatcher() throws MessagingException {
         matcher = new SMTPIsAuthNetwork();
-        MockMatcherConfig mci = new MockMatcherConfig("SMTPIsAuthNetwork",
-                new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("SMTPIsAuthNetwork",
+                new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
--- james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java (original)
+++ james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/SizeGreaterThanTest.java Mon Feb  9 12:47:51 2009
@@ -20,9 +20,9 @@
 
 package org.apache.james.transport.matchers;
 
-import org.apache.mailet.base.test.MockMail;
-import org.apache.mailet.base.test.MockMailContext;
-import org.apache.mailet.base.test.MockMatcherConfig;
+import org.apache.mailet.base.test.FakeMail;
+import org.apache.mailet.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
 
 import org.apache.mailet.MailAddress;
 import org.apache.mailet.Matcher;
@@ -38,7 +38,7 @@
 
 public class SizeGreaterThanTest extends TestCase {
 
-    private MockMail mockedMail;
+    private FakeMail mockedMail;
 
     private Matcher matcher;
 
@@ -47,7 +47,7 @@
     }
 
     private void setupMockedMail(long size) throws ParseException {
-        mockedMail = new MockMail();
+        mockedMail = new FakeMail();
         mockedMail.setMessageSize(size);
         mockedMail.setRecipients(Arrays.asList(new MailAddress[] {new MailAddress("test@email")}));
 
@@ -55,8 +55,8 @@
 
     private void setupMatcher(String size) throws MessagingException {
         matcher = new SizeGreaterThan();
-        MockMatcherConfig mci = new MockMatcherConfig("SizeGreaterThan=" + size,
-                new MockMailContext());
+        FakeMatcherConfig mci = new FakeMatcherConfig("SizeGreaterThan=" + size,
+                new FakeMailContext());
         matcher.init(mci);
     }
 

Modified: james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT-tests.jar?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
Binary files - no diff available.

Modified: james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar
URL: http://svn.apache.org/viewvc/james/mailet/standard/trunk/stage/org.apache.james/jars/apache-mailet-base-1.0-SNAPSHOT.jar?rev=742456&r1=742455&r2=742456&view=diff
==============================================================================
Binary files - no diff available.



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


Mime
View raw message