Author: veithen
Date: Sun Sep 21 12:50:05 2008
New Revision: 697598
URL: http://svn.apache.org/viewvc?rev=697598&view=rev
Log:
Mail transport tests: Added test cases that use IMAP instead of POP3.
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/XMLMessage.java
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java?rev=697598&r1=697597&r2=697598&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/GreenMailTestEnvironment.java
Sun Sep 21 12:50:05 2008
@@ -27,6 +27,7 @@
import javax.mail.Flags;
+import org.apache.synapse.transport.testkit.name.Key;
import org.apache.synapse.transport.testkit.name.Name;
import org.apache.synapse.transport.testkit.util.LogManager;
import org.apache.synapse.transport.testkit.util.ServerUtil;
@@ -45,20 +46,36 @@
private static final ServerSetup POP3 =
new ServerSetup(7110, "127.0.0.1", ServerSetup.PROTOCOL_POP3);
-
+
+ private static final ServerSetup IMAP =
+ new ServerSetup(7143, "127.0.0.1", ServerSetup.PROTOCOL_IMAP);
+
+ private final String protocol;
+ private final ServerSetup storeServerSetup;
private LogManager logManager;
private GreenMail greenMail;
private int accountNumber;
private List<Account> unallocatedAccounts;
+ public GreenMailTestEnvironment(String protocol) {
+ this.protocol = protocol;
+ if (protocol.equals("pop3")) {
+ storeServerSetup = POP3;
+ } else if (protocol.equals("imap")) {
+ storeServerSetup = IMAP;
+ } else {
+ throw new IllegalArgumentException();
+ }
+ }
+
@SuppressWarnings("unused")
private void setUp(LogManager logManager) throws Exception {
this.logManager = logManager;
- greenMail = new GreenMail(new ServerSetup[] { SMTP, POP3 });
+ greenMail = new GreenMail(new ServerSetup[] { SMTP, storeServerSetup
});
greenMail.start();
unallocatedAccounts = new LinkedList<Account>();
ServerUtil.waitForServer(SMTP.getPort());
- ServerUtil.waitForServer(POP3.getPort());
+ ServerUtil.waitForServer(storeServerSetup.getPort());
}
@SuppressWarnings("unused")
@@ -71,14 +88,16 @@
}
@Override
+ @Key("protocol")
public String getProtocol() {
- return "pop3";
+ return protocol;
}
@Override
public Account allocateAccount() throws Exception {
if (unallocatedAccounts.isEmpty()) {
- GreenMailUser user = greenMail.setUser("test" + accountNumber++,
"password");
+ String login = "test" + accountNumber++;
+ GreenMailUser user = greenMail.setUser(login + "@localhost",
login, "password");
final MailFolder inbox =
greenMail.getManagers().getImapHostManager().getInbox(user);
inbox.addListener(new FolderListener() {
public void added(int msn) {
@@ -113,10 +132,10 @@
@Override
public Map<String,String> getInProperties(Account account) {
Map<String,String> props = new HashMap<String,String>();
- props.put("mail.pop3.host", "localhost");
- props.put("mail.pop3.port", String.valueOf(POP3.getPort()));
- props.put("mail.pop3.user", account.getLogin());
- props.put("mail.pop3.password", account.getPassword());
+ props.put("mail." + protocol + ".host", "localhost");
+ props.put("mail." + protocol + ".port",
String.valueOf(storeServerSetup.getPort()));
+ props.put("mail." + protocol + ".user", account.getLogin());
+ props.put("mail." + protocol + ".password", account.getPassword());
return props;
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java?rev=697598&r1=697597&r2=697598&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/mail/MailTransportListenerTest.java
Sun Sep 21 12:50:05 2008
@@ -47,9 +47,8 @@
TransportTestSuiteBuilder builder = new
TransportTestSuiteBuilder(suite);
- GreenMailTestEnvironment env = new GreenMailTestEnvironment();
-
- builder.addEnvironment(env);
+ builder.addEnvironment(new GreenMailTestEnvironment("pop3"));
+ builder.addEnvironment(new GreenMailTestEnvironment("imap"));
MailChannel channel = new MailChannel();
@@ -71,7 +70,7 @@
builder.build();
- suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new
MailChannel[] { new MailChannel(), new MailChannel() }, 2, true, env));
+ suite.addTest(new MinConcurrencyTest(AxisServer.INSTANCE, new
MailChannel[] { new MailChannel(), new MailChannel() }, 2, true, new
GreenMailTestEnvironment("pop3")));
return suite;
}
}
Modified:
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/XMLMessage.java
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/XMLMessage.java?rev=697598&r1=697597&r2=697598&view=diff
==============================================================================
---
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/XMLMessage.java
(original)
+++
synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/message/XMLMessage.java
Sun Sep 21 12:50:05 2008
@@ -99,7 +99,7 @@
String baseType = contentType.getBaseType();
Type type = null;
for (Type candidate : Type.values()) {
- if (candidate.getContentType().getBaseType().equals(baseType)) {
+ if
(candidate.getContentType().getBaseType().equalsIgnoreCase(baseType)) {
type = candidate;
break;
}
