[jboss-cvs] JBossRemoting/src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh ...
Ron Sigal
ron_sigal at yahoo.com
Sun Mar 11 16:59:04 EDT 2007
User: rsigal
Date: 07/03/11 16:59:04
Modified: src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh
Tag: remoting_2_x TestClient.java TestServer.java
Log:
JBREM-654: Added logging.
Revision Changes Path
No revision
No revision
1.5.4.2 +15 -5 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.4.1
retrieving revision 1.5.4.2
diff -u -b -r1.5.4.1 -r1.5.4.2
--- TestClient.java 19 Dec 2006 06:27:09 -0000 1.5.4.1
+++ TestClient.java 11 Mar 2007 20:59:04 -0000 1.5.4.2
@@ -1,6 +1,8 @@
package org.jboss.test.remoting.transport.socket.ssl.serversocketrefresh;
import junit.framework.TestCase;
+
+import org.jboss.logging.Logger;
import org.jboss.remoting.Client;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.security.SSLSocketBuilder;
@@ -13,7 +15,7 @@
*
*/
public class TestClient extends TestCase{
-
+ private static Logger log = Logger.getLogger(TestClient.class);
private String keyStorePath="src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/clientKeyStore";
private String trustStorePath="src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/certificate/clientTrustStore";
private String keyStorePassword="testpw";
@@ -23,6 +25,7 @@
Map configuration;
public void setUp() throws Exception{
+ log.info("entering setUp()");
locator=new InvokerLocator(getTransport() + "://localHost:2001");
//the client side connection endpoint
@@ -46,19 +49,26 @@
client=new Client(locator,"Sample",configuration);
client.connect();
+ log.info("leaving setUp()");
}
public void tearDown() throws Exception{
+ log.info("entering tearDown()");
Thread.sleep(10000);//let the server fetch his new truststore and refresh serversocket
+ log.info("finished first sleep in tearDown()");
client.disconnect();
+ log.info("disconnected client in tearDown()");
Thread.sleep(10000);
+ log.info("finished second sleep in tearDown()");
try {
setUp();//secondPass -> client is not accepted by new truststore
test();//secondPass -> client is not accepted by new truststore
} catch (Throwable e) {
+ log.error("expected Exception", e);
client.disconnect();
+ log.info("SUCCESS");
return;
}
client.disconnect();
@@ -70,8 +80,8 @@
* @throws Throwable
*/
public void test() throws Throwable{
- System.err.println("Invoking server with 'something'");
- System.err.println("Server answer is: "+client.invoke("something"));
+ log.info("Invoking server with 'something'");
+ log.info("Server answer is: "+client.invoke("something"));
}
protected String getTransport()
1.7.4.2 +9 -3 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.4.1
retrieving revision 1.7.4.2
diff -u -b -r1.7.4.1 -r1.7.4.2
--- TestServer.java 19 Dec 2006 06:27:09 -0000 1.7.4.1
+++ TestServer.java 11 Mar 2007 20:59:04 -0000 1.7.4.2
@@ -1,6 +1,7 @@
package org.jboss.test.remoting.transport.socket.ssl.serversocketrefresh;
import org.jboss.jrunit.extensions.ServerTestCase;
+import org.jboss.logging.Logger;
import org.jboss.remoting.InvocationRequest;
import org.jboss.remoting.InvokerLocator;
import org.jboss.remoting.ServerInvocationHandler;
@@ -34,7 +35,7 @@
*
*/
public class TestServer extends ServerTestCase{
-
+ private static Logger log = Logger.getLogger("TestServer");
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";
@@ -46,7 +47,7 @@
protected static boolean invocationDone=false;
public void setUp(){
-
+ log.info("entering setUp");
// starting connector
try{
//make it SSL-ready for sending callbacks (server acts as a client)
@@ -88,7 +89,7 @@
server=MBeanServerFactory.createMBeanServer();
server.registerMBean(connector, new ObjectName("jboss.remoting:type=Connector"));
connector.addInvocationHandler("Sample",new Sample());
-
+ log.info("leaving setUp()");
}
catch(Exception e){
e.printStackTrace();
@@ -97,22 +98,27 @@
}
public void tearDown() throws Exception
{
+ log.info("entering tearDown()");
Thread.sleep(10000);
server.unregisterMBean( new ObjectName("jboss.remoting:type=Connector"));
connector.removeInvocationHandler("Sample");
connector.stop();
+ log.info("stopped Connector");
}
public void test() throws Exception
{
+ log.info("entering test()");
while(!invocationDone)
{
Thread.sleep(1000);
}
+ log.info("invocation done");
String keyStorePath2 = this.getClass().getResource("certificate/serverTrustStore2").getFile();
((SocketServerInvoker) connector.getServerInvoker()).setNewServerSocketFactory(createServerSocketFactory(keyStorePassword,trustStorePassword,keyStorePath,keyStorePath2));
Thread.sleep(20000);//let client build up connection a second time
+ log.info("leaving test()");
}
public static void main(String[] args)
More information about the jboss-cvs-commits
mailing list