Author: ieugen
Date: Mon Mar 12 00:58:33 2012
New Revision: 1299511
URL: http://svn.apache.org/viewvc?rev=1299511&view=rev
Log:
JAMES-1393
- updated tests to juni 4.x style
- added @Override and reformated code
Issue #JAMES-1393 - Upgrate all test suites to junit 4.10
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/HelloWorldMailet.java
Mon Mar 12 00:58:33 2012
@@ -16,11 +16,9 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.samples.mailets;
import javax.mail.MessagingException;
-
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
@@ -33,25 +31,29 @@ public class HelloWorldMailet implements
private MailetConfig config;
+ @Override
public void destroy() {
-
}
+ @Override
public String getMailetInfo() {
- return "Example mailet";
+ return "Example mailet";
}
+ @Override
public MailetConfig getMailetConfig() {
- return config;
+ return config;
}
+ @Override
public void init(MailetConfig config) throws MessagingException {
- this.config = config;
+ this.config = config;
}
+ @Override
public void service(Mail mail) throws MessagingException {
- MailetContext context = config.getMailetContext();
- context.log("Hello, World!");
- context.log("You have mail from " + mail.getSender().getLocalPart());
+ MailetContext context = config.getMailetContext();
+ context.log("Hello, World!");
+ context.log("You have mail from " + mail.getSender().getLocalPart());
}
}
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/samples/mailets/InstrumentationMailet.java
Mon Mar 12 00:58:33 2012
@@ -16,29 +16,22 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.samples.mailets;
import java.io.IOException;
import java.util.Collection;
import java.util.Enumeration;
import java.util.Iterator;
-
import javax.mail.Address;
import javax.mail.Flags;
+import javax.mail.Flags.Flag;
import javax.mail.Header;
import javax.mail.MessagingException;
-import javax.mail.Flags.Flag;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
-import javax.mail.internet.NewsAddress;
import javax.mail.internet.MimeMessage.RecipientType;
-
-import org.apache.mailet.Mail;
-import org.apache.mailet.MailAddress;
-import org.apache.mailet.Mailet;
-import org.apache.mailet.MailetConfig;
-import org.apache.mailet.MailetContext;
+import javax.mail.internet.NewsAddress;
+import org.apache.mailet.*;
/**
* Mailet just prints out the details of a message. Sometimes Useful for
@@ -48,108 +41,112 @@ public class InstrumentationMailet imple
private MailetConfig config;
+ @Override
public void destroy() {
-
}
+ @Override
public String getMailetInfo() {
- return "Example mailet";
+ return "Example mailet";
}
+ @Override
public MailetConfig getMailetConfig() {
- return config;
+ return config;
}
+ @Override
public void init(MailetConfig config) throws MessagingException {
- this.config = config;
+ this.config = config;
}
+ @Override
public void service(Mail mail) throws MessagingException {
- MailetContext context = config.getMailetContext();
- context.log("######## MAIL STARTS");
- context.log("");
-
- MimeMessage message = mail.getMessage();
-
- context.log("Mail named: " + mail.getName());
-
- for (Iterator it = mail.getAttributeNames(); it.hasNext();) {
- String attributeName = (String) it.next();
- context.log("Attribute " + attributeName);
- }
- context.log("Message size: " + mail.getMessageSize());
- context.log("Last updated: " + mail.getLastUpdated());
- context.log("Remote Address: " + mail.getRemoteAddr());
- context.log("Remote Host: " + mail.getRemoteHost());
- context.log("State: " + mail.getState());
- context.log("Sender host: " + mail.getSender().getDomain());
- context.log("Sender user: " + mail.getSender().getLocalPart());
- Collection<MailAddress> recipients = mail.getRecipients();
- for (Iterator<MailAddress> it = recipients.iterator(); it.hasNext();) {
- MailAddress address = it.next();
- context.log("Recipient: " + address.getLocalPart() + "@" +
address.getDomain());
- }
-
- context.log("Subject: " + message.getSubject());
- context.log("MessageID: " + message.getMessageID());
- context.log("Received: " + message.getReceivedDate());
- context.log("Sent: " + message.getSentDate());
-
- Enumeration allHeadersLines = message.getAllHeaderLines();
- while (allHeadersLines.hasMoreElements()) {
- String header = (String) allHeadersLines.nextElement();
- context.log("Header Line:= " + header);
- }
-
- Enumeration allHeadersEnumeration = message.getAllHeaders();
- while (allHeadersEnumeration.hasMoreElements()) {
- Header header = (Header) allHeadersEnumeration.nextElement();
- context.log("Header: " + header.getName() + "=" +
header.getValue());
- }
-
- Address[] to = message.getRecipients(RecipientType.TO);
- printAddresses(to, "TO: ");
- Address[] cc = message.getRecipients(RecipientType.CC);
- printAddresses(cc, "CC: ");
- Address[] bcc = message.getRecipients(RecipientType.BCC);
- printAddresses(bcc, "BCC: ");
-
- Flags flags = message.getFlags();
- Flag[] systemFlags = flags.getSystemFlags();
- for (int i = 0; i < systemFlags.length; i++) {
- context.log("System Flag:" + systemFlags[i]);
- }
- String[] userFlags = flags.getUserFlags();
- for (int i = 0; i < userFlags.length; i++) {
- context.log("User flag: " + userFlags[i]);
- }
-
- String mimeType = message.getContentType();
- context.log("Mime type: " + mimeType);
- if (mimeType == "text/plain") {
- try {
- Object content = message.getContent();
- context.log("Content: " + content);
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- }
-
- context.log("");
- context.log("######## MAIL ENDS");
- }
-
- private final void printAddresses(Address[] addresses, String prefix) {
- MailetContext context = config.getMailetContext();
- for (int i = 0; i < addresses.length; i++) {
- if (addresses[i] instanceof InternetAddress) {
- InternetAddress address = (InternetAddress) addresses[i];
- context.log(prefix + address.getPersonal() + "@" +
address.getAddress());
- } else if (addresses[i] instanceof NewsAddress) {
- NewsAddress address = (NewsAddress) addresses[i];
- context.log(prefix + address.getNewsgroup() + "@" +
address.getHost());
- }
- }
+ MailetContext context = config.getMailetContext();
+ context.log("######## MAIL STARTS");
+ context.log("");
+
+ MimeMessage message = mail.getMessage();
+
+ context.log("Mail named: " + mail.getName());
+
+ for (Iterator it = mail.getAttributeNames(); it.hasNext();) {
+ String attributeName = (String) it.next();
+ context.log("Attribute " + attributeName);
+ }
+ context.log("Message size: " + mail.getMessageSize());
+ context.log("Last updated: " + mail.getLastUpdated());
+ context.log("Remote Address: " + mail.getRemoteAddr());
+ context.log("Remote Host: " + mail.getRemoteHost());
+ context.log("State: " + mail.getState());
+ context.log("Sender host: " + mail.getSender().getDomain());
+ context.log("Sender user: " + mail.getSender().getLocalPart());
+ Collection<MailAddress> recipients = mail.getRecipients();
+ for (Iterator<MailAddress> it = recipients.iterator(); it.hasNext();) {
+ MailAddress address = it.next();
+ context.log("Recipient: " + address.getLocalPart() + "@" +
address.getDomain());
+ }
+
+ context.log("Subject: " + message.getSubject());
+ context.log("MessageID: " + message.getMessageID());
+ context.log("Received: " + message.getReceivedDate());
+ context.log("Sent: " + message.getSentDate());
+
+ Enumeration allHeadersLines = message.getAllHeaderLines();
+ while (allHeadersLines.hasMoreElements()) {
+ String header = (String) allHeadersLines.nextElement();
+ context.log("Header Line:= " + header);
+ }
+
+ Enumeration allHeadersEnumeration = message.getAllHeaders();
+ while (allHeadersEnumeration.hasMoreElements()) {
+ Header header = (Header) allHeadersEnumeration.nextElement();
+ context.log("Header: " + header.getName() + "=" +
header.getValue());
+ }
+
+ Address[] to = message.getRecipients(RecipientType.TO);
+ printAddresses(to, "TO: ");
+ Address[] cc = message.getRecipients(RecipientType.CC);
+ printAddresses(cc, "CC: ");
+ Address[] bcc = message.getRecipients(RecipientType.BCC);
+ printAddresses(bcc, "BCC: ");
+
+ Flags flags = message.getFlags();
+ Flag[] systemFlags = flags.getSystemFlags();
+ for (int i = 0; i < systemFlags.length; i++) {
+ context.log("System Flag:" + systemFlags[i]);
+ }
+ String[] userFlags = flags.getUserFlags();
+ for (int i = 0; i < userFlags.length; i++) {
+ context.log("User flag: " + userFlags[i]);
+ }
+
+ String mimeType = message.getContentType();
+ context.log("Mime type: " + mimeType);
+ if ("text/plain".equals(mimeType)) {
+ try {
+ Object content = message.getContent();
+ context.log("Content: " + content);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ context.log("");
+ context.log("######## MAIL ENDS");
+ }
+
+ private void printAddresses(Address[] addresses, String prefix) {
+ MailetContext context = config.getMailetContext();
+ for (int i = 0; i < addresses.length; i++) {
+ if (addresses[i] instanceof InternetAddress) {
+ InternetAddress address = (InternetAddress) addresses[i];
+ context.log(prefix + address.getPersonal() + "@" +
address.getAddress());
+ } else if (addresses[i] instanceof NewsAddress) {
+ NewsAddress address = (NewsAddress) addresses[i];
+ context.log(prefix + address.getNewsgroup() + "@" +
address.getHost());
+ }
+ }
}
}
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/transport/mailets/RecipientRewriteTableTest.java
Mon Mar 12 00:58:33 2012
@@ -16,20 +16,10 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.transport.mailets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
+import java.util.*;
import javax.mail.MessagingException;
-
-import junit.framework.TestCase;
-
import org.apache.james.rrt.api.RecipientRewriteTableException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
@@ -37,115 +27,140 @@ import org.apache.mailet.base.test.FakeM
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMailetConfig;
import org.apache.mailet.base.test.FakeMimeMessage;
+import org.junit.After;
+import static org.junit.Assert.*;
+import org.junit.Before;
+import org.junit.Test;
-public class RecipientRewriteTableTest extends TestCase {
+public class RecipientRewriteTableTest {
private org.apache.james.transport.mailets.RecipientRewriteTable table;
- @Override
- protected void setUp() throws Exception {
-
- table = new org.apache.james.transport.mailets.RecipientRewriteTable();
- final FakeMailContext mockMailetContext = new FakeMailContext() {
+ @Before
+ public void setUp() throws Exception {
- @Override
- public boolean isLocalServer(String serverName) {
- if (serverName.equals("localhost")) {
- return true;
- }
+ table = new org.apache.james.transport.mailets.RecipientRewriteTable();
+ final FakeMailContext mockMailetContext = new FakeMailContext() {
- return false;
- }
+ @Override
+ public boolean isLocalServer(String serverName) {
+ if (serverName.equals("localhost")) {
+ return true;
+ }
- };
- FakeMailetConfig mockMailetConfig = new FakeMailetConfig("vut",
mockMailetContext, new Properties());
- // mockMailetConfig.put("recipientrewritetable", "vut");
+ return false;
+ }
+ };
+ FakeMailetConfig mockMailetConfig = new FakeMailetConfig("vut",
mockMailetContext, new Properties());
+ // mockMailetConfig.put("recipientrewritetable", "vut");
- table.setRecipientRewriteTable(new
org.apache.james.rrt.api.RecipientRewriteTable() {
- public Collection<String> getMappings(String user, String domain)
throws ErrorMappingException, RecipientRewriteTableException {
- if (user.equals("test") && domain.equals("localhost"))
- return Arrays.asList(new String[] { "whatever@localhost",
"blah@localhost" });
- return null;
- }
+ table.setRecipientRewriteTable(new
org.apache.james.rrt.api.RecipientRewriteTable() {
- public void addRegexMapping(String user, String domain, String
regex) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
- }
+ @Override
+ public Collection<String> getMappings(String user, String domain)
throws ErrorMappingException,
+ RecipientRewriteTableException {
+ if (user.equals("test") && domain.equals("localhost")) {
+ return Arrays.asList(new String[]{"whatever@localhost",
"blah@localhost"});
+ }
+ return null;
+ }
- public void removeRegexMapping(String user, String domain, String
regex) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ @Override
+ public void addRegexMapping(String user, String domain, String
regex) throws RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void removeRegexMapping(String user, String domain, String
regex) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public void addAddressMapping(String user, String domain, String
address) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void addAddressMapping(String user, String domain, String
address) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public void removeAddressMapping(String user, String domain,
String address) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void removeAddressMapping(String user, String domain, String
address) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public void addErrorMapping(String user, String domain, String
error) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void addErrorMapping(String user, String domain, String
error) throws RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public void removeErrorMapping(String user, String domain, String
error) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void removeErrorMapping(String user, String domain, String
error) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public Collection<String> getUserDomainMappings(String user,
String domain) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
- }
+ }
- public void addMapping(String user, String domain, String mapping)
throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ @Override
+ public Collection<String> getUserDomainMappings(String user, String
domain) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void addMapping(String user, String domain, String mapping)
throws RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public void removeMapping(String user, String domain, String
mapping) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void removeMapping(String user, String domain, String
mapping) throws RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public Map<String, Collection<String>> getAllMappings() throws
RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
- }
+ }
- public void addAliasDomainMapping(String aliasDomain, String
realDomain) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ @Override
+ public Map<String, Collection<String>> getAllMappings() throws
RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void addAliasDomainMapping(String aliasDomain, String
realDomain) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- public void removeAliasDomainMapping(String aliasDomain, String
realDomain) throws RecipientRewriteTableException {
- throw new UnsupportedOperationException("Not implemented");
+ }
- }
+ @Override
+ public void removeAliasDomainMapping(String aliasDomain, String
realDomain) throws
+ RecipientRewriteTableException {
+ throw new UnsupportedOperationException("Not implemented");
- });
+ }
+ });
- table.init(mockMailetConfig);
+ table.init(mockMailetConfig);
}
- @Override
- protected void tearDown() throws Exception {
- table = null;
-
+ @After
+ public void tearDown() throws Exception {
+ table = null;
}
+ @Test
public void testAddressMapping() throws Exception {
- Mail mail = createMail(new String[] { "test@localhost",
"apache@localhost" });
- table.service(mail);
+ Mail mail = createMail(new String[]{"test@localhost",
"apache@localhost"});
+ table.service(mail);
- assertEquals(3, mail.getRecipients().size());
- Iterator<MailAddress> it = mail.getRecipients().iterator();
- assertEquals("whatever@localhost", ((MailAddress)
it.next()).toString());
- assertEquals("blah@localhost", ((MailAddress) it.next()).toString());
- assertEquals("apache@localhost", ((MailAddress) it.next()).toString());
+ assertEquals(3, mail.getRecipients().size());
+ Iterator<MailAddress> it = mail.getRecipients().iterator();
+ assertEquals("whatever@localhost", ((MailAddress)
it.next()).toString());
+ assertEquals("blah@localhost", ((MailAddress) it.next()).toString());
+ assertEquals("apache@localhost", ((MailAddress) it.next()).toString());
}
@@ -154,13 +169,13 @@ public class RecipientRewriteTableTest e
* @throws MessagingException
*/
private Mail createMail(String[] recipients) throws MessagingException {
- Mail mail = new FakeMail();
- ArrayList<MailAddress> a = new
ArrayList<MailAddress>(recipients.length);
- for (int i = 0; i < recipients.length; i++) {
- a.add(new MailAddress(recipients[i]));
- }
- mail.setRecipients(a);
- mail.setMessage(new FakeMimeMessage());
- return mail;
+ Mail mail = new FakeMail();
+ ArrayList<MailAddress> a = new
ArrayList<MailAddress>(recipients.length);
+ for (int i = 0; i < recipients.length; i++) {
+ a.add(new MailAddress(recipients[i]));
+ }
+ mail.setRecipients(a);
+ mail.setMessage(new FakeMimeMessage());
+ return mail;
}
}
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/AbstractRemoteAddrInNetworkTest.java
Mon Mar 12 00:58:33 2012
@@ -16,178 +16,189 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.transport.matchers;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-
+import java.util.*;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.ParseException;
-
-import junit.framework.TestCase;
-
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.mock.MockDNSService;
-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.base.test.FakeMailContext;
+import org.apache.mailet.base.test.FakeMatcherConfig;
-public abstract class AbstractRemoteAddrInNetworkTest extends TestCase {
+public abstract class AbstractRemoteAddrInNetworkTest {
protected Mail mockedMail;
-
protected AbstractNetworkMatcher matcher;
-
private String remoteAddr;
-
private DNSService dnsServer;
- public AbstractRemoteAddrInNetworkTest(String arg0) throws
UnsupportedEncodingException {
- super(arg0);
- }
-
protected void setRemoteAddr(String remoteAddr) {
- this.remoteAddr = remoteAddr;
+ this.remoteAddr = remoteAddr;
}
protected void setupMockedMail() {
- mockedMail = new Mail() {
-
- private static final long serialVersionUID = 1L;
+ mockedMail = new Mail() {
- public String getName() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public void setName(String newName) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public MimeMessage getMessage() throws MessagingException {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public Collection<MailAddress> getRecipients() {
- ArrayList<MailAddress> r = new ArrayList<MailAddress>();
- try {
- r = new ArrayList<MailAddress>(Arrays.asList(new
MailAddress[] { new MailAddress("[email protected]") }));
- } catch (ParseException e) {
- }
- return r;
- }
-
- public void setRecipients(Collection recipients) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public MailAddress getSender() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public String getState() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public String getRemoteHost() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public String getRemoteAddr() {
- return remoteAddr;
- }
-
- public String getErrorMessage() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public void setErrorMessage(String msg) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public void setMessage(MimeMessage message) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public void setState(String state) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public Serializable getAttribute(String name) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public Iterator getAttributeNames() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public boolean hasAttributes() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public Serializable removeAttribute(String name) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public void removeAllAttributes() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public Serializable setAttribute(String name, Serializable object)
{
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public long getMessageSize() throws MessagingException {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public Date getLastUpdated() {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
-
- public void setLastUpdated(Date lastUpdated) {
- throw new UnsupportedOperationException("Unimplemented mock
service");
- }
+ private static final long serialVersionUID = 1L;
- };
+ @Override
+ public String getName() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public void setName(String newName) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public MimeMessage getMessage() throws MessagingException {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public Collection<MailAddress> getRecipients() {
+ ArrayList<MailAddress> r = new ArrayList<MailAddress>();
+ try {
+ r = new ArrayList<MailAddress>(Arrays.asList(new
MailAddress[]{new MailAddress(
+ "[email protected]")}));
+ } catch (ParseException e) {
+ }
+ return r;
+ }
+
+ @Override
+ public void setRecipients(Collection recipients) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public MailAddress getSender() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public String getState() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public String getRemoteHost() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public String getRemoteAddr() {
+ return remoteAddr;
+ }
+
+ @Override
+ public String getErrorMessage() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public void setErrorMessage(String msg) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public void setMessage(MimeMessage message) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public void setState(String state) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public Serializable getAttribute(String name) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public Iterator getAttributeNames() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public boolean hasAttributes() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public Serializable removeAttribute(String name) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public void removeAllAttributes() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public Serializable setAttribute(String name, Serializable object) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public long getMessageSize() throws MessagingException {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public Date getLastUpdated() {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+
+ @Override
+ public void setLastUpdated(Date lastUpdated) {
+ throw new UnsupportedOperationException("Unimplemented mock
service");
+ }
+ };
}
protected void setupDNSServer() {
- dnsServer = new MockDNSService() {
- public InetAddress getByName(String host) throws
UnknownHostException {
- if ("192.168.200.0".equals(host) ||
"255.255.255.0".equals(host) || "192.168.200.1".equals(host) ||
"192.168.0.1".equals(host) || "192.168.1.1".equals(host)) {
- // called with an IP it only check formal validity
- return InetAddress.getByName(host);
- }
- throw new UnsupportedOperationException("getByName(" + host +
") unimplemented in AbstractRemoteAddrInNetworkTest");
- }
+ dnsServer = new MockDNSService() {
- };
+ @Override
+ public InetAddress getByName(String host) throws
UnknownHostException {
+ if ("192.168.200.0".equals(host)
+ || "255.255.255.0".equals(host)
+ || "192.168.200.1".equals(host)
+ || "192.168.0.1".equals(host)
+ || "192.168.1.1".equals(host)) {
+ // called with an IP it only check formal validity
+ return InetAddress.getByName(host);
+ }
+ throw new UnsupportedOperationException(
+ "getByName(" + host + ") unimplemented in
AbstractRemoteAddrInNetworkTest");
+ }
+ };
}
protected void setupMatcher() throws MessagingException {
- FakeMailContext mmc = new FakeMailContext();
- matcher = createMatcher();
- matcher.setDNSService(dnsServer);
- FakeMatcherConfig mci = new FakeMatcherConfig(getConfigOption() +
getAllowedNetworks(), mmc);
- matcher.init(mci);
+ FakeMailContext mmc = new FakeMailContext();
+ matcher = createMatcher();
+ matcher.setDNSService(dnsServer);
+ FakeMatcherConfig mci = new FakeMatcherConfig(getConfigOption() +
getAllowedNetworks(), mmc);
+ matcher.init(mci);
}
protected void setupAll() throws MessagingException {
- setupDNSServer();
- setupMockedMail();
- setupMatcher();
+ setupDNSServer();
+ setupMockedMail();
+ setupMatcher();
}
protected abstract String getConfigOption();
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/InSpammerBlacklistTest.java
Mon Mar 12 00:58:33 2012
@@ -16,85 +16,78 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.transport.matchers;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collection;
+import javax.mail.MessagingException;
+import javax.mail.internet.ParseException;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.mock.MockDNSService;
+import org.apache.mailet.MailAddress;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMailContext;
import org.apache.mailet.base.test.FakeMatcherConfig;
+import static org.junit.Assert.*;
+import org.junit.Test;
-import org.apache.mailet.MailAddress;
-
-import javax.mail.MessagingException;
-import javax.mail.internet.ParseException;
-
-import java.io.UnsupportedEncodingException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Collection;
-
-import junit.framework.TestCase;
-
-public class InSpammerBlacklistTest extends TestCase {
+public class InSpammerBlacklistTest {
private FakeMail mockedMail;
-
private InSpammerBlacklist matcher;
-
private final static String BLACKLIST = "my.black.list.";
private final static StringBuffer LISTED_HOST = new
StringBuffer("111.222.111.222");
- public InSpammerBlacklistTest(String arg0) throws
UnsupportedEncodingException {
- super(arg0);
- }
-
private DNSService setUpDNSServer() {
- DNSService dns = new MockDNSService() {
- public InetAddress getByName(String name) throws
UnknownHostException {
- if (name.equals(LISTED_HOST.reverse() + "." + BLACKLIST)) {
- return null;
- } else {
- throw new UnknownHostException("Not listed");
- }
- }
- };
- return dns;
+ DNSService dns = new MockDNSService() {
+
+ @Override
+ public InetAddress getByName(String name) throws
UnknownHostException {
+ if (name.equals(LISTED_HOST.reverse() + "." + BLACKLIST)) {
+ return null;
+ } else {
+ throw new UnknownHostException("Not listed");
+ }
+ }
+ };
+ return dns;
}
private void setupMockedMail(String remoteAddr) throws ParseException {
- mockedMail = new FakeMail();
- mockedMail.setRemoteAddr(remoteAddr);
- mockedMail.setRecipients(Arrays.asList(new MailAddress[] { new
MailAddress("test@email") }));
+ mockedMail = new FakeMail();
+ mockedMail.setRemoteAddr(remoteAddr);
+ mockedMail.setRecipients(Arrays.asList(new MailAddress[]{new
MailAddress("test@email")}));
}
private void setupMatcher(String blacklist) throws MessagingException {
- matcher = new InSpammerBlacklist();
- matcher.setDNSService(setUpDNSServer());
- FakeMailContext context = new FakeMailContext();
- FakeMatcherConfig mci = new FakeMatcherConfig("InSpammerBlacklist=" +
blacklist, context);
- matcher.init(mci);
+ matcher = new InSpammerBlacklist();
+ matcher.setDNSService(setUpDNSServer());
+ FakeMailContext context = new FakeMailContext();
+ FakeMatcherConfig mci = new FakeMatcherConfig("InSpammerBlacklist=" +
blacklist, context);
+ matcher.init(mci);
}
+ @Test
public void testInBlackList() throws MessagingException {
- setupMockedMail(LISTED_HOST.toString());
- setupMatcher(BLACKLIST);
+ setupMockedMail(LISTED_HOST.toString());
+ setupMatcher(BLACKLIST);
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
- assertNotNull(matchedRecipients);
- assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
+ assertNotNull(matchedRecipients);
+ assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
}
+ @Test
public void testNotInBlackList() throws MessagingException {
- setupMockedMail("212.12.14.1");
- setupMatcher(BLACKLIST);
+ setupMockedMail("212.12.14.1");
+ setupMatcher(BLACKLIST);
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
- assertNull(matchedRecipients);
+ assertNull(matchedRecipients);
}
}
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java
Mon Mar 12 00:58:33 2012
@@ -16,56 +16,55 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.transport.matchers;
-import java.io.UnsupportedEncodingException;
import java.util.Collection;
-
import javax.mail.MessagingException;
-
import org.apache.mailet.MailAddress;
+import static org.junit.Assert.*;
+import org.junit.Test;
public class RemoteAddrInNetworkTest extends AbstractRemoteAddrInNetworkTest {
private final String ALLOWED_NETWORK = "192.168.200.0/24";
- public RemoteAddrInNetworkTest(String arg0) throws
UnsupportedEncodingException {
- super(arg0);
- }
-
// test if the recipients get returned as matched
+ @Test
public void testRemoteAddrInNetworkMatched() throws MessagingException {
- setRemoteAddr("192.168.200.1");
+ setRemoteAddr("192.168.200.1");
- setupAll();
+ setupAll();
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
- assertNotNull(matchedRecipients);
- assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
+ assertNotNull(matchedRecipients);
+ assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
}
// test if no recipient get returned cause it not match
+ @Test
public void testRemoteAddrInNetworkNotMatch() throws MessagingException {
- setRemoteAddr("192.168.1.1");
+ setRemoteAddr("192.168.1.1");
- setupAll();
+ setupAll();
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
- assertNull(matchedRecipients);
+ assertNull(matchedRecipients);
}
+ @Override
protected AbstractNetworkMatcher createMatcher() {
- return new RemoteAddrInNetwork();
+ return new RemoteAddrInNetwork();
}
+ @Override
protected String getConfigOption() {
- return "AllowedNetworkIs=";
+ return "AllowedNetworkIs=";
}
+ @Override
protected String getAllowedNetworks() {
- return ALLOWED_NETWORK;
+ return ALLOWED_NETWORK;
}
}
Modified:
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java?rev=1299511&r1=1299510&r2=1299511&view=diff
==============================================================================
---
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
(original)
+++
james/server/trunk/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
Mon Mar 12 00:58:33 2012
@@ -16,56 +16,55 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-
package org.apache.james.transport.matchers;
-import java.io.UnsupportedEncodingException;
import java.util.Collection;
-
import javax.mail.MessagingException;
-
import org.apache.mailet.MailAddress;
+import static org.junit.Assert.*;
+import org.junit.Test;
public class RemoteAddrNotInNetworkTest extends
AbstractRemoteAddrInNetworkTest {
private final String ALLOWED_NETWORK = "192.168.200.0/24";
- public RemoteAddrNotInNetworkTest(String arg0) throws
UnsupportedEncodingException {
- super(arg0);
- }
-
// test if the recipients get returned as matched
+ @Test
public void testRemoteAddrNotInNetworkMatched() throws MessagingException {
- setRemoteAddr("192.168.0.1");
+ setRemoteAddr("192.168.0.1");
- setupAll();
+ setupAll();
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
- assertNotNull(matchedRecipients);
- assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
+ assertNotNull(matchedRecipients);
+ assertEquals(matchedRecipients.size(),
mockedMail.getRecipients().size());
}
// test if no recipient get returned cause it not match
+ @Test
public void testRemoteAddrNotInNetworkNotMatch() throws MessagingException
{
- setRemoteAddr("192.168.200.1");
+ setRemoteAddr("192.168.200.1");
- setupAll();
+ setupAll();
- Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
+ Collection<MailAddress> matchedRecipients = matcher.match(mockedMail);
- assertNull(matchedRecipients);
+ assertNull(matchedRecipients);
}
+ @Override
protected AbstractNetworkMatcher createMatcher() {
- return new RemoteAddrNotInNetwork();
+ return new RemoteAddrNotInNetwork();
}
+ @Override
protected String getConfigOption() {
- return "AllowedNetworkIs=";
+ return "AllowedNetworkIs=";
}
+ @Override
protected String getAllowedNetworks() {
- return ALLOWED_NETWORK;
+ return ALLOWED_NETWORK;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
