Author: norman
Date: Wed Jan 18 12:59:27 2012
New Revision: 1232871
URL: http://svn.apache.org/viewvc?rev=1232871&view=rev
Log:
Ad LMTPS tests
Added:
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java
(with props)
Modified:
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
Modified:
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java?rev=1232871&r1=1232870&r2=1232871&view=diff
==============================================================================
---
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
(original)
+++
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPSServerTest.java
Wed Jan 18 12:59:27 2012
@@ -35,7 +35,7 @@ public abstract class AbstractLMTPSServe
@Override
protected SMTPClient createClient() {
- LMTPSClient client = new LMTPSClient(false,
BogusSslContextFactory.getClientContext());
+ LMTPSClient client = new LMTPSClient(true,
BogusSslContextFactory.getClientContext());
client.setTrustManager(BogusTrustManagerFactory.getTrustManagers()[0]);
return client;
Modified:
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java?rev=1232871&r1=1232870&r2=1232871&view=diff
==============================================================================
---
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
(original)
+++
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/AbstractLMTPServerTest.java
Wed Jan 18 12:59:27 2012
@@ -31,12 +31,12 @@ import org.apache.commons.net.smtp.Relay
import org.apache.commons.net.smtp.SMTPClient;
import org.apache.commons.net.smtp.SMTPReply;
import org.apache.james.protocols.api.Protocol;
+import org.apache.james.protocols.api.ProtocolServer;
import org.apache.james.protocols.api.handler.ProtocolHandler;
import org.apache.james.protocols.api.handler.WiringException;
import org.apache.james.protocols.api.utils.MockLogger;
import org.apache.james.protocols.api.utils.TestUtils;
import org.apache.james.protocols.lmtp.hook.DeliverToRecipientHook;
-import org.apache.james.protocols.netty.NettyServer;
import org.apache.james.protocols.smtp.MailAddress;
import org.apache.james.protocols.smtp.MailEnvelope;
import org.apache.james.protocols.smtp.SMTPProtocol;
@@ -91,10 +91,9 @@ public abstract class AbstractLMTPServer
TestMessageHook hook = new TestMessageHook();
InetSocketAddress address = new InetSocketAddress("127.0.0.1",
TestUtils.getFreePort());
- NettyServer server = null;
+ ProtocolServer server = null;
try {
- server = new NettyServer(createProtocol(hook));
- server.setListenAddresses(address);
+ server = createServer(createProtocol(hook), address);
server.bind();
SMTPClient client = createClient();
@@ -128,10 +127,9 @@ public abstract class AbstractLMTPServer
TestMessageHook hook = new TestMessageHook();
InetSocketAddress address = new InetSocketAddress("127.0.0.1",
TestUtils.getFreePort());
- NettyServer server = null;
+ ProtocolServer server = null;
try {
- server = new NettyServer(createProtocol(hook));
- server.setListenAddresses(address);
+ server = createServer(createProtocol(hook), address);
server.bind();
SMTPClient client = createClient();
@@ -166,10 +164,9 @@ public abstract class AbstractLMTPServer
TestMessageHook hook = new TestMessageHook();
InetSocketAddress address = new InetSocketAddress("127.0.0.1",
TestUtils.getFreePort());
- NettyServer server = null;
+ ProtocolServer server = null;
try {
- server = new NettyServer(createProtocol(hook));
- server.setListenAddresses(address);
+ server = createServer(createProtocol(hook), address);
server.bind();
SMTPClient client = createClient();
@@ -199,10 +196,9 @@ public abstract class AbstractLMTPServer
InetSocketAddress address = new InetSocketAddress("127.0.0.1",
TestUtils.getFreePort());
- NettyServer server = null;
+ ProtocolServer server = null;
try {
- server = new NettyServer(createProtocol(deliverHook));
- server.setListenAddresses(address);
+ server = createServer(createProtocol(deliverHook), address);
server.bind();
SMTPClient client = createClient();
Added:
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java?rev=1232871&view=auto
==============================================================================
---
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java
(added)
+++
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java
Wed Jan 18 12:59:27 2012
@@ -0,0 +1,21 @@
+package org.apache.james.protocols.lmtp.netty;
+
+import java.net.InetSocketAddress;
+
+import org.apache.james.protocols.api.Encryption;
+import org.apache.james.protocols.api.Protocol;
+import org.apache.james.protocols.api.ProtocolServer;
+import org.apache.james.protocols.api.utils.BogusSslContextFactory;
+import org.apache.james.protocols.lmtp.AbstractLMTPSServerTest;
+import org.apache.james.protocols.netty.NettyServer;
+
+public class NettyLMTPSServerTest extends AbstractLMTPSServerTest{
+
+ @Override
+ protected ProtocolServer createServer(Protocol protocol, InetSocketAddress
address) {
+ NettyServer server = new NettyServer(protocol,
Encryption.createTls(BogusSslContextFactory.getServerContext()));
+ server.setListenAddresses(address);
+ return server;
+ }
+
+}
Propchange:
james/protocols/trunk/lmtp/src/test/java/org/apache/james/protocols/lmtp/netty/NettyLMTPSServerTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
