thx bernd ;-)
Am Montag, den 26.06.2006, 22:52 +0000 schrieb [EMAIL PROTECTED]: > Author: berndf > Date: Mon Jun 26 15:52:34 2006 > New Revision: 417307 > > URL: http://svn.apache.org/viewvc?rev=417307&view=rev > Log: > - unified copy-paste initializing test code in class o.a.j.test.Util > > Modified: > > james/server/trunk/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java > james/server/trunk/src/test/org/apache/james/test/util/Util.java > > james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java > > james/server/trunk/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java > > james/server/trunk/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java > > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java > > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java > > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java > > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java > > james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java > > james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java > > james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java > > james/server/trunk/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java > > Modified: > james/server/trunk/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/smtpserver/SetMimeHeaderHandlerTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,24 +17,18 @@ > > package org.apache.james.smtpserver; > > -import java.io.IOException; > -import java.io.InputStream; > -import java.util.Arrays; > -import java.util.HashMap; > - > -import javax.mail.MessagingException; > -import javax.mail.internet.InternetAddress; > -import javax.mail.internet.MimeMessage; > -import javax.mail.internet.MimeMessage.RecipientType; > - > +import junit.framework.TestCase; > import org.apache.avalon.framework.container.ContainerUtil; > import org.apache.james.test.mock.avalon.MockLogger; > -import org.apache.james.test.mock.javaxmail.MockMimeMessage; > -import org.apache.james.test.mock.mailet.MockMail; > +import org.apache.james.test.util.Util; > import org.apache.james.util.watchdog.Watchdog; > import org.apache.mailet.Mail; > > -import junit.framework.TestCase; > +import javax.mail.MessagingException; > +import javax.mail.internet.MimeMessage; > +import java.io.IOException; > +import java.io.InputStream; > +import java.util.HashMap; > > public class SetMimeHeaderHandlerTest extends TestCase { > > @@ -66,25 +60,7 @@ > } > > private void setupMockedMimeMessage() throws MessagingException { > - String sender = "[EMAIL PROTECTED]"; > - String rcpt = "[EMAIL PROTECTED]"; > - > - mockedMimeMessage = new MockMimeMessage(); > - mockedMimeMessage.setFrom(new InternetAddress(sender)); > - mockedMimeMessage.setRecipients(RecipientType.TO, rcpt); > - mockedMimeMessage.setHeader(headerName, headerValue); > - mockedMimeMessage.setSubject("testmail"); > - mockedMimeMessage.setText("testtext"); > - mockedMimeMessage.saveChanges(); > - > - } > - > - private void setupMockedMail(MimeMessage m) { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new String[] { > - "[EMAIL PROTECTED]", "[EMAIL PROTECTED]" })); > - > + mockedMimeMessage = Util.createMimeMessage(headerName, headerValue); > } > > private void setupMockedSMTPSession() { > @@ -237,7 +213,7 @@ > setHeaderValue(HEADER_VALUE); > > setupMockedMimeMessage(); > - setupMockedMail(mockedMimeMessage); > + mockedMail = Util.createMockMail2Recipients(mockedMimeMessage); > > SetMimeHeaderHandler header = new SetMimeHeaderHandler(); > > @@ -257,7 +233,7 @@ > setHeaderValue(headerValue); > > setupMockedMimeMessage(); > - setupMockedMail(mockedMimeMessage); > + mockedMail = Util.createMockMail2Recipients(mockedMimeMessage); > > SetMimeHeaderHandler header = new SetMimeHeaderHandler(); > > > Modified: james/server/trunk/src/test/org/apache/james/test/util/Util.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/test/util/Util.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- james/server/trunk/src/test/org/apache/james/test/util/Util.java > (original) > +++ james/server/trunk/src/test/org/apache/james/test/util/Util.java Mon Jun > 26 15:52:34 2006 > @@ -19,6 +19,15 @@ > import org.apache.avalon.framework.configuration.Configuration; > import org.apache.avalon.framework.configuration.DefaultConfiguration; > import org.apache.james.smtpserver.*; > +import org.apache.james.test.mock.mailet.MockMail; > +import org.apache.james.test.mock.javaxmail.MockMimeMessage; > +import org.apache.mailet.MailAddress; > + > +import javax.mail.internet.MimeMessage; > +import javax.mail.internet.ParseException; > +import javax.mail.internet.InternetAddress; > +import javax.mail.MessagingException; > +import java.util.Arrays; > > /** > * some utilities for James unit testing > @@ -93,4 +102,42 @@ > return cmdHandlerConfig; > } > > + public static MockMail createMockMail2Recipients(MimeMessage m) throws > ParseException { > + MockMail mockedMail = new MockMail(); > + mockedMail.setMessage(m); > + mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > + new MailAddress("[EMAIL PROTECTED]"), > + new MailAddress("[EMAIL PROTECTED]") })); > + 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 = "[EMAIL PROTECTED]"; > + String rcpt = "[EMAIL PROTECTED]"; > + > + 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; > + } > } > > Modified: > james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/LinearProcessorTest.java > Mon Jun 26 15:52:34 2006 > @@ -48,17 +48,15 @@ > import junit.framework.TestCase; > > /** > - * Currently here as a proof of JAMES-421. > - * Fixing code will follow > + * contains a proof of JAMES-421. > */ > public class LinearProcessorTest extends TestCase { > - Collection c; > - LinearProcessor t; > - MimeMessage mw = null; > + LinearProcessor linearProcessor; > + MimeMessage mimeMessage = null; > String content = "Subject: test\r\nContent-Transfer-Encoding: plain"; > String sep = "\r\n\r\n"; > String body = "original body\r\n.\r\n"; > - MailetContext mockContext = new MockMailContext(); > + MailetContext mockContext = new MockMailContext(); > > public static int counter = 0; > > @@ -106,7 +104,7 @@ > mmis = new MimeMessageInputStreamSource("test", new > SharedByteArrayInputStream((content+sep+body).getBytes())); > } catch (MessagingException e) { > } > - mw = new MimeMessageCopyOnWriteProxy(mmis); > + mimeMessage = new MimeMessageCopyOnWriteProxy(mmis); > setUp(); > } > > @@ -130,7 +128,7 @@ > } > > public void testCopyOnWrite() throws IOException, MessagingException { > - t.setSpool(new MockSpoolRepository()); > + linearProcessor.setSpool(new MockSpoolRepository()); > Matcher recipientIs = new RecipientIs(); > recipientIs.init(new DummyMatcherConfig("[EMAIL PROTECTED]")); > > @@ -147,19 +145,19 @@ > changeBody.init(mockMailetConfig); > > checkerMailet = new CheckerMailet(); > - t.openProcessorList(); > - t.add(recipientIs,changeBody); > - t.add(all,changeBody); > - t.add(all,dumpSystemErr); > - t.add(all,checkerMailet); > - t.closeProcessorLists(); > + linearProcessor.openProcessorList(); > + linearProcessor.add(recipientIs,changeBody); > + linearProcessor.add(all,changeBody); > + linearProcessor.add(all,dumpSystemErr); > + linearProcessor.add(all,checkerMailet); > + linearProcessor.closeProcessorLists(); > > Collection recipients = new ArrayList(); > recipients.add(new MailAddress("rec1","domain.com")); > recipients.add(new MailAddress("rec2","domain.com")); > try { > - MailImpl m = new MailImpl("mail1",new > MailAddress("sender","domain.com"),recipients,mw); > - t.service(m); > + MailImpl m = new MailImpl("mail1",new > MailAddress("sender","domain.com"),recipients,mimeMessage); > + linearProcessor.service(m); > ArrayList a = checkerMailet.receivedMails; > assertEquals(2,a.size()); > MimeMessage m1 = ((Mail) a.get(0)).getMessage(); > @@ -174,7 +172,7 @@ > } > > public void testStateChange() throws IOException, MessagingException { > - t.setSpool(new MockSpoolRepository() { > + linearProcessor.setSpool(new MockSpoolRepository() { > public void store(Mail mc) throws MessagingException { > assertEquals("MYSTATE",mc.getState()); > super.store(mc); > @@ -190,19 +188,19 @@ > Mailet dumpSystemErr = new DumpSystemErr(); > > checkerMailet = new CheckerMailet(); > - t.openProcessorList(); > - t.add(recipientIs,dumpSystemErr); > - t.add(all,dumpSystemErr); > - t.add(all,checkerMailet); > - t.closeProcessorLists(); > + linearProcessor.openProcessorList(); > + linearProcessor.add(recipientIs,dumpSystemErr); > + linearProcessor.add(all,dumpSystemErr); > + linearProcessor.add(all,checkerMailet); > + linearProcessor.closeProcessorLists(); > > Collection recipients = new ArrayList(); > recipients.add(new MailAddress("rec1","domain.com")); > recipients.add(new MailAddress("rec2","domain.com")); > try { > - MailImpl m = new MailImpl("mail1",new > MailAddress("sender","domain.com"),recipients,mw); > + MailImpl m = new MailImpl("mail1",new > MailAddress("sender","domain.com"),recipients,mimeMessage); > m.setState("MYSTATE"); > - t.service(m); > + linearProcessor.service(m); > ArrayList a = checkerMailet.receivedMails; > assertEquals(2,a.size()); > MimeMessage m1 = ((Mail) a.get(0)).getMessage(); > @@ -218,13 +216,13 @@ > > public void setUp() throws Exception { > super.setUp(); > - t = new LinearProcessor(); > + linearProcessor = new LinearProcessor(); > Logger l = new ConsoleLogger(); > - ContainerUtil.enableLogging(t, l); > + ContainerUtil.enableLogging(linearProcessor, l); > } > > public void tearDown() throws Exception { > - ContainerUtil.dispose(t); > + ContainerUtil.dispose(linearProcessor); > super.tearDown(); > } > > > Modified: > james/server/trunk/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/mailets/AddSubjectPrefixTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,24 +17,17 @@ > > package org.apache.james.transport.mailets; > > -import org.apache.james.test.mock.javaxmail.MockMimeMessage; > -import org.apache.james.test.mock.mailet.MockMail; > +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.mailet.Mail; > -import org.apache.mailet.MailAddress; > import org.apache.mailet.Mailet; > > import javax.mail.MessagingException; > -import javax.mail.internet.InternetAddress; > import javax.mail.internet.MimeMessage; > import javax.mail.internet.ParseException; > -import javax.mail.internet.MimeMessage.RecipientType; > - > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > - > -import junit.framework.TestCase; > > public class AddSubjectPrefixTest extends TestCase { > > @@ -58,32 +51,17 @@ > } > > private void setupMockedMimeMessage() throws MessagingException { > - String sender = "[EMAIL PROTECTED]"; > - String rcpt = "[EMAIL PROTECTED]"; > - > - mockedMimeMessage = new MockMimeMessage(); > - mockedMimeMessage.setFrom(new InternetAddress(sender)); > - mockedMimeMessage.setRecipients(RecipientType.TO, rcpt); > - mockedMimeMessage.setSubject(subject); > - mockedMimeMessage.setText("testtext"); > - mockedMimeMessage.saveChanges(); > - > + mockedMimeMessage = Util.createMimeMessageWithSubject(subject); > } > > private void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > - > + mockedMail = Util.createMockMail2Recipients(m); > } > > private void setupMailet() throws MessagingException { > setupMockedMimeMessage(); > mailet = new AddSubjectPrefix(); > - MockMailetConfig mci = new MockMailetConfig("Test", > - new MockMailContext()); > + MockMailetConfig mci = new MockMailetConfig("Test", new > MockMailContext()); > mci.setProperty("subjectPrefix", SUBJECT_PREFIX); > > mailet.init(mci); > @@ -92,8 +70,7 @@ > private void setupInvalidMailet() throws MessagingException { > setupMockedMimeMessage(); > mailet = new AddSubjectPrefix(); > - MockMailetConfig mci = new MockMailetConfig("Test", > - new MockMailContext()); > + MockMailetConfig mci = new MockMailetConfig("Test", new > MockMailContext()); > mci.setProperty("subjectPrefix", ""); > > mailet.init(mci); > @@ -108,8 +85,7 @@ > > mailet.service(mockedMail); > > - assertEquals(SUBJECT_PREFIX + " " + subject, mockedMail.getMessage() > - .getSubject()); > + assertEquals(SUBJECT_PREFIX + " " + subject, > mockedMail.getMessage().getSubject()); > > } > > > Modified: > james/server/trunk/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/mailets/RemoveAllMailAttributesTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,26 +17,20 @@ > > package org.apache.james.transport.mailets; > > -import org.apache.james.test.mock.mailet.MockMail; > +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.mailet.Mail; > -import org.apache.mailet.MailAddress; > import org.apache.mailet.Mailet; > > import javax.mail.MessagingException; > import javax.mail.internet.MimeMessage; > import javax.mail.internet.ParseException; > - > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > - > -import junit.framework.TestCase; > > public class RemoveAllMailAttributesTest extends TestCase { > > - private MimeMessage mockedMimeMessage; > - > private Mail mockedMail; > > private Mailet mailet; > @@ -47,11 +41,7 @@ > } > > private void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > + mockedMail = Util.createMockMail2Recipients(m); > mockedMail.setAttribute("org.apache.james.test.junit", "true"); > > } > @@ -65,7 +55,7 @@ > > // test if ToProcessor works > public void testRemoveAllMailAttributes() throws MessagingException { > - setupMockedMail(mockedMimeMessage); > + setupMockedMail(null); > setupMailet(); > > // check if the mail has a attribute > > Modified: > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMailAttributeTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,26 +17,18 @@ > > package org.apache.james.transport.mailets; > > -import org.apache.james.test.mock.mailet.MockMail; > +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.mailet.Mail; > -import org.apache.mailet.MailAddress; > import org.apache.mailet.Mailet; > > import javax.mail.MessagingException; > -import javax.mail.internet.MimeMessage; > -import javax.mail.internet.ParseException; > - > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > - > -import junit.framework.TestCase; > > public class SetMailAttributeTest extends TestCase { > > - private MimeMessage mockedMimeMessage; > - > private Mail mockedMail; > > private Mailet mailet; > @@ -50,14 +42,6 @@ > super(arg0); > } > > - private void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > - } > - > private void setupMailet() throws MessagingException { > mailet = new SetMailAttribute(); > MockMailetConfig mci = new MockMailetConfig("Test", > @@ -70,7 +54,7 @@ > > // test if the Header was add > public void testMailAttributeAdded() throws MessagingException { > - setupMockedMail(mockedMimeMessage); > + mockedMail = Util.createMockMail2Recipients(null); > setupMailet(); > > assertNull(mockedMail.getAttribute(ATTRIBUTE_NAME1)); > > Modified: > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/mailets/SetMimeHeaderTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,31 +17,19 @@ > > package org.apache.james.transport.mailets; > > -import org.apache.james.test.mock.javaxmail.MockMimeMessage; > +import junit.framework.TestCase; > import org.apache.james.test.mock.mailet.MockMail; > import org.apache.james.test.mock.mailet.MockMailContext; > import org.apache.james.test.mock.mailet.MockMailetConfig; > -import org.apache.mailet.Mail; > -import org.apache.mailet.MailAddress; > +import org.apache.james.test.util.Util; > import org.apache.mailet.Mailet; > > import javax.mail.MessagingException; > -import javax.mail.internet.InternetAddress; > import javax.mail.internet.MimeMessage; > -import javax.mail.internet.ParseException; > -import javax.mail.internet.MimeMessage.RecipientType; > - > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > - > -import junit.framework.TestCase; > > public class SetMimeHeaderTest extends TestCase { > > - private MimeMessage mockedMimeMessage; > - > - private Mail mockedMail; > - > private Mailet mailet; > > private final String HEADER_NAME = "JUNIT"; > @@ -64,30 +52,7 @@ > this.headerValue = headerValue; > } > > - private void setupMockedMimeMessage() throws MessagingException { > - String sender = "[EMAIL PROTECTED]"; > - String rcpt = "[EMAIL PROTECTED]"; > - > - mockedMimeMessage = new MockMimeMessage(); > - mockedMimeMessage.setFrom(new InternetAddress(sender)); > - mockedMimeMessage.setRecipients(RecipientType.TO, rcpt); > - mockedMimeMessage.setHeader(headerName, headerValue); > - mockedMimeMessage.setSubject("testmail"); > - mockedMimeMessage.setText("testtext"); > - mockedMimeMessage.saveChanges(); > - > - } > - > - private void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), new > MailAddress("[EMAIL PROTECTED]") })); > - > - } > - > private void setupMailet() throws MessagingException { > - setupMockedMimeMessage(); > mailet = new SetMimeHeader(); > MockMailetConfig mci = new MockMailetConfig("Test", > new MockMailContext()); > @@ -99,8 +64,8 @@ > > // test if the Header was add > public void testHeaderIsPresent() throws MessagingException { > - setupMockedMimeMessage(); > - setupMockedMail(mockedMimeMessage); > + MimeMessage mockedMimeMessage = Util.createMimeMessage(headerName, > headerValue); > + MockMail mockedMail = > Util.createMockMail2Recipients(mockedMimeMessage); > setupMailet(); > > mailet.service(mockedMail); > @@ -115,8 +80,8 @@ > setHeaderName(HEADER_NAME); > setHeaderValue(headerValue); > > - setupMockedMimeMessage(); > - setupMockedMail(mockedMimeMessage); > + MimeMessage mockedMimeMessage = Util.createMimeMessage(headerName, > headerValue); > + MockMail mockedMail = > Util.createMockMail2Recipients(mockedMimeMessage); > setupMailet(); > > mailet.service(mockedMail); > > Modified: > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractHasMailAttributeTest.java > Mon Jun 26 15:52:34 2006 > @@ -30,6 +30,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.mailet.GenericMatcher; > import org.apache.mailet.MailAddress; > import org.apache.mailet.Matcher; > @@ -62,14 +63,9 @@ > } > > protected void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > + mockedMail = Util.createMockMail2Recipients(m); > mockedMail.setAttribute(mailAttributeName, > (Serializable) mailAttributeValue); > - > } > > protected void setupMatcher() throws MessagingException { > > Modified: > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/matchers/AbstractSubjectIsTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,21 +17,18 @@ > > package org.apache.james.transport.matchers; > > -import java.io.UnsupportedEncodingException; > - > -import javax.mail.MessagingException; > -import javax.mail.internet.InternetAddress; > -import javax.mail.internet.MimeMessage; > -import javax.mail.internet.MimeMessage.RecipientType; > - > import junit.framework.TestCase; > - > import org.apache.james.test.mock.javaxmail.MockMimeMessage; > import org.apache.james.test.mock.mailet.MockMail; > import org.apache.james.test.mock.mailet.MockMailContext; > import org.apache.james.test.mock.mailet.MockMatcherConfig; > +import org.apache.james.test.util.Util; > import org.apache.mailet.Matcher; > > +import javax.mail.MessagingException; > +import javax.mail.internet.MimeMessage; > +import java.io.UnsupportedEncodingException; > + > public abstract class AbstractSubjectIsTest extends TestCase { > > protected MockMail mockedMail; > @@ -58,18 +55,8 @@ > } > > protected void setupMockedMimeMessage() throws MessagingException { > - String sender = "[EMAIL PROTECTED]"; > - String rcpt = "[EMAIL PROTECTED]"; > - > - mockedMimeMessage = new MockMimeMessage(); > - mockedMimeMessage.setFrom(new InternetAddress(sender)); > - mockedMimeMessage.setRecipients(RecipientType.TO, rcpt); > - if (subject != null) { > - mockedMimeMessage.setSubject(subject); > - } > - mockedMimeMessage.setText("testtext"); > - mockedMimeMessage.saveChanges(); > - > + mockedMimeMessage = Util.createMimeMessage("test", "test"); > + mockedMimeMessage.setSubject(subject); > } > > protected void setupMatcher() throws MessagingException { > > Modified: > james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/matchers/AllTest.java > Mon Jun 26 15:52:34 2006 > @@ -20,15 +20,13 @@ > 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.mailet.MailAddress; > import org.apache.mailet.Matcher; > > import javax.mail.MessagingException; > -import javax.mail.internet.ParseException; > > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > import java.util.Collection; > > import junit.framework.TestCase; > @@ -43,14 +41,6 @@ > super(arg0); > } > > - private void setupMockedMail() throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > - > - } > - > private void setupMatcher() throws MessagingException { > matcher = new All(); > MockMatcherConfig mci = new MockMatcherConfig("All", > @@ -60,7 +50,7 @@ > > // test if all recipients was returned > public void testAllRecipientsReturned() throws MessagingException { > - setupMockedMail(); > + mockedMail = Util.createMockMail2Recipients(null); > setupMatcher(); > > Collection matchedRecipients = matcher.match(mockedMail); > > Modified: > james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/matchers/FetchedFromTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,26 +17,19 @@ > > package org.apache.james.transport.matchers; > > -import org.apache.james.test.mock.javaxmail.MockMimeMessage; > +import junit.framework.TestCase; > import org.apache.james.test.mock.mailet.MockMail; > import org.apache.james.test.mock.mailet.MockMailContext; > import org.apache.james.test.mock.mailet.MockMatcherConfig; > - > -import org.apache.mailet.MailAddress; > +import org.apache.james.test.util.Util; > import org.apache.mailet.Matcher; > > import javax.mail.MessagingException; > -import javax.mail.internet.InternetAddress; > import javax.mail.internet.MimeMessage; > import javax.mail.internet.ParseException; > -import javax.mail.internet.MimeMessage.RecipientType; > - > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > import java.util.Collection; > > -import junit.framework.TestCase; > - > public class FetchedFromTest extends TestCase { > > private MimeMessage mockedMimeMessage; > @@ -66,26 +59,11 @@ > } > > private void setupMockedMimeMessage() throws MessagingException { > - String sender = "[EMAIL PROTECTED]"; > - String rcpt = "[EMAIL PROTECTED]"; > - > - mockedMimeMessage = new MockMimeMessage(); > - mockedMimeMessage.setFrom(new InternetAddress(sender)); > - mockedMimeMessage.setRecipients(RecipientType.TO, rcpt); > - mockedMimeMessage.setHeader(headerName, headerValue); > - mockedMimeMessage.setSubject("testmail"); > - mockedMimeMessage.setText("testtext"); > - mockedMimeMessage.saveChanges(); > - > + mockedMimeMessage = Util.createMimeMessage(headerName, headerValue); > } > > private void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > - > + mockedMail = Util.createMockMail2Recipients(m); > } > > private void setupMatcher() throws MessagingException { > > Modified: > james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/matchers/HasHeaderTest.java > Mon Jun 26 15:52:34 2006 > @@ -17,26 +17,18 @@ > > package org.apache.james.transport.matchers; > > -import org.apache.james.test.mock.javaxmail.MockMimeMessage; > +import junit.framework.TestCase; > import org.apache.james.test.mock.mailet.MockMail; > import org.apache.james.test.mock.mailet.MockMailContext; > import org.apache.james.test.mock.mailet.MockMatcherConfig; > - > -import org.apache.mailet.MailAddress; > +import org.apache.james.test.util.Util; > import org.apache.mailet.Matcher; > > import javax.mail.MessagingException; > -import javax.mail.internet.InternetAddress; > import javax.mail.internet.MimeMessage; > -import javax.mail.internet.ParseException; > -import javax.mail.internet.MimeMessage.RecipientType; > - > import java.io.UnsupportedEncodingException; > -import java.util.Arrays; > import java.util.Collection; > > -import junit.framework.TestCase; > - > public class HasHeaderTest extends TestCase { > > private MimeMessage mockedMimeMessage; > @@ -66,26 +58,7 @@ > } > > private void setupMockedMimeMessage() throws MessagingException { > - String sender = "[EMAIL PROTECTED]"; > - String rcpt = "[EMAIL PROTECTED]"; > - > - mockedMimeMessage = new MockMimeMessage(); > - mockedMimeMessage.setFrom(new InternetAddress(sender)); > - mockedMimeMessage.setRecipients(RecipientType.TO, rcpt); > - mockedMimeMessage.setHeader(headerName, headerValue); > - mockedMimeMessage.setSubject("testmail"); > - mockedMimeMessage.setText("testtext"); > - mockedMimeMessage.saveChanges(); > - > - } > - > - private void setupMockedMail(MimeMessage m) throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setMessage(m); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > - > + mockedMimeMessage = Util.createMimeMessage(headerName, headerValue); > } > > private void setupMatcher() throws MessagingException { > @@ -102,7 +75,7 @@ > setHeaderValue(HEADER_VALUE); > > setupMockedMimeMessage(); > - setupMockedMail(mockedMimeMessage); > + mockedMail = Util.createMockMail2Recipients(mockedMimeMessage); > setupMatcher(); > > Collection matchedRecipients = matcher.match(mockedMail); > @@ -115,7 +88,7 @@ > // test if the Header was not matched > public void testHeaderIsNotMatched() throws MessagingException { > setupMockedMimeMessage(); > - setupMockedMail(mockedMimeMessage); > + mockedMail = Util.createMockMail2Recipients(mockedMimeMessage); > setupMatcher(); > > Collection matchedRecipients = matcher.match(mockedMail); > > Modified: > james/server/trunk/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java > URL: > http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java?rev=417307&r1=417306&r2=417307&view=diff > ============================================================================== > --- > james/server/trunk/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java > (original) > +++ > james/server/trunk/src/test/org/apache/james/transport/matchers/SMTPIsAuthNetworkTest.java > Mon Jun 26 15:52:34 2006 > @@ -29,6 +29,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.mailet.MailAddress; > import org.apache.mailet.Matcher; > > @@ -52,13 +53,9 @@ > } > > private void setupMockedMail() throws ParseException { > - mockedMail = new MockMail(); > - mockedMail.setRecipients(Arrays.asList(new MailAddress[] { > - new MailAddress("[EMAIL PROTECTED]"), > - new MailAddress("[EMAIL PROTECTED]") })); > + mockedMail = Util.createMockMail2Recipients(null); > if (isAuthorized) { > mockedMail.setAttribute(MAIL_ATTRIBUTE_NAME, "true"); > - > } > } > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [EMAIL PROTECTED] > For additional commands, e-mail: [EMAIL PROTECTED] > > !EXCUBATOR:1,44a0655248539981717773!
signature.asc
Description: Dies ist ein digital signierter Nachrichtenteil
