[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh ...
Ron Sigal
ron_sigal at yahoo.com
Tue Dec 19 01:27:09 EST 2006
User: rsigal
Date: 06/12/19 01:27:09
Modified: src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh
Tag: remoting_2_x TestServer.java TestClient.java
Log:
JBREM-650: Added getTransport(), and in some cases getPort(), to allow reusing tests with other transports.
Revision Changes Path
No revision
No revision
1.7.4.1 +26 -26 JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TestServer.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -b -r1.7 -r1.7.4.1
--- TestServer.java 26 Jul 2006 16:28:45 -0000 1.7
+++ TestServer.java 19 Dec 2006 06:27:09 -0000 1.7.4.1
@@ -8,8 +8,7 @@
import org.jboss.remoting.callback.InvokerCallbackHandler;
import org.jboss.remoting.security.SSLSocketBuilder;
import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.sslsocket.SSLSocketServerInvoker;
-
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
import javax.management.MBeanServer;
import javax.management.MBeanServerFactory;
import javax.management.ObjectName;
@@ -36,15 +35,15 @@
*/
public class TestServer extends ServerTestCase{
- private String localHost="127.0.0.1";
- private String keyStorePath="src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/serverKeyStore";
- private String trustStorePath="src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/serverTrustStore";
- private String keyStorePassword="testpw";
- private String trustStorePassword="testpw";
- private String port="2001";
- private Connector connector;
- private MBeanServer server;
- private static boolean invocationDone=false;
+ protected String localHost="127.0.0.1";
+ protected String keyStorePath="src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/serverKeyStore";
+ protected String trustStorePath="src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/serverTrustStore";
+ protected String keyStorePassword="testpw";
+ protected String trustStorePassword="testpw";
+ protected String port="2001";
+ protected Connector connector;
+ protected MBeanServer server;
+ protected static boolean invocationDone=false;
public void setUp(){
@@ -67,7 +66,7 @@
configuration.put(SSLSocketBuilder.REMOTING_TRUST_STORE_ALGORITHM, "SunX509");
connector = new Connector(configuration);
- InvokerLocator locator = new InvokerLocator("sslsocket://"+localHost+":"+port);
+ InvokerLocator locator = new InvokerLocator(getTransport() + "://"+localHost+":"+port);
connector.setInvokerLocator(locator.getLocatorURI());
connector.create();
@@ -77,8 +76,8 @@
ServerSocketFactory svrSocketFactory = createServerSocketFactory(keyStorePassword,trustStorePassword,keyStorePath,trustStorePath);
// notice that the invoker has to be explicitly cast to the
- // SSLSocketServerInvoker type
- SSLSocketServerInvoker socketSvrInvoker = (SSLSocketServerInvoker) connector.getServerInvoker();
+ // SocketServerInvoker type
+ SocketServerInvoker socketSvrInvoker = (SocketServerInvoker) connector.getServerInvoker();
socketSvrInvoker.setServerSocketFactory(svrSocketFactory);
}
catch(Exception e){
@@ -104,18 +103,15 @@
connector.stop();
}
- /**
- * @throws Exception
- */
+
public void test() throws Exception
{
while(!invocationDone)
{
Thread.sleep(1000);
}
- //((SSLSocketServerInvoker) connector.getServerInvoker()).setNewServerSocketFactory(createServerSocketFactory(keyStorePassword,trustStorePassword,keyStorePath,"src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/serverTrustStore2"));
String keyStorePath2 = this.getClass().getResource("certificate/serverTrustStore2").getFile();
- ((SSLSocketServerInvoker) connector.getServerInvoker()).setNewServerSocketFactory(createServerSocketFactory(keyStorePassword,trustStorePassword,keyStorePath,keyStorePath2));
+ ((SocketServerInvoker) connector.getServerInvoker()).setNewServerSocketFactory(createServerSocketFactory(keyStorePassword,trustStorePassword,keyStorePath,keyStorePath2));
Thread.sleep(20000);//let client build up connection a second time
}
@@ -133,6 +129,10 @@
}
}
+ protected String getTransport()
+ {
+ return "sslsocket";
+ }
/**
* @author Michael Voss
1.5.4.1 +8 -4 JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestClient.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: TestClient.java
===================================================================
RCS file: /cvsroot/jboss/JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestClient.java,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -b -r1.5 -r1.5.4.1
--- TestClient.java 7 Jul 2006 18:47:43 -0000 1.5
+++ TestClient.java 19 Dec 2006 06:27:09 -0000 1.5.4.1
@@ -23,7 +23,7 @@
Map configuration;
public void setUp() throws Exception{
- locator=new InvokerLocator("sslsocket://localHost:2001");
+ locator=new InvokerLocator(getTransport() + "://localHost:2001");
//the client side connection endpoint
configuration = new HashMap();
@@ -52,9 +52,10 @@
public void tearDown() throws Exception{
Thread.sleep(10000);//let the server fetch his new truststore and refresh serversocket
client.disconnect();
- Thread.sleep(5000);
- setUp();//secondPass -> client is not accepted by new truststore
+ Thread.sleep(10000);
+
try {
+ setUp();//secondPass -> client is not accepted by new truststore
test();//secondPass -> client is not accepted by new truststore
} catch (Throwable e) {
client.disconnect();
@@ -73,6 +74,9 @@
System.err.println("Server answer is: "+client.invoke("something"));
}
-
+ protected String getTransport()
+ {
+ return "sslsocket";
+ }
}
More information about the jboss-cvs-commits
mailing list