1:09 a.m.
Author: ron.sigal(a)jboss.com
Date: 2008-11-29 02:09:01 -0500 (Sat, 29 Nov 2008)
New Revision: 4745
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
Log:
JBREM-1070: New unit test.
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
===================================================================
---
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java
(rev 0)
+++
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestCase.java 2008-11-29
07:09:01 UTC (rev 4745)
@@ -0,0 +1,36 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.test.remoting.connection.deadlock;
+
+import org.jboss.jrunit.harness.TestDriver;
+
+
+public class DeadlockTestCase extends TestDriver
+{
+ public void declareTestClasses()
+ {
+ addTestClasses(DeadlockTestClient.class.getName(),
+ 1,
+ DeadlockTestServer.class.getName());
+ }
+}
\ No newline at end of file
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
===================================================================
---
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
(rev 0)
+++
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java 2008-11-29
07:09:01 UTC (rev 4745)
@@ -0,0 +1,125 @@
+package org.jboss.test.remoting.connection.deadlock;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvokerLocator;
+
+
+public class DeadlockTestClient extends TestCase
+{
+ private static Logger log = Logger.getLogger(DeadlockTestClient.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port = 7777;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+
+
+ public void setUp() throws Exception
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ public void testForDeadlock() throws Throwable
+ {
+ log.info("entering " + getName());
+ for (int i = 0; i < 50; i++)
+ {
+ assertTrue("failed execution: " + i, doTest());
+ log.info("execution " + i + " PASES\n");
+ }
+ log.info(getName() + " PASSES");
+ }
+
+
+ public boolean doTest() throws Throwable
+ {
+ // Create client.
+ host = InetAddress.getLocalHost().getHostAddress();
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+ HashMap clientConfig = new HashMap();
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "10000");
+ clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "20000");
+ addExtraClientConfig(clientConfig);
+ Client client = new Client(clientLocator, clientConfig);
+ client.connect();
+ log.info("client is connected");
+
+ // Test connections.
+ assertEquals("abc", client.invoke("abc"));
+ log.info("connection is good");
+
+ // Add ConnectionListener.
+ TestConnectionListener listener = new TestConnectionListener();
+ client.addConnectionListener(listener);
+
+ // Wait for notification.
+ for (int i = 0; i < 20; i++)
+ {
+ if (listener.ok)
+ {
+ break;
+ }
+ Thread.sleep(1000);
+ }
+
+ client.disconnect();
+ return listener.ok;
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public boolean ok;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ ok = true;
+ log.info("handleConnectionException() called");
+ }
+ }
+}
\ No newline at end of file
Property changes on:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestClient.java
___________________________________________________________________
Name: svn:executable
+ *
Added:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
===================================================================
---
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
(rev 0)
+++
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java 2008-11-29
07:09:01 UTC (rev 4745)
@@ -0,0 +1,162 @@
+package org.jboss.test.remoting.connection.deadlock;
+
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.logging.XLevel;
+import org.jboss.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+
+
+public class DeadlockTestServer extends TestCase
+{
+ private static Logger log = Logger.getLogger(DeadlockTestServer.class);
+
+ private static boolean firstTime = true;
+
+ protected String host;
+ protected int port = 7777;
+ protected String locatorURI;
+ protected InvokerLocator serverLocator;
+ protected TestServerInvoker serverInvoker;
+ protected TestInvocationHandler invocationHandler;
+
+
+ public static void main(String[] args)
+ {
+ try
+ {
+ DeadlockTestServer server = new DeadlockTestServer();
+ server.setUp();
+ server.setupServer();
+ Thread.sleep(600000);
+ server.shutdownServer();
+ }
+ catch (Throwable t)
+ {
+ log.error("error", t);
+ }
+ }
+
+
+ public void setUp()
+ {
+ if (firstTime)
+ {
+ firstTime = false;
+ Logger.getLogger("org.jboss.remoting").setLevel(XLevel.INFO);
+ Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+ String pattern = "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+ PatternLayout layout = new PatternLayout(pattern);
+ ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+ Logger.getRootLogger().addAppender(consoleAppender);
+ }
+ }
+
+
+ public void tearDown()
+ {
+ }
+
+
+ protected String getTransport()
+ {
+ return "socket";
+ }
+
+
+ protected void addExtraClientConfig(Map config) {}
+ protected void addExtraServerConfig(Map config) {}
+
+
+ protected void setupServer() throws Exception
+ {
+ host = InetAddress.getLocalHost().getHostAddress();
+ locatorURI = getTransport() + "://" + host + ":" + port;
+ String metadata = System.getProperty("remoting.metadata");
+ if (metadata != null)
+ {
+ locatorURI += "/?" + metadata;
+ }
+ serverLocator = new InvokerLocator(locatorURI);
+ log.info("Starting remoting server with locator uri of: " + locatorURI);
+ HashMap config = new HashMap();
+ config.put(InvokerLocator.FORCE_REMOTE, "true");
+ addExtraServerConfig(config);
+
+ serverInvoker = new TestServerInvoker(serverLocator, config);
+ serverInvoker.create();
+ invocationHandler = new TestInvocationHandler();
+ serverInvoker.addInvocationHandler("test", invocationHandler);
+ serverInvoker.start();
+ log.info("TestServerInvoker(" + locatorURI + ") started");
+ }
+
+
+ protected void shutdownServer() throws Exception
+ {
+ if (serverInvoker != null)
+ serverInvoker.stop();
+ }
+
+
+ static class TestInvocationHandler implements ServerInvocationHandler
+ {
+ public void addListener(InvokerCallbackHandler callbackHandler) {}
+ public Object invoke(final InvocationRequest invocation) throws Throwable
+ {
+ return invocation.getParameter();
+ }
+ public void removeListener(InvokerCallbackHandler callbackHandler) {}
+ public void setMBeanServer(MBeanServer server) {}
+ public void setInvoker(ServerInvoker invoker) {}
+ }
+
+ static class TestServerInvoker extends SocketServerInvoker
+ {
+ public TestServerInvoker(InvokerLocator locator, Map config)
+ {
+ super(locator, config);
+ log.info("TestServerInvoker: " + locator);
+ }
+ public Object invoke(InvocationRequest invocation) throws Throwable
+ {
+ if ("$PING$".equals(invocation.getParameter()))
+ {
+ log.info("TestServerInvoker received $PING$");
+ Thread.sleep(20000);
+ throw new Exception("got $PING$");
+ }
+ else
+ {
+ return super.invoke(invocation);
+ }
+ }
+ }
+
+ static class TestConnectionListener implements ConnectionListener
+ {
+ public boolean ok;
+
+ public void handleConnectionException(Throwable throwable, Client client)
+ {
+ ok = true;
+ log.info("handleConnectionException() called");
+ }
+ }
+}
\ No newline at end of file
Property changes on:
remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/deadlock/DeadlockTestServer.java
___________________________________________________________________
Name: svn:executable
+ *