You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ba...@apache.org on 2008/07/29 17:49:25 UTC
svn commit: r680741 - in
/james/server/trunk/phoenix-deployment/src/test/org/apache/james:
management/ smtpserver/ test/mock/util/ test/util/ transport/mailets/
transport/matchers/
Author: bago
Date: Tue Jul 29 08:49:22 2008
New Revision: 680741
URL: http://svn.apache.org/viewvc?rev=680741&view=rev
Log:
Split Util class to Util & MailUtil in order to narrow some test dependencies.
Added:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java (with props)
Modified:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/management/SpoolManagementTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/util/Util.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AllTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/FetchedFromTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/NESSpamCheckTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/management/SpoolManagementTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/management/SpoolManagementTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/management/SpoolManagementTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/management/SpoolManagementTest.java Tue Jul 29 08:49:22 2008
@@ -21,21 +21,23 @@
package org.apache.james.management;
-import junit.framework.TestCase;
import org.apache.avalon.cornerstone.services.store.Store;
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.test.mock.avalon.MockLogger;
import org.apache.james.test.mock.avalon.MockServiceManager;
import org.apache.james.test.mock.avalon.MockStore;
import org.apache.james.test.mock.james.InMemorySpoolRepository;
-import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.util.Util;
+import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
+
import java.util.HashMap;
+import junit.framework.TestCase;
+
/**
* Tests the SpoolManagement
*/
@@ -158,16 +160,16 @@
}
private MockMail createSpoolMail(String state, String subject, int number) throws MessagingException {
- MockMimeMessage mimeMessage = Util.createMimeMessage(subject, number);
- MockMail mockMail = Util.createMockMail2Recipients(mimeMessage);
+ MockMimeMessage mimeMessage = MailUtil.createMimeMessage(subject, number);
+ MockMail mockMail = MailUtil.createMockMail2Recipients(mimeMessage);
mockMail.setState(state);
m_mockSpoolRepository.store(mockMail);
return mockMail;
}
private MockMail createSpoolMail(String state, String headerName, String headerRegex, int number) throws MessagingException {
- MockMimeMessage mimeMessage = Util.createMimeMessage(headerName, headerRegex, "test", number);
- MockMail mockMail = Util.createMockMail2Recipients(mimeMessage);
+ MockMimeMessage mimeMessage = MailUtil.createMimeMessage(headerName, headerRegex, "test", number);
+ MockMail mockMail = MailUtil.createMockMail2Recipients(mimeMessage);
mockMail.setState(state);
m_mockSpoolRepository.store(mockMail);
return mockMail;
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java Tue Jul 29 08:49:22 2008
@@ -24,7 +24,7 @@
import org.apache.avalon.framework.container.ContainerUtil;
import org.apache.james.smtpserver.core.SetMimeHeaderHandler;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mail;
import javax.mail.MessagingException;
@@ -60,7 +60,7 @@
}
private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
+ mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
}
private void setupMockedSMTPSession() {
@@ -83,7 +83,7 @@
setHeaderValue(HEADER_VALUE);
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
SetMimeHeaderHandler header = new SetMimeHeaderHandler();
@@ -103,7 +103,7 @@
setHeaderValue(headerValue);
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
SetMimeHeaderHandler header = new SetMimeHeaderHandler();
Added: james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java?rev=680741&view=auto
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java (added)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java Tue Jul 29 08:49:22 2008
@@ -0,0 +1,79 @@
+/****************************************************************
+ * 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.test.mock.util;
+
+import org.apache.james.test.mock.james.MockMailServer;
+import org.apache.james.test.mock.javaxmail.MockMimeMessage;
+import org.apache.james.test.mock.mailet.MockMail;
+import org.apache.mailet.MailAddress;
+
+import javax.mail.MessagingException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.ParseException;
+
+import java.util.Arrays;
+
+/**
+ * some utilities for James unit testing
+ */
+public class MailUtil {
+
+ public static MockMail createMockMail2Recipients(MimeMessage m) throws ParseException {
+ MockMail mockedMail = new MockMail();
+ mockedMail.setName(MockMailServer.newId());
+ mockedMail.setMessage(m);
+ mockedMail.setRecipients(Arrays.asList(new MailAddress[] {
+ new MailAddress("test@james.apache.org"),
+ new MailAddress("test2@james.apache.org") }));
+ return mockedMail;
+ }
+
+ public static MockMimeMessage createMimeMessage() throws MessagingException {
+ return createMimeMessage(null, null);
+ }
+
+ public static MockMimeMessage createMimeMessageWithSubject(String subject) throws MessagingException {
+ return createMimeMessage(null, null, subject, 0);
+ }
+
+ public static MockMimeMessage createMimeMessage(String subject, int number) throws MessagingException {
+ return createMimeMessage(null, null, subject, number);
+ }
+
+ public static MockMimeMessage 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 {
+ String sender = "test@james.apache.org";
+ String rcpt = "test2@james.apache.org";
+
+ MockMimeMessage mockedMimeMessage = new MockMimeMessage(number);
+ mockedMimeMessage.setFrom(new InternetAddress(sender));
+ mockedMimeMessage.setRecipients(MimeMessage.RecipientType.TO, rcpt);
+ if (headerName != null) mockedMimeMessage.setHeader(headerName, headerValue);
+ if (subject != null) mockedMimeMessage.setSubject(subject);
+ mockedMimeMessage.setText("testtext");
+ mockedMimeMessage.saveChanges();
+ return mockedMimeMessage;
+ }
+
+}
Propchange: james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/mock/util/MailUtil.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/util/Util.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/util/Util.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/util/Util.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/test/util/Util.java Tue Jul 29 08:49:22 2008
@@ -35,20 +35,10 @@
import org.apache.james.smtpserver.core.SendMailHandler;
import org.apache.james.smtpserver.core.VrfyCmdHandler;
import org.apache.james.test.mock.avalon.MockLogger;
-import org.apache.james.test.mock.james.MockMailServer;
-import org.apache.james.test.mock.javaxmail.MockMimeMessage;
-import org.apache.james.test.mock.mailet.MockMail;
import org.apache.james.test.mock.util.AttrValConfiguration;
-import org.apache.mailet.MailAddress;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.ParseException;
import java.io.IOException;
import java.net.ServerSocket;
-import java.util.Arrays;
/**
* some utilities for James unit testing
@@ -141,46 +131,6 @@
return cmdHandlerConfig;
}
- public static MockMail createMockMail2Recipients(MimeMessage m) throws ParseException {
- MockMail mockedMail = new MockMail();
- mockedMail.setName(MockMailServer.newId());
- mockedMail.setMessage(m);
- mockedMail.setRecipients(Arrays.asList(new MailAddress[] {
- new MailAddress("test@james.apache.org"),
- new MailAddress("test2@james.apache.org") }));
- return mockedMail;
- }
-
- public static MockMimeMessage createMimeMessage() throws MessagingException {
- return createMimeMessage(null, null);
- }
-
- public static MockMimeMessage createMimeMessageWithSubject(String subject) throws MessagingException {
- return createMimeMessage(null, null, subject, 0);
- }
-
- public static MockMimeMessage createMimeMessage(String subject, int number) throws MessagingException {
- return createMimeMessage(null, null, subject, number);
- }
-
- public static MockMimeMessage 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 {
- String sender = "test@james.apache.org";
- String rcpt = "test2@james.apache.org";
-
- MockMimeMessage mockedMimeMessage = new MockMimeMessage(number);
- mockedMimeMessage.setFrom(new InternetAddress(sender));
- mockedMimeMessage.setRecipients(MimeMessage.RecipientType.TO, rcpt);
- if (headerName != null) mockedMimeMessage.setHeader(headerName, headerValue);
- if (subject != null) mockedMimeMessage.setSubject(subject);
- mockedMimeMessage.setText("testtext");
- mockedMimeMessage.saveChanges();
- return mockedMimeMessage;
- }
-
/**
* @return
* @throws Exception
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java Tue Jul 29 08:49:22 2008
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMailetConfig;
-import org.apache.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
@@ -54,11 +54,11 @@
}
private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessageWithSubject(subject);
+ mockedMimeMessage = MailUtil.createMimeMessageWithSubject(subject);
}
private void setupMockedMail(MimeMessage m) throws ParseException {
- mockedMail = Util.createMockMail2Recipients(m);
+ mockedMail = MailUtil.createMockMail2Recipients(m);
}
private void setupMailet() throws MessagingException {
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/MailAttributesToMimeHeadersTest.java Tue Jul 29 08:49:22 2008
@@ -24,7 +24,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mailet;
import javax.mail.MessagingException;
@@ -76,7 +76,7 @@
}
private MockMail setupMail(MimeMessage m) throws ParseException {
- MockMail mockedMail = Util.createMockMail2Recipients(m);
+ MockMail 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(Util.createMimeMessage());
+ MockMail 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(Util.createMimeMessage());
+ MockMail mockedMail = setupMail(MailUtil.createMimeMessage());
setConfig1("test");
try {
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java Tue Jul 29 08:49:22 2008
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMailetConfig;
-import org.apache.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
@@ -44,7 +44,7 @@
}
private void setupMockedMail(MimeMessage m) throws ParseException {
- mockedMail = Util.createMockMail2Recipients(m);
+ mockedMail = MailUtil.createMockMail2Recipients(m);
mockedMail.setAttribute("org.apache.james.test.junit", "true");
}
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/RemoveMimeHeaderTest.java Tue Jul 29 08:49:22 2008
@@ -27,7 +27,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.GenericMailet;
import org.apache.mailet.Mail;
@@ -50,7 +50,7 @@
}
private MimeMessage getMockedMimeMessage() throws MessagingException {
- MimeMessage mockedMimeMessage = Util.createMimeMessage();
+ MimeMessage mockedMimeMessage = MailUtil.createMimeMessage();
mockedMimeMessage.setHeader(HEADER1, "true");
mockedMimeMessage.setHeader(HEADER2, "true");
mockedMimeMessage.saveChanges();
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java Tue Jul 29 08:49:22 2008
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
import org.apache.james.test.mock.mailet.MockMailContext;
import org.apache.james.test.mock.mailet.MockMailetConfig;
-import org.apache.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
@@ -57,7 +57,7 @@
// test if the Header was add
public void testMailAttributeAdded() throws MessagingException {
- mockedMail = Util.createMockMail2Recipients(null);
+ mockedMail = MailUtil.createMockMail2Recipients(null);
setupMailet();
assertNull(mockedMail.getAttribute(ATTRIBUTE_NAME1));
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java Tue Jul 29 08:49:22 2008
@@ -24,7 +24,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Mailet;
import javax.mail.MessagingException;
@@ -67,8 +67,8 @@
// test if the Header was add
public void testHeaderIsPresent() throws MessagingException {
- MimeMessage mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
- MockMail mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ MimeMessage mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
+ MockMail mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMailet();
mailet.service(mockedMail);
@@ -83,8 +83,8 @@
setHeaderName(HEADER_NAME);
setHeaderValue(headerValue);
- MimeMessage mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
- MockMail mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ MimeMessage mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
+ MockMail mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMailet();
mailet.service(mockedMail);
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java Tue Jul 29 08:49:22 2008
@@ -32,7 +32,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.GenericMatcher;
import org.apache.mailet.Matcher;
@@ -64,7 +64,7 @@
}
protected void setupMockedMail(MimeMessage m) throws ParseException {
- mockedMail = Util.createMockMail2Recipients(m);
+ mockedMail = MailUtil.createMockMail2Recipients(m);
mockedMail.setAttribute(mailAttributeName,
(Serializable) mailAttributeValue);
}
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java Tue Jul 29 08:49:22 2008
@@ -25,7 +25,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Matcher;
import javax.mail.MessagingException;
@@ -58,7 +58,7 @@
}
protected void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessage("test", "test");
+ mockedMimeMessage = MailUtil.createMimeMessage("test", "test");
mockedMimeMessage.setSubject(subject);
}
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AllTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AllTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AllTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/AllTest.java Tue Jul 29 08:49:22 2008
@@ -23,7 +23,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Matcher;
@@ -53,7 +53,7 @@
// test if all recipients was returned
public void testAllRecipientsReturned() throws MessagingException {
- mockedMail = Util.createMockMail2Recipients(null);
+ mockedMail = MailUtil.createMockMail2Recipients(null);
setupMatcher();
Collection matchedRecipients = matcher.match(mockedMail);
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/FetchedFromTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/FetchedFromTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/FetchedFromTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/FetchedFromTest.java Tue Jul 29 08:49:22 2008
@@ -24,7 +24,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Matcher;
import javax.mail.MessagingException;
@@ -62,11 +62,11 @@
}
private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
+ mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
}
private void setupMockedMail(MimeMessage m) throws ParseException {
- mockedMail = Util.createMockMail2Recipients(m);
+ mockedMail = MailUtil.createMockMail2Recipients(m);
}
private void setupMatcher() throws MessagingException {
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/HasHeaderTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/HasHeaderTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/HasHeaderTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/HasHeaderTest.java Tue Jul 29 08:49:22 2008
@@ -24,7 +24,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Matcher;
import javax.mail.MessagingException;
@@ -61,7 +61,7 @@
}
private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
+ mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
}
private void setupMatcher() throws MessagingException {
@@ -78,7 +78,7 @@
setHeaderValue(HEADER_VALUE);
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMatcher();
Collection matchedRecipients = matcher.match(mockedMail);
@@ -91,7 +91,7 @@
// test if the Header was not matched
public void testHeaderIsNotMatched() throws MessagingException {
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMatcher();
Collection matchedRecipients = matcher.match(mockedMail);
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/NESSpamCheckTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/NESSpamCheckTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/NESSpamCheckTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/NESSpamCheckTest.java Tue Jul 29 08:49:22 2008
@@ -24,7 +24,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Matcher;
import org.apache.mailet.RFC2822Headers;
@@ -58,7 +58,7 @@
}
private void setupMockedMimeMessage() throws MessagingException {
- mockedMimeMessage = Util.createMimeMessage(headerName, headerValue);
+ mockedMimeMessage = MailUtil.createMimeMessage(headerName, headerValue);
}
private void setupMatcher() throws MessagingException {
@@ -73,7 +73,7 @@
setHeaderValue("xxxxxxxxxxxxxxxxxxxxx");
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMatcher();
Collection matchedRecipients = matcher.match(mockedMail);
@@ -84,7 +84,7 @@
public void testNESSpamCheckNotMatched() throws MessagingException {
setupMockedMimeMessage();
- mockedMail = Util.createMockMail2Recipients(mockedMimeMessage);
+ mockedMail = MailUtil.createMockMail2Recipients(mockedMimeMessage);
setupMatcher();
Collection matchedRecipients = matcher.match(mockedMail);
Modified: james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java
URL: http://svn.apache.org/viewvc/james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java?rev=680741&r1=680740&r2=680741&view=diff
==============================================================================
--- james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java (original)
+++ james/server/trunk/phoenix-deployment/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java Tue Jul 29 08:49:22 2008
@@ -31,7 +31,7 @@
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.james.test.util.Util;
+import org.apache.james.test.mock.util.MailUtil;
import org.apache.mailet.Matcher;
public class SMTPIsAuthNetworkTest extends TestCase {
@@ -54,7 +54,7 @@
}
private void setupMockedMail() throws ParseException {
- mockedMail = Util.createMockMail2Recipients(null);
+ mockedMail = MailUtil.createMockMail2Recipients(null);
if (isAuthorized) {
mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME, "true");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org