From jboss-remoting-commits at lists.jboss.org Sat Nov 29 23:19:02 2008
Content-Type: multipart/mixed; boundary="===============1893063072980902445=="
MIME-Version: 1.0
From: jboss-remoting-commits at lists.jboss.org
To: jboss-remoting-commits at lists.jboss.org
Subject: [jboss-remoting-commits] JBoss Remoting SVN: r4753 - in
 remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection: deadlock
 and 1 other directory.
Date: Sat, 29 Nov 2008 23:19:02 -0500
Message-ID: <E1L6dlu-0001tz-Hs@committer01.frg.pub.inap.atl.jboss.com>

--===============1893063072980902445==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: ron.sigal(a)jboss.com
Date: 2008-11-29 23:19:02 -0500 (Sat, 29 Nov 2008)
New Revision: 4753

Added:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dead=
lock/
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dead=
lock/DeadlockTestCase.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dead=
lock/DeadlockTestClient.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dead=
lock/DeadlockTestServer.java
Log:
JBREM-1070: New unit test.

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/=
deadlock/DeadlockTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dea=
dlock/DeadlockTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dea=
dlock/DeadlockTestCase.java	2008-11-30 04:19:02 UTC (rev 4753)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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;
+
+/**
+ * Unit test for JBREM-1070.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
+public class DeadlockTestCase extends TestDriver
+{
+   public void declareTestClasses()
+   {
+      addTestClasses(DeadlockTestClient.class.getName(),
+                     1,
+                     DeadlockTestServer.class.getName());
+   }
+   =

+   protected long getResultsTimeout()
+   {
+      return 240000;
+   }
+}
\ No newline at end of file

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/=
deadlock/DeadlockTestClient.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dea=
dlock/DeadlockTestClient.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dea=
dlock/DeadlockTestClient.java	2008-11-30 04:19:02 UTC (rev 4753)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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 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.remoting.Client;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvokerLocator;
+
+/**
+ * Unit test for JBREM-1070.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
+public class DeadlockTestClient extends TestCase
+{
+   private static Logger log =3D Logger.getLogger(DeadlockTestClient.class=
);
+   =

+   private static boolean firstTime =3D true;
+   =

+   protected String host;
+   protected int port =3D 7777;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+
+   =

+   public void setUp() throws Exception
+   {
+      if (firstTime)
+      {
+         firstTime =3D false;
+         Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+         Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+         String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+         PatternLayout layout =3D new PatternLayout(pattern);
+         ConsoleAppender consoleAppender =3D new ConsoleAppender(layout);
+         Logger.getRootLogger().addAppender(consoleAppender);  =

+      }
+   }
+
+   =

+   public void tearDown()
+   {
+   }
+   =

+   =

+   public void testForDeadlock() throws Throwable
+   {
+      log.info("entering " + getName());
+      for (int i =3D 0; i < 10; i++)
+      {
+         assertTrue("failed execution: " + i, doTest());
+         log.info("execution " + i + " PASSES\n");
+      }
+      log.info(getName() + " PASSES");
+   }
+   =

+   =

+   public boolean doTest() throws Throwable
+   {
+      // Create client.
+      host =3D InetAddress.getLocalHost().getHostAddress();
+      locatorURI =3D getTransport() + "://" + host + ":" + port;
+      String metadata =3D System.getProperty("remoting.metadata");
+      if (metadata !=3D null)
+      {
+         locatorURI +=3D "/?" + metadata;
+      }
+      InvokerLocator clientLocator =3D new InvokerLocator(locatorURI);
+      HashMap clientConfig =3D new HashMap();
+      clientConfig.put(ConnectionValidator.VALIDATOR_PING_TIMEOUT, "5000");
+      clientConfig.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1000");
+      addExtraClientConfig(clientConfig);
+      Client client =3D 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 =3D new TestConnectionListener();
+      client.addConnectionListener(listener);
+      =

+      // Wait for notification.
+      for (int i =3D 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 cl=
ient)
+      {
+         ok =3D true;
+         log.info("handleConnectionException() called");
+      }
+   }
+}
\ No newline at end of file

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/=
deadlock/DeadlockTestServer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dea=
dlock/DeadlockTestServer.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/connection/dea=
dlock/DeadlockTestServer.java	2008-11-30 04:19:02 UTC (rev 4753)
@@ -0,0 +1,193 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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 java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+
+import org.apache.log4j.ConsoleAppender;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.apache.log4j.PatternLayout;
+import org.jboss.jrunit.extensions.ServerTestCase;
+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;
+
+
+/**
+ * Unit test for JBREM-1070.
+ * =

+ * @author <a href=3D"ron.sigal(a)jboss.com">Ron Sigal</a>
+ * @version =

+ * <p>
+ * Copyright Nov 29, 2008
+ * </p>
+ */
+public class DeadlockTestServer extends ServerTestCase
+{
+   private static Logger log =3D Logger.getLogger(DeadlockTestServer.class=
);
+   =

+   private static boolean firstTime =3D true;
+   =

+   protected String host;
+   protected int port =3D 7777;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected TestServerInvoker serverInvoker;
+   protected TestInvocationHandler invocationHandler;
+   =

+   =

+   public static void main(String[] args)
+   {
+      try
+      {
+         DeadlockTestServer server =3D new DeadlockTestServer();
+         server.setUp();
+         Thread.sleep(600000);
+         server.shutdownServer();
+      }
+      catch (Throwable t)
+      {
+         log.error("error", t);
+      }
+   }
+
+   =

+   public void setUp() throws Exception
+   {
+      if (firstTime)
+      {
+         firstTime =3D false;
+         Logger.getLogger("org.jboss.remoting").setLevel(Level.INFO);
+         Logger.getLogger("org.jboss.test.remoting").setLevel(Level.INFO);
+         String pattern =3D "[%d{ABSOLUTE}] [%t] %5p (%F:%L) - %m%n";
+         PatternLayout layout =3D new PatternLayout(pattern);
+         ConsoleAppender consoleAppender =3D new ConsoleAppender(layout);
+         Logger.getRootLogger().addAppender(consoleAppender);  =

+      }
+      =

+      setupServer();
+   }
+
+   =

+   public void tearDown() throws Exception
+   {
+      shutdownServer();
+   }
+   =

+   =

+   protected String getTransport()
+   {
+      return "socket";
+   }
+   =

+   =

+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   =

+
+   protected void setupServer() throws Exception
+   {
+      host =3D InetAddress.getLocalHost().getHostAddress();
+      locatorURI =3D getTransport() + "://" + host + ":" + port;
+      String metadata =3D System.getProperty("remoting.metadata");
+      if (metadata !=3D null)
+      {
+         locatorURI +=3D "/?" + metadata;
+      }
+      serverLocator =3D new InvokerLocator(locatorURI);
+      log.info("Starting remoting server with locator uri of: " + locatorU=
RI);
+      HashMap config =3D new HashMap();
+      config.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraServerConfig(config);
+      =

+      serverInvoker =3D new TestServerInvoker(serverLocator, config);
+      serverInvoker.create();
+      invocationHandler =3D new TestInvocationHandler();
+      serverInvoker.addInvocationHandler("test", invocationHandler);
+      serverInvoker.start();
+      log.info("TestServerInvoker(" + locatorURI + ") started");
+   }
+   =

+   =

+   protected void shutdownServer() throws Exception
+   {
+      if (serverInvoker !=3D null)
+         serverInvoker.stop();
+   }
+   =

+   =

+   static class TestInvocationHandler implements ServerInvocationHandler
+   {
+      public void addListener(InvokerCallbackHandler callbackHandler) {}
+      public Object invoke(final InvocationRequest invocation) throws Thro=
wable
+      {
+         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(10000);
+            throw new Exception("got $PING$");
+         }
+         else
+         {
+            return super.invoke(invocation);
+         }
+      }
+   }
+
+   static class TestConnectionListener implements ConnectionListener
+   {
+      public boolean ok;
+      =

+      public void handleConnectionException(Throwable throwable, Client cl=
ient)
+      {
+         ok =3D true;
+         log.info("handleConnectionException() called");
+      }
+   }
+}
\ No newline at end of file


--===============1893063072980902445==--