[jboss-remoting-commits] JBoss Remoting SVN: r5981 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection.

jboss-remoting-commits at lists.jboss.org jboss-remoting-commits at lists.jboss.org
Wed Aug 4 21:04:39 EDT 2010


Author: ron.sigal at jboss.com
Date: 2010-08-04 21:04:38 -0400 (Wed, 04 Aug 2010)
New Revision: 5981

Modified:
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorNPETestCase.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTiedToLeaseTestCase.java
Log:
JBREM-1241: Added svn:eol-style subversion property.

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java	2010-08-05 01:03:23 UTC (rev 5980)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java	2010-08-05 01:04:38 UTC (rev 5981)
@@ -1,594 +1,594 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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;
-
-import java.io.IOException;
-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.ClientDisconnectedException;
-import org.jboss.remoting.ConnectionListener;
-import org.jboss.remoting.ConnectionValidator;
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.InvokerRegistry;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-import org.jboss.remoting.transport.ServerFactory;
-import org.jboss.remoting.transport.socket.SocketServerInvoker;
-
-
-/**
- * Unit test for JBREM-1112.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version 
- * <p>
- * Copyright Apr 3, 2009
- * </p>
- */
-public class ConnectionValidatorDisconnectTimeoutTestCase extends TestCase
-{
-   private static Logger log = Logger.getLogger(ConnectionValidatorDisconnectTimeoutTestCase.class);
-   
-   private static boolean firstTime = true;
-   
-   protected String host;
-   protected int port;
-   protected String locatorURI;
-   protected InvokerLocator serverLocator;
-   protected Connector connector;
-   protected TestInvocationHandler invocationHandler;
-   protected TestConnectionListener serverConnectionListener;
-
-   
-   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 testDefaultUnary() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener);
-      
-      // Wait for broken connection and test.
-      Thread.sleep(4000);
-      assertTrue(serverConnectionListener.notified);
-      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.removeConnectionListener(clientConnectionListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testDefaultFirstBinary() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener, 500);
-      
-      // Wait for broken connection and test.
-      Thread.sleep(4000);
-      assertTrue(serverConnectionListener.notified);
-      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.removeConnectionListener(clientConnectionListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testDefaultSecondBinary() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener, new HashMap());
-      
-      // Wait for broken connection and test.
-      Thread.sleep(4000);
-      assertTrue(serverConnectionListener.notified);
-      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.removeConnectionListener(clientConnectionListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testZeroInvokerLocator() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      String clientLocatorURI = locatorURI;
-      clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
-      clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
-      log.info("clientLocatorURI: " + clientLocatorURI);
-      InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener, new HashMap());
-      
-      // Wait for broken connection and test.
-      Thread.sleep(8000);
-      assertTrue(serverConnectionListener.notified);
-      assertNull(serverConnectionListener.throwable);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.removeConnectionListener(clientConnectionListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testNonZeroInvokerLocator() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      String clientLocatorURI = locatorURI;
-      clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
-      clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
-      log.info("clientLocatorURI: " + clientLocatorURI);
-      InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener, new HashMap());
-      
-      // Wait for broken connection and test.
-      Thread.sleep(4000);
-      assertTrue(serverConnectionListener.notified);
-      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testZeroConfig() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener, new HashMap());
-      
-      // Wait for broken connection and test.
-      Thread.sleep(8000);
-      assertTrue(serverConnectionListener.notified);
-      assertNull(serverConnectionListener.throwable);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testNonZeroConfig() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      client.addConnectionListener(clientConnectionListener, new HashMap());
-      
-      // Wait for broken connection and test.
-      Thread.sleep(4000);
-      assertTrue(serverConnectionListener.notified);
-      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testZeroMetadata() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      HashMap metadata = new HashMap();
-      metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
-      client.addConnectionListener(clientConnectionListener, metadata);
-      
-      // Wait for broken connection and test.
-      Thread.sleep(8000);
-      assertTrue(serverConnectionListener.notified);
-      assertNull(serverConnectionListener.throwable);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testNonZeroMetadata() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      clientConfig.put(Client.ENABLE_LEASE, "true");
-      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");
-      
-      // Install ConnectionListener.
-      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
-      HashMap metadata = new HashMap();
-      metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
-      client.addConnectionListener(clientConnectionListener, metadata);
-      
-      // Wait for broken connection and test.
-      Thread.sleep(4000);
-      assertTrue(serverConnectionListener.notified);
-      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
-      assertTrue(clientConnectionListener.notified);
-      assertTrue(clientConnectionListener.throwable instanceof Exception);
-      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
-      
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   protected String getTransport()
-   {
-      return "socket";
-   }
-   
-   
-   protected void addExtraClientConfig(Map config) {}
-   protected void addExtraServerConfig(Map config) {}
-   
-
-   protected void setupServer() throws Exception
-   {
-      InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
-      host = InetAddress.getLocalHost().getHostAddress();
-      port = PortUtil.findFreePort(host);
-      locatorURI = getTransport() + "://" + host + ":" + port + "/?x=x";
-      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");
-      config.put("leasePeriod", "1000");
-      addExtraServerConfig(config);
-      connector = new Connector(serverLocator, config);
-      connector.create();
-      invocationHandler = new TestInvocationHandler();
-      connector.addInvocationHandler("test", invocationHandler);
-      connector.start();
-      serverConnectionListener = new TestConnectionListener("SERVER");
-      connector.addConnectionListener(serverConnectionListener);
-   }
-   
-   
-   protected void shutdownServer() throws Exception
-   {
-      if (connector != null)
-         connector.stop();
-   }
-   
-   
-   static class TestServerInvoker extends SocketServerInvoker
-   {
-      public TestServerInvoker(InvokerLocator locator, Map configuration)
-      {
-         super(locator, configuration);  
-      }
-
-      public Object invoke(InvocationRequest invocation) throws Throwable
-      {
-         Object param = invocation.getParameter();
-
-         // check to see if this is a is alive ping
-         if ("$PING$".equals(param))
-         {
-            Map metadata = invocation.getRequestPayload();
-            if (metadata != null)
-            {
-               String invokerSessionId = (String) metadata.get(INVOKER_SESSION_ID);
-               if (invokerSessionId != null)
-               {
-                  // Comes from ConnectionValidator configured to tie validation with lease.
-                  log.info(this + " responding FALSE to $PING$ for invoker sessionId " + invokerSessionId);
-                  return Boolean.FALSE;
-               }
-            }
-         }
-
-         return super.invoke(invocation);
-      }
-   }
-   
-   
-   public static class TestServerInvokerFactory implements ServerFactory
-   {
-      public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
-      {
-         return new TestServerInvoker(locator, config);
-      }
-
-      public boolean supportsSSL()
-      {
-         return false;
-      }
-   }
-   
-   
-   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 TestConnectionListener implements ConnectionListener
-   {
-      public boolean notified;
-      public Throwable throwable;
-      String name;
-      
-      TestConnectionListener(String name)
-      {
-         this.name = name;
-      }
-      
-      public void handleConnectionException(Throwable throwable, Client client)
-      {
-         notified = true;
-         this.throwable = throwable;
-         log.info(this + " NOTIFIED, throwable = " + throwable);
-      }
-      
-      public String toString()
-      {
-         return "TestConnectionListener[" + name + "]";
-      }
-   }
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import java.io.IOException;
+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.ClientDisconnectedException;
+import org.jboss.remoting.ConnectionListener;
+import org.jboss.remoting.ConnectionValidator;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.InvokerRegistry;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.ServerFactory;
+import org.jboss.remoting.transport.socket.SocketServerInvoker;
+
+
+/**
+ * Unit test for JBREM-1112.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version 
+ * <p>
+ * Copyright Apr 3, 2009
+ * </p>
+ */
+public class ConnectionValidatorDisconnectTimeoutTestCase extends TestCase
+{
+   private static Logger log = Logger.getLogger(ConnectionValidatorDisconnectTimeoutTestCase.class);
+   
+   private static boolean firstTime = true;
+   
+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+   protected TestConnectionListener serverConnectionListener;
+
+   
+   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 testDefaultUnary() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener);
+      
+      // Wait for broken connection and test.
+      Thread.sleep(4000);
+      assertTrue(serverConnectionListener.notified);
+      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.removeConnectionListener(clientConnectionListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testDefaultFirstBinary() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener, 500);
+      
+      // Wait for broken connection and test.
+      Thread.sleep(4000);
+      assertTrue(serverConnectionListener.notified);
+      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.removeConnectionListener(clientConnectionListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testDefaultSecondBinary() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener, new HashMap());
+      
+      // Wait for broken connection and test.
+      Thread.sleep(4000);
+      assertTrue(serverConnectionListener.notified);
+      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.removeConnectionListener(clientConnectionListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testZeroInvokerLocator() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      String clientLocatorURI = locatorURI;
+      clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
+      clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=0";
+      log.info("clientLocatorURI: " + clientLocatorURI);
+      InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener, new HashMap());
+      
+      // Wait for broken connection and test.
+      Thread.sleep(8000);
+      assertTrue(serverConnectionListener.notified);
+      assertNull(serverConnectionListener.throwable);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.removeConnectionListener(clientConnectionListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testNonZeroInvokerLocator() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      String clientLocatorURI = locatorURI;
+      clientLocatorURI += "&" + Client.USE_ALL_PARAMS + "=true";
+      clientLocatorURI += "&" + ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT + "=10000";
+      log.info("clientLocatorURI: " + clientLocatorURI);
+      InvokerLocator clientLocator = new InvokerLocator(clientLocatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener, new HashMap());
+      
+      // Wait for broken connection and test.
+      Thread.sleep(4000);
+      assertTrue(serverConnectionListener.notified);
+      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testZeroConfig() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener, new HashMap());
+      
+      // Wait for broken connection and test.
+      Thread.sleep(8000);
+      assertTrue(serverConnectionListener.notified);
+      assertNull(serverConnectionListener.throwable);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testNonZeroConfig() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      clientConfig.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      client.addConnectionListener(clientConnectionListener, new HashMap());
+      
+      // Wait for broken connection and test.
+      Thread.sleep(4000);
+      assertTrue(serverConnectionListener.notified);
+      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testZeroMetadata() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      HashMap metadata = new HashMap();
+      metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "0");
+      client.addConnectionListener(clientConnectionListener, metadata);
+      
+      // Wait for broken connection and test.
+      Thread.sleep(8000);
+      assertTrue(serverConnectionListener.notified);
+      assertNull(serverConnectionListener.throwable);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testNonZeroMetadata() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      clientConfig.put(Client.ENABLE_LEASE, "true");
+      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");
+      
+      // Install ConnectionListener.
+      TestConnectionListener clientConnectionListener = new TestConnectionListener("CLIENT");
+      HashMap metadata = new HashMap();
+      metadata.put(ConnectionValidator.FAILURE_DISCONNECT_TIMEOUT, "10000");
+      client.addConnectionListener(clientConnectionListener, metadata);
+      
+      // Wait for broken connection and test.
+      Thread.sleep(4000);
+      assertTrue(serverConnectionListener.notified);
+      assertTrue(serverConnectionListener.throwable instanceof ClientDisconnectedException);
+      assertTrue(clientConnectionListener.notified);
+      assertTrue(clientConnectionListener.throwable instanceof Exception);
+      assertEquals("Could not connect to server!", ((Exception)clientConnectionListener.throwable).getMessage());
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   protected String getTransport()
+   {
+      return "socket";
+   }
+   
+   
+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   
+
+   protected void setupServer() throws Exception
+   {
+      InvokerRegistry.registerInvokerFactories("socket", org.jboss.remoting.transport.socket.TransportClientFactory.class, TestServerInvokerFactory.class);
+      host = InetAddress.getLocalHost().getHostAddress();
+      port = PortUtil.findFreePort(host);
+      locatorURI = getTransport() + "://" + host + ":" + port + "/?x=x";
+      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");
+      config.put("leasePeriod", "1000");
+      addExtraServerConfig(config);
+      connector = new Connector(serverLocator, config);
+      connector.create();
+      invocationHandler = new TestInvocationHandler();
+      connector.addInvocationHandler("test", invocationHandler);
+      connector.start();
+      serverConnectionListener = new TestConnectionListener("SERVER");
+      connector.addConnectionListener(serverConnectionListener);
+   }
+   
+   
+   protected void shutdownServer() throws Exception
+   {
+      if (connector != null)
+         connector.stop();
+   }
+   
+   
+   static class TestServerInvoker extends SocketServerInvoker
+   {
+      public TestServerInvoker(InvokerLocator locator, Map configuration)
+      {
+         super(locator, configuration);  
+      }
+
+      public Object invoke(InvocationRequest invocation) throws Throwable
+      {
+         Object param = invocation.getParameter();
+
+         // check to see if this is a is alive ping
+         if ("$PING$".equals(param))
+         {
+            Map metadata = invocation.getRequestPayload();
+            if (metadata != null)
+            {
+               String invokerSessionId = (String) metadata.get(INVOKER_SESSION_ID);
+               if (invokerSessionId != null)
+               {
+                  // Comes from ConnectionValidator configured to tie validation with lease.
+                  log.info(this + " responding FALSE to $PING$ for invoker sessionId " + invokerSessionId);
+                  return Boolean.FALSE;
+               }
+            }
+         }
+
+         return super.invoke(invocation);
+      }
+   }
+   
+   
+   public static class TestServerInvokerFactory implements ServerFactory
+   {
+      public ServerInvoker createServerInvoker(InvokerLocator locator, Map config) throws IOException
+      {
+         return new TestServerInvoker(locator, config);
+      }
+
+      public boolean supportsSSL()
+      {
+         return false;
+      }
+   }
+   
+   
+   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 TestConnectionListener implements ConnectionListener
+   {
+      public boolean notified;
+      public Throwable throwable;
+      String name;
+      
+      TestConnectionListener(String name)
+      {
+         this.name = name;
+      }
+      
+      public void handleConnectionException(Throwable throwable, Client client)
+      {
+         notified = true;
+         this.throwable = throwable;
+         log.info(this + " NOTIFIED, throwable = " + throwable);
+      }
+      
+      public String toString()
+      {
+         return "TestConnectionListener[" + name + "]";
+      }
+   }
 }
\ No newline at end of file


Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorDisconnectTimeoutTestCase.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorNPETestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorNPETestCase.java	2010-08-05 01:03:23 UTC (rev 5980)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorNPETestCase.java	2010-08-05 01:04:38 UTC (rev 5981)
@@ -1,239 +1,239 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2009, 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;
-
-import java.lang.reflect.Field;
-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.ConnectionValidator;
-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.Connector;
-import org.jboss.remoting.transport.PortUtil;
-
-import EDU.oswego.cs.dl.util.concurrent.Rendezvous;
-import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
-
-
-/**
- * Unit test for JBREM-1166.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Dec 13, 2009
- */
-public class ConnectionValidatorNPETestCase extends TestCase
-{
-   private static Logger log = Logger.getLogger(ConnectionValidatorNPETestCase.class);
-   private static boolean firstTime = true;
-   private static int COUNT = 2000;
-   
-   protected String host;
-   protected int port;
-   protected String locatorURI;
-   protected InvokerLocator serverLocator;
-   protected Connector connector;
-   protected TestInvocationHandler invocationHandler;
-   protected SynchronizedInt errors = new SynchronizedInt(0);
-
-   
-   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 testNPE() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer();
-      
-      // Create client.
-      HashMap config = new HashMap();
-      config.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(config);
-      Client client = new Client(serverLocator, config);
-      client.connect();
-      
-      // Start busy thread.
-      new Thread()
-      {
-         public void run()
-         {
-            int i = 0;
-            while (true)
-            {
-               i++;
-            }
-         }
-      }.start();
-      
-      // Create ConnectionValidator multiiple times.
-      HashMap metadata = new HashMap();
-      metadata.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1");
-      TestConnectionValidator[] validators = new TestConnectionValidator[COUNT];
-      for (int i = 0; i < COUNT; i++)
-      {
-         validators[i] = new TestConnectionValidator(i, errors, client, metadata);
-         validators[i].addConnectionListener(client, new TestConnectionListener());
-      }
-      
-      Thread.sleep(5000);
-      assertEquals(0, errors.get());
-      
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   protected String getTransport()
-   {
-      return "socket";
-   }
-   
-   
-   protected void addExtraClientConfig(Map config) {}
-   protected void addExtraServerConfig(Map config) {}
-   
-
-   protected void setupServer() throws Exception
-   {
-      host = InetAddress.getLocalHost().getHostAddress();
-      port = PortUtil.findFreePort(host);
-      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);
-      connector = new Connector(serverLocator, config);
-      connector.create();
-      invocationHandler = new TestInvocationHandler();
-      connector.addInvocationHandler("test", invocationHandler);
-      connector.start();
-   }
-   
-   
-   protected void shutdownServer() throws Exception
-   {
-      if (connector != null)
-         connector.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 TestConnectionListener implements ConnectionListener
-   {
-      public void handleConnectionException(Throwable throwable, Client client)
-      {
-      }
-   }
-   
-   static class TestConnectionValidator extends ConnectionValidator
-   {
-      public volatile boolean timerWasNull;
-      int id;
-      Rendezvous rendezvous;
-      boolean[] flags;
-      SynchronizedInt errors;
-      Field field;
-      
-      public TestConnectionValidator(int id, SynchronizedInt errors, Client client, Map metadata) throws SecurityException, NoSuchFieldException
-      {
-         super(client, metadata);
-         this.id = id;
-         this.errors = errors;
-         field = ConnectionValidator.class.getDeclaredField("timer");
-         field.setAccessible(true);
-      }
-      
-      public void run()
-      {
-         try
-         {
-//            log.info(id + ": starting");
-            timerWasNull = (field.get(this) == null);
-            if (timerWasNull)
-            {
-               log.info("timer was null: " + id);
-               errors.increment();
-            }
-         }
-         catch (Exception e)
-         {
-            log.info("exception", e);
-         }
-      }
-   }
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+import java.lang.reflect.Field;
+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.ConnectionValidator;
+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.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+import EDU.oswego.cs.dl.util.concurrent.Rendezvous;
+import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
+
+
+/**
+ * Unit test for JBREM-1166.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Dec 13, 2009
+ */
+public class ConnectionValidatorNPETestCase extends TestCase
+{
+   private static Logger log = Logger.getLogger(ConnectionValidatorNPETestCase.class);
+   private static boolean firstTime = true;
+   private static int COUNT = 2000;
+   
+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+   protected SynchronizedInt errors = new SynchronizedInt(0);
+
+   
+   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 testNPE() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer();
+      
+      // Create client.
+      HashMap config = new HashMap();
+      config.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(config);
+      Client client = new Client(serverLocator, config);
+      client.connect();
+      
+      // Start busy thread.
+      new Thread()
+      {
+         public void run()
+         {
+            int i = 0;
+            while (true)
+            {
+               i++;
+            }
+         }
+      }.start();
+      
+      // Create ConnectionValidator multiiple times.
+      HashMap metadata = new HashMap();
+      metadata.put(ConnectionValidator.VALIDATOR_PING_PERIOD, "1");
+      TestConnectionValidator[] validators = new TestConnectionValidator[COUNT];
+      for (int i = 0; i < COUNT; i++)
+      {
+         validators[i] = new TestConnectionValidator(i, errors, client, metadata);
+         validators[i].addConnectionListener(client, new TestConnectionListener());
+      }
+      
+      Thread.sleep(5000);
+      assertEquals(0, errors.get());
+      
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   protected String getTransport()
+   {
+      return "socket";
+   }
+   
+   
+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   
+
+   protected void setupServer() throws Exception
+   {
+      host = InetAddress.getLocalHost().getHostAddress();
+      port = PortUtil.findFreePort(host);
+      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);
+      connector = new Connector(serverLocator, config);
+      connector.create();
+      invocationHandler = new TestInvocationHandler();
+      connector.addInvocationHandler("test", invocationHandler);
+      connector.start();
+   }
+   
+   
+   protected void shutdownServer() throws Exception
+   {
+      if (connector != null)
+         connector.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 TestConnectionListener implements ConnectionListener
+   {
+      public void handleConnectionException(Throwable throwable, Client client)
+      {
+      }
+   }
+   
+   static class TestConnectionValidator extends ConnectionValidator
+   {
+      public volatile boolean timerWasNull;
+      int id;
+      Rendezvous rendezvous;
+      boolean[] flags;
+      SynchronizedInt errors;
+      Field field;
+      
+      public TestConnectionValidator(int id, SynchronizedInt errors, Client client, Map metadata) throws SecurityException, NoSuchFieldException
+      {
+         super(client, metadata);
+         this.id = id;
+         this.errors = errors;
+         field = ConnectionValidator.class.getDeclaredField("timer");
+         field.setAccessible(true);
+      }
+      
+      public void run()
+      {
+         try
+         {
+//            log.info(id + ": starting");
+            timerWasNull = (field.get(this) == null);
+            if (timerWasNull)
+            {
+               log.info("timer was null: " + id);
+               errors.increment();
+            }
+         }
+         catch (Exception e)
+         {
+            log.info("exception", e);
+         }
+      }
+   }
 }
\ No newline at end of file


Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorNPETestCase.java
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTiedToLeaseTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTiedToLeaseTestCase.java	2010-08-05 01:03:23 UTC (rev 5980)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTiedToLeaseTestCase.java	2010-08-05 01:04:38 UTC (rev 5981)
@@ -1,588 +1,588 @@
-/*
-* 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;
-
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.TimerTask;
-
-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.ConnectionValidator;
-import org.jboss.remoting.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.LeasePinger;
-import org.jboss.remoting.MicroRemoteClientInvoker;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.ClientInvoker;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-
-
-/**
- * Unit tests for JBREM-891.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Jan 19, 2008
- * </p>
- */
-public class ConnectionValidatorTiedToLeaseTestCase extends TestCase
-{
-   private static Logger log = Logger.getLogger(ConnectionValidatorTiedToLeaseTestCase.class);
-   
-   private static boolean firstTime = true;
-   
-   protected String host;
-   protected int port;
-   protected String locatorURI;
-   protected InvokerLocator serverLocator;
-   protected Connector connector;
-   protected TestInvocationHandler invocationHandler;
-   protected TestConnectionListener serverListener;
-
-   
-   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 testTiedToLeaseDefaultConfigurationLocalInvoker() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer(true);
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Register client side listener.
-      Object lock = new Object();
-      TestConnectionListener clientListener = new TestConnectionListener(lock);
-      client.addConnectionListener(clientListener);
-      log.info("connection listener added on client side");
-      
-      // Verify ConnectionValidator is running.
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Verify LeasePinger is running.
-      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
-      ClientInvoker clientInvoker = client.getInvoker();
-      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
-      field.setAccessible(true);
-      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
-      assertNotNull(pinger);
-      field = LeasePinger.class.getDeclaredField("timerTask");
-      field.setAccessible(true);
-      TimerTask timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      // Shut down lease on server side.
-      connector.removeConnectionListener(serverListener);
-      
-      // Wait for client side listener to be notified.
-      synchronized (lock)
-      {
-         lock.wait(30000);
-      }
-      
-      // Verify ConnectionValidator has stopped.
-      Thread.sleep(4000);
-      assertTrue(clientListener.notified);
-      assertEquals(-1, client.getPingPeriod());
-      
-      // Verfiy LeasePinger has stopped.
-      timerTask = (TimerTask) field.get(pinger);
-      assertNull(timerTask);
-      
-      client.removeConnectionListener(clientListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testTiedToLeaseDefaultConfigurationRemoteInvoker() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer(true);
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Register client side listener.
-      Object lock = new Object();
-      TestConnectionListener clientListener = new TestConnectionListener(lock);
-      Map metadata = new HashMap();
-      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
-      client.addConnectionListener(clientListener, metadata);
-      log.info("connection listener added on client side");
-      
-      // Verify ConnectionValidator is running.
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Verify LeasePinger is running.
-      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
-      ClientInvoker clientInvoker = client.getInvoker();
-      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
-      field.setAccessible(true);
-      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
-      assertNotNull(pinger);
-      field = LeasePinger.class.getDeclaredField("timerTask");
-      field.setAccessible(true);
-      TimerTask timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      // Shut down lease on server side.
-      connector.removeConnectionListener(serverListener);
-      
-      // Wait for client side listener to be notified.
-      synchronized (lock)
-      {
-         lock.wait(30000);
-      }
-      
-      // Verify ConnectionValidator has stopped.
-      Thread.sleep(4000);
-      assertTrue(clientListener.notified);
-      assertEquals(-1, client.getPingPeriod());
-      
-      // Verfiy LeasePinger has stopped.
-      timerTask = (TimerTask) field.get(pinger);
-      assertNull(timerTask);
-      
-      client.removeConnectionListener(clientListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testTiedToLeaseDontStopLease() throws Throwable
-   {
-     log.info("entering " + getName());
-      
-      // Start server.
-      setupServer(true);
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Register client side listener.
-      Object lock = new Object();
-      TestConnectionListener clientListener = new TestConnectionListener(lock);
-      Map metadata = new HashMap();
-      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
-      metadata.put(ConnectionValidator.TIE_TO_LEASE, "true");
-      metadata.put(ConnectionValidator.STOP_LEASE_ON_FAILURE, "false");
-      client.addConnectionListener(clientListener, metadata);
-      log.info("connection listener added on client side");
-      
-      // Verify ConnectionValidator is running.
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Verify LeasePinger is running.
-      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
-      ClientInvoker clientInvoker = client.getInvoker();
-      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
-      field.setAccessible(true);
-      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
-      assertNotNull(pinger);
-      field = LeasePinger.class.getDeclaredField("timerTask");
-      field.setAccessible(true);
-      TimerTask timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      // Shut down lease on server side.
-      connector.removeConnectionListener(serverListener);
-      
-      // Wait for client side listener to be notified.
-      synchronized (lock)
-      {
-         lock.wait(30000);
-      }
-      
-      // Verify ConnectionValidator has stopped.
-      Thread.sleep(4000);
-      assertTrue(clientListener.notified);
-      assertEquals(-1, client.getPingPeriod());
-      
-      // Verfiy LeasePinger has not stopped.
-      timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      client.removeConnectionListener(clientListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testNotTiedToLeaseDontStopLease() throws Throwable
-   {
-     log.info("entering " + getName());
-      
-      // Start server.
-      setupServer(true);
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Register client side listener.
-      Object lock = new Object();
-      TestConnectionListener clientListener = new TestConnectionListener(lock);
-      Map metadata = new HashMap();
-      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
-      metadata.put(ConnectionValidator.TIE_TO_LEASE, "false");
-      metadata.put(ConnectionValidator.STOP_LEASE_ON_FAILURE, "false");
-      client.addConnectionListener(clientListener, metadata);
-      log.info("connection listener added on client side");
-      
-      // Verify ConnectionValidator is running.
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Verify LeasePinger is running.
-      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
-      ClientInvoker clientInvoker = client.getInvoker();
-      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
-      field.setAccessible(true);
-      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
-      assertNotNull(pinger);
-      field = LeasePinger.class.getDeclaredField("timerTask");
-      field.setAccessible(true);
-      TimerTask timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      // Shut down lease on server side.
-      connector.removeConnectionListener(serverListener);
-      
-      // Wait for client side listener to be notified.
-      synchronized (lock)
-      {
-         lock.wait(30000);
-      }
-      
-      // Verify ConnectionValidator has not stopped.
-      Thread.sleep(4000);
-      assertFalse(clientListener.notified);
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Verfiy LeasePinger has not stopped.
-      timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      client.removeConnectionListener(clientListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testNotTiedToLeaseStopLease() throws Throwable
-   {
-     log.info("entering " + getName());
-      
-      // Start server.
-      setupServer(true);
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Register client side listener.
-      Object lock = new Object();
-      TestConnectionListener clientListener = new TestConnectionListener(lock);
-      Map metadata = new HashMap();
-      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
-      metadata.put(ConnectionValidator.TIE_TO_LEASE, "false");
-      metadata.put(ConnectionValidator.STOP_LEASE_ON_FAILURE, "true");
-      client.addConnectionListener(clientListener, metadata);
-      log.info("connection listener added on client side");
-      
-      // Verify ConnectionValidator is running.
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Verify LeasePinger is running.
-      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
-      ClientInvoker clientInvoker = client.getInvoker();
-      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
-      field.setAccessible(true);
-      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
-      assertNotNull(pinger);
-      field = LeasePinger.class.getDeclaredField("timerTask");
-      field.setAccessible(true);
-      TimerTask timerTask = (TimerTask) field.get(pinger);
-      assertNotNull(timerTask);
-      
-      // Prevent server from responding to ConnectionValidator pings.
-      ServerInvoker serverInvoker = connector.getServerInvoker();
-      field = ServerInvoker.class.getDeclaredField("started");
-      field.setAccessible(true);
-      field.set(serverInvoker, new Boolean(false));
-      assertFalse(field.getBoolean(serverInvoker));
-      log.info("Stopped server invoker");
-      
-      // Wait for client side listener to be notified.
-      synchronized (lock)
-      {
-         lock.wait(30000);
-      }
-      
-      // Verify ConnectionValidator has stopped.
-      Thread.sleep(4000);
-      assertTrue(clientListener.notified);
-      assertEquals(-1, client.getPingPeriod());
-      
-      // Verfiy LeasePinger has stopped.
-      field = LeasePinger.class.getDeclaredField("timerTask");
-      field.setAccessible(true);
-      timerTask = (TimerTask) field.get(pinger);
-      assertNull(timerTask);
-      
-      client.removeConnectionListener(clientListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   public void testTiedToLeaseServerLeasingTurnedOff() throws Throwable
-   {
-      log.info("entering " + getName());
-      
-      // Start server.
-      setupServer(false);
-      
-      // Create client.
-      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
-      HashMap clientConfig = new HashMap();
-      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Register client side listener.
-      Object lock = new Object();
-      TestConnectionListener clientListener = new TestConnectionListener(lock);
-      Map metadata = new HashMap();
-      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
-      client.addConnectionListener(clientListener, metadata);
-      log.info("connection listener added on client side");
-      
-      // Verify ConnectionValidator is running.
-      assertTrue(client.getPingPeriod() > -1);
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Wait for client side listener to be notified.
-      synchronized (lock)
-      {
-         lock.wait(30000);
-      }
-      
-      // Verify ConnectionValidator has not stopped.
-      Thread.sleep(4000);
-      assertFalse(clientListener.notified);
-      assertTrue(client.getPingPeriod() > -1);
-      
-      client.removeConnectionListener(clientListener);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   protected String getTransport()
-   {
-      return "socket";
-   }
-   
-   
-   protected void addExtraClientConfig(Map config) {}
-   protected void addExtraServerConfig(Map config) {}
-   
-
-   protected void setupServer(boolean startLeasing) throws Exception
-   {
-      host = InetAddress.getLocalHost().getHostAddress();
-      port = PortUtil.findFreePort(host);
-      locatorURI = getTransport() + "://" + host + ":" + port; 
-      locatorURI += "/?" + InvokerLocator.CLIENT_LEASE + "=true";
-      locatorURI += "&" + InvokerLocator.CLIENT_LEASE_PERIOD + "=4000";
-      serverLocator = new InvokerLocator(locatorURI);
-      log.info("Starting remoting server with locator uri of: " + locatorURI);
-      HashMap config = new HashMap();
-      config.put(InvokerLocator.FORCE_REMOTE, "true");
-      config.put(ServerInvoker.CLIENT_LEASE_PERIOD, "4000");
-      addExtraServerConfig(config);
-      connector = new Connector(serverLocator, config);
-      connector.create();
-      invocationHandler = new TestInvocationHandler();
-      connector.addInvocationHandler("test", invocationHandler);
-      if (startLeasing) 
-      {
-         serverListener = new TestConnectionListener();
-         connector.addConnectionListener(serverListener);
-      }
-      connector.start();
-   }
-   
-   
-   protected void shutdownServer() throws Exception
-   {
-      if (connector != null)
-      {
-         connector.removeConnectionListener(serverListener);
-         connector.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 TestConnectionListener implements ConnectionListener
-   {
-      public boolean notified;
-      private Object lock;
-      
-      TestConnectionListener()
-      {
-         this(new Object());
-      }
-      TestConnectionListener(Object lock)
-      {
-         this.lock = lock;
-      }
-      public void handleConnectionException(Throwable throwable, Client client)
-      {
-         notified = true;
-         synchronized (lock)
-         {
-            try
-            {
-               // Give listener a chance to wait on lock.
-               Thread.sleep(4000);
-            }
-            catch (InterruptedException e)
-            {
-               log.info("Unexpected interrupt in TestConnectionListener");
-            }
-            lock.notifyAll();
-         }
-      }
-   }
+/*
+* 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;
+
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimerTask;
+
+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.ConnectionValidator;
+import org.jboss.remoting.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.LeasePinger;
+import org.jboss.remoting.MicroRemoteClientInvoker;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.ClientInvoker;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+
+
+/**
+ * Unit tests for JBREM-891.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Jan 19, 2008
+ * </p>
+ */
+public class ConnectionValidatorTiedToLeaseTestCase extends TestCase
+{
+   private static Logger log = Logger.getLogger(ConnectionValidatorTiedToLeaseTestCase.class);
+   
+   private static boolean firstTime = true;
+   
+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+   protected TestConnectionListener serverListener;
+
+   
+   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 testTiedToLeaseDefaultConfigurationLocalInvoker() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Register client side listener.
+      Object lock = new Object();
+      TestConnectionListener clientListener = new TestConnectionListener(lock);
+      client.addConnectionListener(clientListener);
+      log.info("connection listener added on client side");
+      
+      // Verify ConnectionValidator is running.
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify LeasePinger is running.
+      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
+      ClientInvoker clientInvoker = client.getInvoker();
+      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
+      field.setAccessible(true);
+      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
+      assertNotNull(pinger);
+      field = LeasePinger.class.getDeclaredField("timerTask");
+      field.setAccessible(true);
+      TimerTask timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      // Shut down lease on server side.
+      connector.removeConnectionListener(serverListener);
+      
+      // Wait for client side listener to be notified.
+      synchronized (lock)
+      {
+         lock.wait(30000);
+      }
+      
+      // Verify ConnectionValidator has stopped.
+      Thread.sleep(4000);
+      assertTrue(clientListener.notified);
+      assertEquals(-1, client.getPingPeriod());
+      
+      // Verfiy LeasePinger has stopped.
+      timerTask = (TimerTask) field.get(pinger);
+      assertNull(timerTask);
+      
+      client.removeConnectionListener(clientListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testTiedToLeaseDefaultConfigurationRemoteInvoker() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Register client side listener.
+      Object lock = new Object();
+      TestConnectionListener clientListener = new TestConnectionListener(lock);
+      Map metadata = new HashMap();
+      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
+      client.addConnectionListener(clientListener, metadata);
+      log.info("connection listener added on client side");
+      
+      // Verify ConnectionValidator is running.
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify LeasePinger is running.
+      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
+      ClientInvoker clientInvoker = client.getInvoker();
+      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
+      field.setAccessible(true);
+      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
+      assertNotNull(pinger);
+      field = LeasePinger.class.getDeclaredField("timerTask");
+      field.setAccessible(true);
+      TimerTask timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      // Shut down lease on server side.
+      connector.removeConnectionListener(serverListener);
+      
+      // Wait for client side listener to be notified.
+      synchronized (lock)
+      {
+         lock.wait(30000);
+      }
+      
+      // Verify ConnectionValidator has stopped.
+      Thread.sleep(4000);
+      assertTrue(clientListener.notified);
+      assertEquals(-1, client.getPingPeriod());
+      
+      // Verfiy LeasePinger has stopped.
+      timerTask = (TimerTask) field.get(pinger);
+      assertNull(timerTask);
+      
+      client.removeConnectionListener(clientListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testTiedToLeaseDontStopLease() throws Throwable
+   {
+     log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Register client side listener.
+      Object lock = new Object();
+      TestConnectionListener clientListener = new TestConnectionListener(lock);
+      Map metadata = new HashMap();
+      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
+      metadata.put(ConnectionValidator.TIE_TO_LEASE, "true");
+      metadata.put(ConnectionValidator.STOP_LEASE_ON_FAILURE, "false");
+      client.addConnectionListener(clientListener, metadata);
+      log.info("connection listener added on client side");
+      
+      // Verify ConnectionValidator is running.
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify LeasePinger is running.
+      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
+      ClientInvoker clientInvoker = client.getInvoker();
+      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
+      field.setAccessible(true);
+      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
+      assertNotNull(pinger);
+      field = LeasePinger.class.getDeclaredField("timerTask");
+      field.setAccessible(true);
+      TimerTask timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      // Shut down lease on server side.
+      connector.removeConnectionListener(serverListener);
+      
+      // Wait for client side listener to be notified.
+      synchronized (lock)
+      {
+         lock.wait(30000);
+      }
+      
+      // Verify ConnectionValidator has stopped.
+      Thread.sleep(4000);
+      assertTrue(clientListener.notified);
+      assertEquals(-1, client.getPingPeriod());
+      
+      // Verfiy LeasePinger has not stopped.
+      timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      client.removeConnectionListener(clientListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testNotTiedToLeaseDontStopLease() throws Throwable
+   {
+     log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Register client side listener.
+      Object lock = new Object();
+      TestConnectionListener clientListener = new TestConnectionListener(lock);
+      Map metadata = new HashMap();
+      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
+      metadata.put(ConnectionValidator.TIE_TO_LEASE, "false");
+      metadata.put(ConnectionValidator.STOP_LEASE_ON_FAILURE, "false");
+      client.addConnectionListener(clientListener, metadata);
+      log.info("connection listener added on client side");
+      
+      // Verify ConnectionValidator is running.
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify LeasePinger is running.
+      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
+      ClientInvoker clientInvoker = client.getInvoker();
+      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
+      field.setAccessible(true);
+      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
+      assertNotNull(pinger);
+      field = LeasePinger.class.getDeclaredField("timerTask");
+      field.setAccessible(true);
+      TimerTask timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      // Shut down lease on server side.
+      connector.removeConnectionListener(serverListener);
+      
+      // Wait for client side listener to be notified.
+      synchronized (lock)
+      {
+         lock.wait(30000);
+      }
+      
+      // Verify ConnectionValidator has not stopped.
+      Thread.sleep(4000);
+      assertFalse(clientListener.notified);
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Verfiy LeasePinger has not stopped.
+      timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      client.removeConnectionListener(clientListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testNotTiedToLeaseStopLease() throws Throwable
+   {
+     log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(true);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Register client side listener.
+      Object lock = new Object();
+      TestConnectionListener clientListener = new TestConnectionListener(lock);
+      Map metadata = new HashMap();
+      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
+      metadata.put(ConnectionValidator.TIE_TO_LEASE, "false");
+      metadata.put(ConnectionValidator.STOP_LEASE_ON_FAILURE, "true");
+      client.addConnectionListener(clientListener, metadata);
+      log.info("connection listener added on client side");
+      
+      // Verify ConnectionValidator is running.
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Verify LeasePinger is running.
+      assertTrue(client.getInvoker() instanceof MicroRemoteClientInvoker);
+      ClientInvoker clientInvoker = client.getInvoker();
+      Field field = MicroRemoteClientInvoker.class.getDeclaredField("leasePinger");
+      field.setAccessible(true);
+      LeasePinger pinger = (LeasePinger) field.get(clientInvoker);
+      assertNotNull(pinger);
+      field = LeasePinger.class.getDeclaredField("timerTask");
+      field.setAccessible(true);
+      TimerTask timerTask = (TimerTask) field.get(pinger);
+      assertNotNull(timerTask);
+      
+      // Prevent server from responding to ConnectionValidator pings.
+      ServerInvoker serverInvoker = connector.getServerInvoker();
+      field = ServerInvoker.class.getDeclaredField("started");
+      field.setAccessible(true);
+      field.set(serverInvoker, new Boolean(false));
+      assertFalse(field.getBoolean(serverInvoker));
+      log.info("Stopped server invoker");
+      
+      // Wait for client side listener to be notified.
+      synchronized (lock)
+      {
+         lock.wait(30000);
+      }
+      
+      // Verify ConnectionValidator has stopped.
+      Thread.sleep(4000);
+      assertTrue(clientListener.notified);
+      assertEquals(-1, client.getPingPeriod());
+      
+      // Verfiy LeasePinger has stopped.
+      field = LeasePinger.class.getDeclaredField("timerTask");
+      field.setAccessible(true);
+      timerTask = (TimerTask) field.get(pinger);
+      assertNull(timerTask);
+      
+      client.removeConnectionListener(clientListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   public void testTiedToLeaseServerLeasingTurnedOff() throws Throwable
+   {
+      log.info("entering " + getName());
+      
+      // Start server.
+      setupServer(false);
+      
+      // Create client.
+      InvokerLocator clientLocator = new InvokerLocator(locatorURI);
+      HashMap clientConfig = new HashMap();
+      clientConfig.put(InvokerLocator.FORCE_REMOTE, "true");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Register client side listener.
+      Object lock = new Object();
+      TestConnectionListener clientListener = new TestConnectionListener(lock);
+      Map metadata = new HashMap();
+      metadata.put(InvokerLocator.FORCE_REMOTE, "true");
+      client.addConnectionListener(clientListener, metadata);
+      log.info("connection listener added on client side");
+      
+      // Verify ConnectionValidator is running.
+      assertTrue(client.getPingPeriod() > -1);
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Wait for client side listener to be notified.
+      synchronized (lock)
+      {
+         lock.wait(30000);
+      }
+      
+      // Verify ConnectionValidator has not stopped.
+      Thread.sleep(4000);
+      assertFalse(clientListener.notified);
+      assertTrue(client.getPingPeriod() > -1);
+      
+      client.removeConnectionListener(clientListener);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   protected String getTransport()
+   {
+      return "socket";
+   }
+   
+   
+   protected void addExtraClientConfig(Map config) {}
+   protected void addExtraServerConfig(Map config) {}
+   
+
+   protected void setupServer(boolean startLeasing) throws Exception
+   {
+      host = InetAddress.getLocalHost().getHostAddress();
+      port = PortUtil.findFreePort(host);
+      locatorURI = getTransport() + "://" + host + ":" + port; 
+      locatorURI += "/?" + InvokerLocator.CLIENT_LEASE + "=true";
+      locatorURI += "&" + InvokerLocator.CLIENT_LEASE_PERIOD + "=4000";
+      serverLocator = new InvokerLocator(locatorURI);
+      log.info("Starting remoting server with locator uri of: " + locatorURI);
+      HashMap config = new HashMap();
+      config.put(InvokerLocator.FORCE_REMOTE, "true");
+      config.put(ServerInvoker.CLIENT_LEASE_PERIOD, "4000");
+      addExtraServerConfig(config);
+      connector = new Connector(serverLocator, config);
+      connector.create();
+      invocationHandler = new TestInvocationHandler();
+      connector.addInvocationHandler("test", invocationHandler);
+      if (startLeasing) 
+      {
+         serverListener = new TestConnectionListener();
+         connector.addConnectionListener(serverListener);
+      }
+      connector.start();
+   }
+   
+   
+   protected void shutdownServer() throws Exception
+   {
+      if (connector != null)
+      {
+         connector.removeConnectionListener(serverListener);
+         connector.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 TestConnectionListener implements ConnectionListener
+   {
+      public boolean notified;
+      private Object lock;
+      
+      TestConnectionListener()
+      {
+         this(new Object());
+      }
+      TestConnectionListener(Object lock)
+      {
+         this.lock = lock;
+      }
+      public void handleConnectionException(Throwable throwable, Client client)
+      {
+         notified = true;
+         synchronized (lock)
+         {
+            try
+            {
+               // Give listener a chance to wait on lock.
+               Thread.sleep(4000);
+            }
+            catch (InterruptedException e)
+            {
+               log.info("Unexpected interrupt in TestConnectionListener");
+            }
+            lock.notifyAll();
+         }
+      }
+   }
 }
\ No newline at end of file


Property changes on: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/connection/ConnectionValidatorTiedToLeaseTestCase.java
___________________________________________________________________
Name: svn:eol-style
   + native



More information about the jboss-remoting-commits mailing list