Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java?rev=1299516&r1=1299515&r2=1299516&view=diff ============================================================================== --- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java (original) +++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/MockMimeMessage.java Mon Mar 12 01:34:16 2012 @@ -16,21 +16,16 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.smtpserver.mock; -import javax.mail.internet.MimeMessage; -import javax.mail.internet.InternetHeaders; -import javax.mail.internet.InternetAddress; +import java.io.*; +import java.util.*; +import javax.activation.DataHandler; import javax.mail.*; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.InternetHeaders; +import javax.mail.internet.MimeMessage; import javax.mail.search.SearchTerm; -import javax.activation.DataHandler; -import java.util.*; -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; public class MockMimeMessage extends MimeMessage { @@ -53,447 +48,540 @@ public class MockMimeMessage extends Mim private boolean m_doMatch; public MockMimeMessage() throws MessagingException { - super((Session) null); + super((Session) null); } public MockMimeMessage(int messageNumber) throws MessagingException { - super((Session) null); - m_iMessageNumber = messageNumber; + super((Session) null); + m_iMessageNumber = messageNumber; } public MockMimeMessage(MimeMessage mimeMessage) throws MessagingException { - super(mimeMessage); // trivial implementation + super(mimeMessage); // trivial implementation } + @Override public Address[] getFrom() throws MessagingException { - return (Address[]) m_fromAddresses.toArray(); + return (Address[]) m_fromAddresses.toArray(); } + @Override public void setFrom(Address address) throws MessagingException { - m_fromAddresses.clear(); - m_fromAddresses.add(address); + m_fromAddresses.clear(); + m_fromAddresses.add(address); } + @Override public void setFrom() throws MessagingException { - m_fromAddresses.clear(); - m_fromAddresses.add(InternetAddress.getLocalAddress(null)); + m_fromAddresses.clear(); + m_fromAddresses.add(InternetAddress.getLocalAddress(null)); } + @Override public void addFrom(Address[] addresses) throws MessagingException { - m_fromAddresses.add(addresses); + m_fromAddresses.add(addresses); } + @Override public Address getSender() throws MessagingException { - return m_senderAddress; + return m_senderAddress; } + @Override public void setSender(Address address) throws MessagingException { - m_senderAddress = address; + m_senderAddress = address; } + @Override public Address[] getRecipients(Message.RecipientType recipientType) throws MessagingException { - List recipientsList = getRecipientsList(recipientType); - List recipientAddresses = new ArrayList(); - for (Iterator iterator = recipientsList.iterator(); iterator.hasNext();) { - String recipient = (String) iterator.next(); - recipientAddresses.add(new InternetAddress(recipient)); - } - return (Address[]) (recipientAddresses.toArray(new Address[] {})); + List recipientsList = getRecipientsList(recipientType); + List recipientAddresses = new ArrayList(); + for (Iterator iterator = recipientsList.iterator(); iterator.hasNext();) { + String recipient = (String) iterator.next(); + recipientAddresses.add(new InternetAddress(recipient)); + } + return (Address[]) (recipientAddresses.toArray(new Address[]{})); } private List getRecipientsList(Message.RecipientType recipientType) { - if (Message.RecipientType.TO.equals(recipientType)) - return m_toRecepients; - if (Message.RecipientType.CC.equals(recipientType)) - return m_ccRecepients; - if (Message.RecipientType.BCC.equals(recipientType)) - return m_bccRecepients; - return null; + if (Message.RecipientType.TO.equals(recipientType)) { + return m_toRecepients; + } + if (Message.RecipientType.CC.equals(recipientType)) { + return m_ccRecepients; + } + if (Message.RecipientType.BCC.equals(recipientType)) { + return m_bccRecepients; + } + return null; } + @Override public Address[] getAllRecipients() throws MessagingException { - List allRecipients = new ArrayList(); - allRecipients.addAll(m_toRecepients); - allRecipients.addAll(m_ccRecepients); - allRecipients.addAll(m_bccRecepients); - return (Address[]) allRecipients.toArray(); + List allRecipients = new ArrayList(); + allRecipients.addAll(m_toRecepients); + allRecipients.addAll(m_ccRecepients); + allRecipients.addAll(m_bccRecepients); + return (Address[]) allRecipients.toArray(); } + @Override public void setRecipients(Message.RecipientType recipientType, Address[] addresses) throws MessagingException { - getRecipientsList(recipientType).addAll(Arrays.asList(addresses)); + getRecipientsList(recipientType).addAll(Arrays.asList(addresses)); } + @Override public void setRecipients(Message.RecipientType recipientType, String recipient) throws MessagingException { - getRecipientsList(recipientType).add(recipient); + getRecipientsList(recipientType).add(recipient); } + @Override public void addRecipients(Message.RecipientType recipientType, Address[] addresses) throws MessagingException { - getRecipientsList(recipientType).addAll(Arrays.asList(addresses)); + getRecipientsList(recipientType).addAll(Arrays.asList(addresses)); } + @Override public void addRecipients(Message.RecipientType recipientType, String recipient) throws MessagingException { - getRecipientsList(recipientType).add(recipient); + getRecipientsList(recipientType).add(recipient); } + @Override public Address[] getReplyTo() throws MessagingException { - return (Address[]) m_replyToAddresses.toArray(); + return (Address[]) m_replyToAddresses.toArray(); } + @Override public void setReplyTo(Address[] addresses) throws MessagingException { - m_replyToAddresses.addAll(Arrays.asList(addresses)); + m_replyToAddresses.addAll(Arrays.asList(addresses)); } + @Override public String getSubject() throws MessagingException { - return m_subject; + return m_subject; } + @Override public void setSubject(String subject) throws MessagingException { - m_subject = subject; + m_subject = subject; } + @Override public void setSubject(String subject, String charset) throws MessagingException { - if (subject == null) { - m_subject = null; - return; - } - try { - m_subject = new String(subject.getBytes(charset)); - } catch (UnsupportedEncodingException e) { - throw new MessagingException("setting subject failed", e); - } + if (subject == null) { + m_subject = null; + return; + } + try { + m_subject = new String(subject.getBytes(charset)); + } catch (UnsupportedEncodingException e) { + throw new MessagingException("setting subject failed", e); + } } + @Override public Date getSentDate() throws MessagingException { - return m_sentDate; + return m_sentDate; } + @Override public void setSentDate(Date date) throws MessagingException { - m_sentDate = date; + m_sentDate = date; } + @Override public Date getReceivedDate() throws MessagingException { - return null; // trivial implementation + return null; // trivial implementation } + @Override public int getSize() throws MessagingException { - return -1; // trivial implementation + return -1; // trivial implementation } + @Override public int getLineCount() throws MessagingException { - return -1; // trivial implementation + return -1; // trivial implementation } + @Override public String getContentType() throws MessagingException { - return getHeader("Content-Type", null); + return getHeader("Content-Type", null); } + @Override public boolean isMimeType(String mimeType) throws MessagingException { - return mimeType.startsWith(getContentType()); + return mimeType.startsWith(getContentType()); } + @Override public String getDisposition() throws MessagingException { - return getHeader("Content-Disposition", null); + return getHeader("Content-Disposition", null); } + @Override public void setDisposition(String disposition) throws MessagingException { - setHeader("Content-Disposition", disposition); + setHeader("Content-Disposition", disposition); } + @Override public String getEncoding() throws MessagingException { - return getHeader("Content-Transfer-Encoding", null); + return getHeader("Content-Transfer-Encoding", null); } + @Override public String getContentID() throws MessagingException { - return getHeader("Content-ID", null); + return getHeader("Content-ID", null); } + @Override public void setContentID(String contentID) throws MessagingException { - setHeader("Content-ID", contentID); + setHeader("Content-ID", contentID); } + @Override public String getContentMD5() throws MessagingException { - return getHeader("Content-MD5", null); + return getHeader("Content-MD5", null); } + @Override public void setContentMD5(String value) throws MessagingException { - setHeader("Content-MD5", value); + setHeader("Content-MD5", value); } + @Override public String getDescription() throws MessagingException { - return getHeader("Content-Description", null); + return getHeader("Content-Description", null); } + @Override public void setDescription(String description) throws MessagingException { - setHeader("Content-Description", description); + setHeader("Content-Description", description); } + @Override public void setDescription(String description, String charset) throws MessagingException { - try { - setDescription(new String(description.getBytes(charset))); - } catch (UnsupportedEncodingException e) { - throw new MessagingException("setting description failed", e); - } + try { + setDescription(new String(description.getBytes(charset))); + } catch (UnsupportedEncodingException e) { + throw new MessagingException("setting description failed", e); + } } + @Override public String[] getContentLanguage() throws MessagingException { - return m_contentLanguage; + return m_contentLanguage; } + @Override public void setContentLanguage(String[] contentLanguage) throws MessagingException { - m_contentLanguage = contentLanguage; + m_contentLanguage = contentLanguage; } + @Override public String getMessageID() throws MessagingException { - return "ID-" + m_iMessageNumber; // trivial implementation + return "ID-" + m_iMessageNumber; // trivial implementation } + @Override public String getFileName() throws MessagingException { - return m_fileName; + return m_fileName; } + @Override public void setFileName(String fileName) throws MessagingException { - m_fileName = fileName; + m_fileName = fileName; } + @Override public InputStream getInputStream() throws IOException, MessagingException { - return null; // trivial implementation + return null; // trivial implementation } + @Override protected InputStream getContentStream() throws MessagingException { - return null; // trivial implementation + return null; // trivial implementation } + @Override public InputStream getRawInputStream() throws MessagingException { - if (m_content instanceof String) { - return new ByteArrayInputStream(m_content.toString().getBytes()); - } - throw new UnsupportedOperationException("Unimplementated method"); + if (m_content instanceof String) { + return new ByteArrayInputStream(m_content.toString().getBytes()); + } + throw new UnsupportedOperationException("Unimplementated method"); } + @Override public synchronized DataHandler getDataHandler() throws MessagingException { - return m_dataHandler; + return m_dataHandler; } + @Override public synchronized void setDataHandler(DataHandler dataHandler) throws MessagingException { - m_dataHandler = dataHandler; + m_dataHandler = dataHandler; } + @Override public Object getContent() throws IOException, MessagingException { - return m_content; + return m_content; } + @Override public void setContent(Object object, String mimeType) throws MessagingException { - m_content = object; // trivial implementation + m_content = object; // trivial implementation } + @Override public void setText(String string) throws MessagingException { - setContent(string, "text/plain"); + setContent(string, "text/plain"); } + @Override public void setText(String string, String charset) throws MessagingException { - try { - setContent(new String(string.getBytes(charset)), "text/plain"); - } catch (UnsupportedEncodingException e) { - throw new MessagingException("setting text content failed", e); - } + try { + setContent(new String(string.getBytes(charset)), "text/plain"); + } catch (UnsupportedEncodingException e) { + throw new MessagingException("setting text content failed", e); + } } + @Override public void setContent(Multipart multipart) throws MessagingException { - m_content = multipart; + m_content = multipart; } + @Override public Message reply(boolean b) throws MessagingException { - return new MockMimeMessage(this); // trivial implementation + return new MockMimeMessage(this); // trivial implementation } + @Override public void writeTo(OutputStream outputStream) throws IOException, MessagingException { - ; // trivial implementation + // trivial implementation } + @Override public void writeTo(OutputStream outputStream, String[] strings) throws IOException, MessagingException { - ; // trivial implementation + // trivial implementation } + @Override public String[] getHeader(String name) throws MessagingException { - String value = (String) m_contentHeaders.get(name); - if (value == null) - return null; - return new String[] { value }; + String value = (String) m_contentHeaders.get(name); + if (value == null) { + return null; + } + return new String[]{value}; } + @Override public String getHeader(String name, String delimiter) throws MessagingException { - String[] header = getHeader(name); - if (header == null || header.length == 0) - return null; - return header[0]; + String[] header = getHeader(name); + if (header == null || header.length == 0) { + return null; + } + return header[0]; } + @Override public void setHeader(String name, String value) throws MessagingException { - addHeader(name, value); + addHeader(name, value); } + @Override public void addHeader(String name, String value) throws MessagingException { - m_contentHeaders.put(name, value); + m_contentHeaders.put(name, value); } + @Override public void removeHeader(String name) throws MessagingException { - m_contentHeaders.remove(name); + m_contentHeaders.remove(name); } + @Override public Enumeration getAllHeaders() throws MessagingException { - return Collections.enumeration(m_contentHeaders.values()); + return Collections.enumeration(m_contentHeaders.values()); } + @Override public Enumeration getMatchingHeaders(String[] names) throws MessagingException { - ArrayList matchingHeaders = new ArrayList(); - for (int i = 0; i < names.length; i++) { - String name = names[i]; - String value = getHeader(name, null); - if (value == null) - continue; - matchingHeaders.add(value); - } - return Collections.enumeration(matchingHeaders); + ArrayList matchingHeaders = new ArrayList(); + for (int i = 0; i < names.length; i++) { + String name = names[i]; + String value = getHeader(name, null); + if (value == null) { + continue; + } + matchingHeaders.add(value); + } + return Collections.enumeration(matchingHeaders); } + @Override public Enumeration getNonMatchingHeaders(String[] names) throws MessagingException { - List existingHeaders = Arrays.asList(names); + List existingHeaders = Arrays.asList(names); - ArrayList nonMatchingHeaders = new ArrayList(); + ArrayList nonMatchingHeaders = new ArrayList(); - Iterator iterator = m_contentHeaders.keySet().iterator(); - while (iterator.hasNext()) { - String name = (String) iterator.next(); - if (existingHeaders.contains(name)) - continue; - String value = getHeader(name, null); - if (value == null) - continue; - nonMatchingHeaders.add(value); - } - return Collections.enumeration(nonMatchingHeaders); + Iterator iterator = m_contentHeaders.keySet().iterator(); + while (iterator.hasNext()) { + String name = (String) iterator.next(); + if (existingHeaders.contains(name)) { + continue; + } + String value = getHeader(name, null); + if (value == null) { + continue; + } + nonMatchingHeaders.add(value); + } + return Collections.enumeration(nonMatchingHeaders); } + @Override public void addHeaderLine(String headerLine) throws MessagingException { - int separatorIndex = headerLine.indexOf(":"); - if (separatorIndex < 0) - throw new MessagingException("header line does not conform to standard"); + int separatorIndex = headerLine.indexOf(":"); + if (separatorIndex < 0) { + throw new MessagingException("header line does not conform to standard"); + } - addHeader(headerLine.substring(0, separatorIndex), headerLine.substring(separatorIndex, headerLine.length())); + addHeader(headerLine.substring(0, separatorIndex), headerLine.substring(separatorIndex, headerLine.length())); } + @Override public Enumeration getAllHeaderLines() throws MessagingException { - return Collections.enumeration(getHeadersAsStrings(m_contentHeaders)); + return Collections.enumeration(getHeadersAsStrings(m_contentHeaders)); } private ArrayList getHeadersAsStrings(HashMap contentHeaders) { - ArrayList headerLines = new ArrayList(); - Iterator iterator = contentHeaders.keySet().iterator(); - while (iterator.hasNext()) { - String key = (String) iterator.next(); - String value = (String) contentHeaders.get(key); - headerLines.add(key + ":" + value); - } - return headerLines; + ArrayList headerLines = new ArrayList(); + Iterator iterator = contentHeaders.keySet().iterator(); + while (iterator.hasNext()) { + String key = (String) iterator.next(); + String value = (String) contentHeaders.get(key); + headerLines.add(key + ":" + value); + } + return headerLines; } + @Override public Enumeration getMatchingHeaderLines(String[] names) throws MessagingException { - ArrayList matchingHeaders = new ArrayList(); - for (int i = 0; i < names.length; i++) { - String name = names[i]; - String value = getHeader(name, null); - if (value == null) - continue; - matchingHeaders.add(name + ":" + value); - } - return Collections.enumeration(matchingHeaders); + ArrayList matchingHeaders = new ArrayList(); + for (int i = 0; i < names.length; i++) { + String name = names[i]; + String value = getHeader(name, null); + if (value == null) { + continue; + } + matchingHeaders.add(name + ":" + value); + } + return Collections.enumeration(matchingHeaders); } + @Override public Enumeration getNonMatchingHeaderLines(String[] names) throws MessagingException { - List existingHeaders = names != null ? Arrays.asList(names) : null; + List existingHeaders = names != null ? Arrays.asList(names) : null; - ArrayList nonMatchingHeaders = new ArrayList(); + ArrayList nonMatchingHeaders = new ArrayList(); - Iterator iterator = m_contentHeaders.keySet().iterator(); - while (iterator.hasNext()) { - String name = (String) iterator.next(); - if (existingHeaders != null && existingHeaders.contains(name)) - continue; - String value = getHeader(name, null); - if (value == null) - continue; - nonMatchingHeaders.add(name + ":" + value); - } - return Collections.enumeration(nonMatchingHeaders); + Iterator iterator = m_contentHeaders.keySet().iterator(); + while (iterator.hasNext()) { + String name = (String) iterator.next(); + if (existingHeaders != null && existingHeaders.contains(name)) { + continue; + } + String value = getHeader(name, null); + if (value == null) { + continue; + } + nonMatchingHeaders.add(name + ":" + value); + } + return Collections.enumeration(nonMatchingHeaders); } + @Override public synchronized Flags getFlags() throws MessagingException { - return new Flags(m_setFlags); + return new Flags(m_setFlags); } + @Override public synchronized boolean isSet(Flags.Flag flag) throws MessagingException { - return m_setFlags.contains(flag); + return m_setFlags.contains(flag); } + @Override public synchronized void setFlags(Flags flags, boolean set) throws MessagingException { - if (set) - m_setFlags.add(flags); - else - m_setFlags.remove(flags); + if (set) { + m_setFlags.add(flags); + } else { + m_setFlags.remove(flags); + } } + @Override public void saveChanges() throws MessagingException { - ; // trivial implementation + // trivial implementation } + @Override protected void updateHeaders() throws MessagingException { - ; // trivial implementation + // trivial implementation } + @Override protected InternetHeaders createInternetHeaders(InputStream inputStream) throws MessagingException { - return new InternetHeaders(); + return new InternetHeaders(); } + @Override public void setRecipient(Message.RecipientType recipientType, Address address) throws MessagingException { - setRecipients(recipientType, new Address[] { address }); + setRecipients(recipientType, new Address[]{address}); } + @Override public void addRecipient(Message.RecipientType recipientType, Address address) throws MessagingException { - setRecipients(recipientType, new Address[] { address }); + setRecipients(recipientType, new Address[]{address}); } + @Override public void setFlag(Flags.Flag flag, boolean set) throws MessagingException { - if (set) - m_setFlags.add(flag); - else - m_setFlags.remove(flag); + if (set) { + m_setFlags.add(flag); + } else { + m_setFlags.remove(flag); + } } + @Override public int getMessageNumber() { - return m_iMessageNumber; + return m_iMessageNumber; } + @Override protected void setMessageNumber(int i) { - m_iMessageNumber = i; + m_iMessageNumber = i; } + @Override public Folder getFolder() { - return null; + return null; } + @Override public boolean isExpunged() { - return m_bIsExpunged; + return m_bIsExpunged; } + @Override protected void setExpunged(boolean b) { - m_bIsExpunged = b; + m_bIsExpunged = b; } public void setShouldMatch(boolean doMatch) { - m_doMatch = doMatch; + m_doMatch = doMatch; } + @Override public boolean match(SearchTerm searchTerm) throws MessagingException { - return m_doMatch; + return m_doMatch; } }
Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java?rev=1299516&r1=1299515&r2=1299516&view=diff ============================================================================== --- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java (original) +++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMail.java Mon Mar 12 01:34:16 2012 @@ -16,141 +16,146 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.smtpserver.mock.mailet; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; - +import java.util.*; import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; - import org.apache.mailet.Mail; import org.apache.mailet.MailAddress; public class MockMail implements Mail { private MimeMessage msg = null; - private Collection recipients = new ArrayList(); - private String name = null; - private MailAddress sender = null; - private String state = null; - private String errorMessage; - private Date lastUpdated; - private HashMap attributes = new HashMap(); - private static final long serialVersionUID = 1L; - private long size = 0; - private String remoteAddr = "127.0.0.1"; + @Override public String getName() { - return name; + return name; } + @Override public void setName(String newName) { - this.name = newName; + this.name = newName; } + @Override public MimeMessage getMessage() throws MessagingException { - return msg; + return msg; } + @Override public Collection getRecipients() { - return recipients; + return recipients; } + @Override public void setRecipients(Collection recipients) { - this.recipients = recipients; + this.recipients = recipients; } + @Override public MailAddress getSender() { - return sender; + return sender; } + @Override public String getState() { - return state; + return state; } + @Override public String getRemoteHost() { - return "111.222.333.444"; + return "111.222.333.444"; } + @Override public String getRemoteAddr() { - return remoteAddr; + return remoteAddr; } + @Override public String getErrorMessage() { - return errorMessage; + return errorMessage; } + @Override public void setErrorMessage(String msg) { - this.errorMessage = msg; + this.errorMessage = msg; } + @Override public void setMessage(MimeMessage message) { - this.msg = message; + this.msg = message; } + @Override public void setState(String state) { - this.state = state; + this.state = state; } + @Override public Serializable getAttribute(String name) { - return (Serializable) attributes.get(name); + return (Serializable) attributes.get(name); } + @Override public Iterator getAttributeNames() { - return attributes.keySet().iterator(); + return attributes.keySet().iterator(); } + @Override public boolean hasAttributes() { - return !attributes.isEmpty(); + return !attributes.isEmpty(); } + @Override public Serializable removeAttribute(String name) { - return (Serializable) attributes.remove(name); + return (Serializable) attributes.remove(name); } + @Override public void removeAllAttributes() { - attributes.clear(); + attributes.clear(); } + @Override public Serializable setAttribute(String name, Serializable object) { - return (Serializable) attributes.put(name, object); + return (Serializable) attributes.put(name, object); } + @Override public long getMessageSize() throws MessagingException { - return size; + return size; } + @Override public Date getLastUpdated() { - return lastUpdated; + return lastUpdated; } + @Override public void setLastUpdated(Date lastUpdated) { - this.lastUpdated = lastUpdated; + this.lastUpdated = lastUpdated; } public void setMessageSize(long size) { - this.size = size; + this.size = size; } public void setRemoteAddr(String remoteAddr) { - this.remoteAddr = remoteAddr; + this.remoteAddr = remoteAddr; } } Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java?rev=1299516&r1=1299515&r2=1299516&view=diff ============================================================================== --- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java (original) +++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailContext.java Mon Mar 12 01:34:16 2012 @@ -16,109 +16,130 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.smtpserver.mock.mailet; -import org.apache.mailet.MailetContext; -import org.apache.mailet.Mail; -import org.apache.mailet.MailAddress; - -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; import java.util.Collection; import java.util.HashMap; import java.util.Iterator; +import javax.mail.MessagingException; +import javax.mail.internet.MimeMessage; +import org.apache.mailet.Mail; +import org.apache.mailet.MailAddress; +import org.apache.mailet.MailetContext; public class MockMailContext implements MailetContext { HashMap attributes = new HashMap(); + @Override public void bounce(Mail mail, String message) throws MessagingException { - // trivial implementation + // trivial implementation } + @Override public void bounce(Mail mail, String message, MailAddress bouncer) throws MessagingException { - // trivial implementation + // trivial implementation } + @Override public Collection getMailServers(String host) { - return null; // trivial implementation + return null; // trivial implementation } + @Override public MailAddress getPostmaster() { - return null; // trivial implementation + return null; // trivial implementation } + @Override public Object getAttribute(String name) { - return attributes.get(name); + return attributes.get(name); } + @Override public Iterator getAttributeNames() { - return attributes.keySet().iterator(); + return attributes.keySet().iterator(); } + @Override public int getMajorVersion() { - return 0; // trivial implementation + return 0; // trivial implementation } + @Override public int getMinorVersion() { - return 0; // trivial implementation + return 0; // trivial implementation } + @Override public String getServerInfo() { - return "Mock Server"; + return "Mock Server"; } + @Override public boolean isLocalServer(String serverName) { - return false; // trivial implementation + return false; // trivial implementation } + @Override public boolean isLocalUser(String userAccount) { - return false; // trivial implementation + return false; // trivial implementation } + @Override public boolean isLocalEmail(MailAddress mailAddress) { - return false; // trivial implementation + return false; // trivial implementation } + @Override public void log(String message) { - System.out.println(message); + System.out.println(message); } + @Override public void log(String message, Throwable t) { - System.out.println(message); - t.printStackTrace(System.out); + System.out.println(message); + t.printStackTrace(System.out); } + @Override public void removeAttribute(String name) { - // trivial implementation + // trivial implementation } + @Override public void sendMail(MimeMessage msg) throws MessagingException { - throw new UnsupportedOperationException("MOCKed method"); + throw new UnsupportedOperationException("MOCKed method"); } + @Override public void sendMail(MailAddress sender, Collection recipients, MimeMessage msg) throws MessagingException { - throw new UnsupportedOperationException("MOCKed method"); + throw new UnsupportedOperationException("MOCKed method"); } - public void sendMail(MailAddress sender, Collection recipients, MimeMessage msg, String state) throws MessagingException { - throw new UnsupportedOperationException("MOCKed method"); + @Override + public void sendMail(MailAddress sender, Collection recipients, MimeMessage msg, String state) throws + MessagingException { + throw new UnsupportedOperationException("MOCKed method"); } + @Override public void sendMail(Mail mail) throws MessagingException { - throw new UnsupportedOperationException("MOCKed method"); + throw new UnsupportedOperationException("MOCKed method"); } + @Override public void setAttribute(String name, Object object) { - attributes.put(name, object); + attributes.put(name, object); } + @Override public void storeMail(MailAddress sender, MailAddress recipient, MimeMessage msg) throws MessagingException { - // trivial implementation + // trivial implementation } + @Override public Iterator getSMTPHostAddresses(String domainName) { - return null; // trivial implementation + return null; // trivial implementation } } Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java?rev=1299516&r1=1299515&r2=1299516&view=diff ============================================================================== --- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java (original) +++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMailetConfig.java Mon Mar 12 01:34:16 2012 @@ -16,14 +16,12 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.smtpserver.mock.mailet; -import org.apache.mailet.MailetConfig; -import org.apache.mailet.MailetContext; - import java.util.Iterator; import java.util.Properties; +import org.apache.mailet.MailetConfig; +import org.apache.mailet.MailetContext; /** * MailetConfig over Properties @@ -34,41 +32,46 @@ public class MockMailetConfig extends Pr private MailetContext mc; public MockMailetConfig(String mailetName, MailetContext mc) { - super(); - this.mailetName = mailetName; - this.mc = mc; + super(); + this.mailetName = mailetName; + this.mc = mc; } public MockMailetConfig(String mailetName, MailetContext mc, Properties arg0) { - super(arg0); - this.mailetName = mailetName; - this.mc = mc; + super(arg0); + this.mailetName = mailetName; + this.mc = mc; } + @Override public String getInitParameter(String name) { - return getProperty(name); + return getProperty(name); } + @Override public Iterator getInitParameterNames() { - return keySet().iterator(); + return keySet().iterator(); } + @Override public MailetContext getMailetContext() { - return mc; + return mc; } + @Override public String getMailetName() { - return mailetName; + return mailetName; } // Override setProperty to work like it should in this MockMailetConfig + @Override public Object setProperty(String key, String value) { - String oldValue = getProperty(key); - String newValue = value; + String oldValue = getProperty(key); + String newValue = value; - if (oldValue != null) { - newValue = oldValue + "," + value; - } - return super.setProperty(key, newValue); + if (oldValue != null) { + newValue = oldValue + "," + value; + } + return super.setProperty(key, newValue); } } Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java?rev=1299516&r1=1299515&r2=1299516&view=diff ============================================================================== --- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java (original) +++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/mailet/MockMatcherConfig.java Mon Mar 12 01:34:16 2012 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.smtpserver.mock.mailet; import org.apache.mailet.MailetContext; @@ -28,33 +27,34 @@ import org.apache.mailet.MatcherConfig; public class MockMatcherConfig implements MatcherConfig { private String matcherName; - private MailetContext mc; public MockMatcherConfig(String matcherName, MailetContext mc) { - super(); - this.matcherName = matcherName; - this.mc = mc; + super(); + this.matcherName = matcherName; + this.mc = mc; } + @Override public String getCondition() { - if (matcherName.indexOf("=") >= 0) { - return matcherName.substring(getMatcherName().length() + 1); - } else { - return null; - } + if (matcherName.indexOf("=") >= 0) { + return matcherName.substring(getMatcherName().length() + 1); + } else { + return null; + } } + @Override public MailetContext getMailetContext() { - return mc; + return mc; } + @Override public String getMatcherName() { - if (matcherName.indexOf("=") >= 0) { - return matcherName.split("=")[0]; - } else { - return matcherName; - } + if (matcherName.indexOf("=") >= 0) { + return matcherName.split("=")[0]; + } else { + return matcherName; + } } - } Modified: james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java URL: http://svn.apache.org/viewvc/james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java?rev=1299516&r1=1299515&r2=1299516&view=diff ============================================================================== --- james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java (original) +++ james/server/trunk/protocols-smtp/src/test/java/org/apache/james/smtpserver/mock/util/MockSpamd.java Mon Mar 12 01:34:16 2012 @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * * under the License. * ****************************************************************/ - package org.apache.james.smtpserver.mock.util; import java.io.BufferedReader; @@ -35,69 +34,64 @@ public class MockSpamd implements Runnab * Mailcontent which is 100% spam */ public final static String GTUBE = "-SPAM-"; - public final static String NOT_SPAM = "Spam: False ; 3 / 5"; - public final static String SPAM = "Spam: True ; 1000 / 5"; - BufferedReader in; - OutputStream out; - Socket spamd; - ServerSocket socket; /** * Init the mocked SPAMD daemon - * + * * @param port * The port on which the mocked SPAMD daemon will be bind * @throws IOException */ public MockSpamd(int port) throws IOException { - socket = new ServerSocket(port); + socket = new ServerSocket(port); } /** * @see java.lang.Runnable#run() */ + @Override public void run() { - boolean spam = false; + boolean spam = false; - try { + try { - // Accept connections - spamd = socket.accept(); + // Accept connections + spamd = socket.accept(); - in = new BufferedReader(new InputStreamReader(spamd.getInputStream())); - out = spamd.getOutputStream(); - - String line = null; - - // Parse the message - while ((line = in.readLine()) != null) { - if (line.indexOf(GTUBE) >= 0) { - spam = true; - } - } - if (spam) { - out.write(SPAM.getBytes()); - out.flush(); - } else { - out.write(NOT_SPAM.getBytes()); - out.flush(); - } - - in.close(); - out.close(); - spamd.close(); - socket.close(); - - } catch (IOException e) { - // Should not happen - e.printStackTrace(); - } + in = new BufferedReader(new InputStreamReader(spamd.getInputStream())); + out = spamd.getOutputStream(); + + String line = null; + + // Parse the message + while ((line = in.readLine()) != null) { + if (line.indexOf(GTUBE) >= 0) { + spam = true; + } + } + if (spam) { + out.write(SPAM.getBytes()); + out.flush(); + } else { + out.write(NOT_SPAM.getBytes()); + out.flush(); + } + + in.close(); + out.close(); + spamd.close(); + socket.close(); + + } catch (IOException e) { + // Should not happen + e.printStackTrace(); + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
