[jboss-remoting-commits] JBoss Remoting SVN: r5996 - remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket.

jboss-remoting-commits at lists.jboss.org jboss-remoting-commits at lists.jboss.org
Wed Aug 4 21:20:38 EDT 2010


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

Modified:
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerClientTest.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerServerTest.java
   remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/CallbackClientWithZeroTimeoutTestCase.java
Log:
JBREM-1241: Added svn:eol-style subversion property.

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java	2010-08-05 01:18:04 UTC (rev 5995)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketControlConnectionReplacementTestCase.java	2010-08-05 01:20:38 UTC (rev 5996)
@@ -1,505 +1,505 @@
-/*
- * 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.transport.bisocket;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketException;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.management.MBeanServer;
-import javax.net.ServerSocketFactory;
-
-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.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.Callback;
-import org.jboss.remoting.callback.DefaultCallbackErrorHandler;
-import org.jboss.remoting.callback.HandleCallbackException;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-import org.jboss.remoting.transport.bisocket.Bisocket;
-
-
-/**
- * Unit test for JBREM-1147.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version 
- * <p>
- * Copyright Aug 14, 2009
- * </p>
- */
-public class BisocketControlConnectionReplacementTestCase extends TestCase
-{
-   private static Logger log = Logger.getLogger(BisocketControlConnectionReplacementTestCase.class);
-   
-   protected static int INITIAL_WRITES;
-   protected static boolean firstTime = true;
-   protected static int secondaryServerSocketPort;
-   protected static int numberOfCallbacks = 10;
-   protected static Object lock = new Object();
-   protected static TestCallbackHandler testCallbackHandler;
-   
-   protected String host;
-   protected int port;
-   protected String locatorURI;
-   protected InvokerLocator serverLocator;
-   protected Connector connector;
-   protected TestInvocationHandler invocationHandler;
-
-   
-   public void setUp() throws Exception
-   {
-      if (firstTime)
-      {
-         firstTime = false;
-         Logger.getLogger("org.jboss.remoting").setLevel(XLevel.DEBUG);
-         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);
-         
-         String jdkVersion = System.getProperty("java.version");
-         log.info("jdk version: " + jdkVersion);
-         if (jdkVersion != null && jdkVersion.indexOf("1.4") >= 0)
-         {
-            INITIAL_WRITES = 5;
-         }
-         else
-         {
-            INITIAL_WRITES = 2;
-         }
-      }
-   }
-
-   
-   public void tearDown()
-   {
-   }
-   
-   
-   public void testCreateSocketWithReplacedControlConnection() 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");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Add callback handler.
-      testCallbackHandler = new TestCallbackHandler();
-      HashMap metadata = new HashMap();
-      metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
-      client.addListener(testCallbackHandler, metadata);
-      
-      synchronized (lock)
-      {
-         lock.wait(120000);
-      }
-      
-      assertEquals(numberOfCallbacks, testCallbackHandler.counter);
-      assertEquals(numberOfCallbacks - 1, testCallbackHandler.max);
-      
-      client.removeListener(testCallbackHandler);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   protected String getTransport()
-   {
-      return "bisocket";
-   }
-   
-   
-   protected String getServerSocketName()
-   {
-      return TestServerSocketFactory.class.getName();
-   }
-   
-   
-   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;
-      locatorURI += "/?" + Bisocket.PING_FREQUENCY + "=2000";
-      locatorURI += "&" + DefaultCallbackErrorHandler.CALLBACK_ERRORS_ALLOWED + "=100";
-      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");
-      secondaryServerSocketPort = PortUtil.findFreePort(host);
-      config.put(Bisocket.SECONDARY_BIND_PORT, Integer.toString(secondaryServerSocketPort));
-      config.put(ServerInvoker.SERVER_SOCKET_FACTORY, getServerSocketName());
-      config.put("numberOfCallRetries", "5");
-      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
-   {
-      int counter;
-      
-      public void addListener(final InvokerCallbackHandler callbackHandler)
-      {
-         if (counter++ > 0)
-            return;
-         
-         new Thread()
-         {
-            public void run()
-            {
-               for (int i = 0; i < 10 * numberOfCallbacks; i++)
-               {
-                  try
-                  {
-                     if (testCallbackHandler.counter >= numberOfCallbacks)
-                     {
-                        return;
-                     }
-                     try
-                     {
-                        Thread.sleep(1000);
-                     }
-                     catch (InterruptedException e)
-                     {
-                        log.error("Unexpected interrupt", e);
-                     }
-                     log.info("sending callback: " + i);
-                     callbackHandler.handleCallback(new Callback(Integer.toString(i)));
-                     log.info("sent callback: " + i);
-                  }
-                  catch (HandleCallbackException e)
-                  {
-                     log.error("Callback error", e);
-                  }
-               }  
-            }
-         }.start();
-      }
-      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 TestCallbackHandler implements InvokerCallbackHandler
-   {
-      int counter;
-      int max;
-      
-      public void handleCallback(Callback callback) throws HandleCallbackException
-      {
-         log.info("received callback: " + counter++);
-         max = Math.max(Integer.valueOf((String) callback.getParameter()).intValue(), max);
-         log.info("max: " + max);
-         if (counter >= numberOfCallbacks)
-         {
-            synchronized (lock)
-            {
-               lock.notifyAll();
-            }
-         }
-      }  
-   }
-   
-   static public class TestServerSocketFactory extends ServerSocketFactory
-   {
-      int timeout;
-      int initialWrites;
-      
-      public TestServerSocketFactory()
-      {
-         this.timeout = 5000;
-         this.initialWrites = INITIAL_WRITES;
-      }      
-      public TestServerSocketFactory(int timeout, int initialWrites)
-      {
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public ServerSocket createServerSocket() throws IOException
-      {
-         ServerSocket ss = ServerSocketFactory.getDefault().createServerSocket();
-         log.info("returning: " + ss);
-         return ss;
-      }
-      public ServerSocket createServerSocket(int port) throws IOException
-      {
-         ServerSocket ss = null;
-         if (port != secondaryServerSocketPort)
-         {
-            ss = ServerSocketFactory.getDefault().createServerSocket(port);
-         }
-         else
-         {
-            ss = new TestServerSocket(port, timeout, initialWrites);
-         }
-         log.info("returning: " + ss);
-         return ss;
-      }
-
-      public ServerSocket createServerSocket(int port, int backlog) throws IOException
-      {
-         ServerSocket ss = null;
-         if (port != secondaryServerSocketPort)
-         {
-            ss = ServerSocketFactory.getDefault().createServerSocket(port, backlog);
-         }
-         else
-         {
-            ss = new TestServerSocket(port, backlog, timeout, initialWrites);
-         }
-         log.info("returning: " + ss);
-         return ss;
-      }
-
-      public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException
-      {
-         ServerSocket ss = null;
-         if (port != secondaryServerSocketPort)
-         {
-            ss = ServerSocketFactory.getDefault().createServerSocket(port, backlog, ifAddress);
-         }
-         else
-         {
-            ss = new TestServerSocket(port, backlog, ifAddress, timeout, initialWrites);
-         }
-         log.info("returning: " + ss);
-         return ss;
-      }
-   }
-   
-   
-   static class TestServerSocket extends ServerSocket
-   {
-      int timeout;
-      int initialWrites;
-
-      public TestServerSocket(int timeout, int initialWrites) throws IOException
-      {
-         super();
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestServerSocket(int port, int timeout, int initialWrites) throws IOException
-      {
-         super(port);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestServerSocket(int port, int backlog, int timeout, int initialWrites) throws IOException
-      {
-         super(port, backlog);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestServerSocket(int port, int backlog, InetAddress bindAddr, int timeout, int initialWrites) throws IOException
-      {
-         super(port, backlog, bindAddr);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public Socket accept() throws IOException
-      {
-         Socket s = new TestSocket(timeout, initialWrites);
-         implAccept(s);
-         return s;
-      }
-      public String toString()
-      {
-         return "TestServerSocket[" + getLocalPort() + "]";
-      }
-   }
-   
-   
-   static class TestSocket extends Socket
-   {
-      int timeout;
-      int initialWrites;
-      
-      public TestSocket(int timeout, int initialWrites)
-      {
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestSocket(String host, int port, int timeout, int initialWrites) throws UnknownHostException, IOException
-      {
-         super(host, port);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestSocket(InetAddress address, int port, int timeout, int initialWrites) throws IOException
-      {
-         super(address, port);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestSocket(String host, int port, InetAddress localAddr, int localPort, int timeout, int initialWrites) throws IOException
-      {
-         super(host, port, localAddr, localPort);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public TestSocket(InetAddress address, int port, InetAddress localAddr, int localPort, int timeout, int initialWrites) throws IOException
-      {
-         super(address, port, localAddr, localPort);
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public OutputStream getOutputStream() throws IOException
-      {
-         return new TestOutputStream(super.getOutputStream(), timeout, initialWrites);
-      }
-      public String toString()
-      {
-         return "TestSocket[" + getLocalPort() + "->" + getPort() + "]";
-      }
-   }
- 
-   public static class TestOutputStream extends OutputStream
-   {
-      OutputStream os;
-      int timeout;
-      boolean closed;
-      int initialWrites;
-      boolean doCounterTest = true;
-      int counter;
-      
-      public TestOutputStream(OutputStream os, int timeout, int initialWrites)
-      {
-         this.os = os;
-         this.timeout = timeout;
-         this.initialWrites = initialWrites;
-      }
-      public void close()throws IOException
-      {
-         closed = true;
-         super.close();
-         log.info(this + " closed");
-      }
-      public void write(int b) throws IOException
-      {
-         if (closed)
-         {
-            log.info("TestOutputStream closed, cannot write");
-            throw new SocketException("closed");
-         }
-         if (doCounterTest && ++counter > initialWrites)
-         {
-            close();
-            throw new SocketException("closed");
-         }
-         os.write(b);
-      }
-      public void write(byte b[], int off, int len) throws IOException
-      {
-         for (int i = 0; i < len; i++)
-         {
-            System.out.print(b[i] + " ");
-         }
-         System.out.println("");
-         
-         if (closed)
-         {
-            log.info("TestOutputStream closed, cannot write");
-            throw new SocketException("closed");
-         }
-         log.info("TestOutputStream: counter = " + counter + ", initialWrites = " + initialWrites);
-         if (++counter > initialWrites)
-         {
-            close();
-            throw new SocketException("closed");
-         }
-         try
-         {
-            log.info(this + " writing");
-            doCounterTest = false;
-            os.write(b, off, len);
-            doCounterTest = true;
-            log.info(this + " back from writing");
-         }
-         catch (IOException e)
-         {
-            log.info("exception: ", e);
-            throw 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.transport.bisocket;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.net.ServerSocketFactory;
+
+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.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.DefaultCallbackErrorHandler;
+import org.jboss.remoting.callback.HandleCallbackException;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.bisocket.Bisocket;
+
+
+/**
+ * Unit test for JBREM-1147.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version 
+ * <p>
+ * Copyright Aug 14, 2009
+ * </p>
+ */
+public class BisocketControlConnectionReplacementTestCase extends TestCase
+{
+   private static Logger log = Logger.getLogger(BisocketControlConnectionReplacementTestCase.class);
+   
+   protected static int INITIAL_WRITES;
+   protected static boolean firstTime = true;
+   protected static int secondaryServerSocketPort;
+   protected static int numberOfCallbacks = 10;
+   protected static Object lock = new Object();
+   protected static TestCallbackHandler testCallbackHandler;
+   
+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+
+   
+   public void setUp() throws Exception
+   {
+      if (firstTime)
+      {
+         firstTime = false;
+         Logger.getLogger("org.jboss.remoting").setLevel(XLevel.DEBUG);
+         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);
+         
+         String jdkVersion = System.getProperty("java.version");
+         log.info("jdk version: " + jdkVersion);
+         if (jdkVersion != null && jdkVersion.indexOf("1.4") >= 0)
+         {
+            INITIAL_WRITES = 5;
+         }
+         else
+         {
+            INITIAL_WRITES = 2;
+         }
+      }
+   }
+
+   
+   public void tearDown()
+   {
+   }
+   
+   
+   public void testCreateSocketWithReplacedControlConnection() 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");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Add callback handler.
+      testCallbackHandler = new TestCallbackHandler();
+      HashMap metadata = new HashMap();
+      metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
+      client.addListener(testCallbackHandler, metadata);
+      
+      synchronized (lock)
+      {
+         lock.wait(120000);
+      }
+      
+      assertEquals(numberOfCallbacks, testCallbackHandler.counter);
+      assertEquals(numberOfCallbacks - 1, testCallbackHandler.max);
+      
+      client.removeListener(testCallbackHandler);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   protected String getTransport()
+   {
+      return "bisocket";
+   }
+   
+   
+   protected String getServerSocketName()
+   {
+      return TestServerSocketFactory.class.getName();
+   }
+   
+   
+   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;
+      locatorURI += "/?" + Bisocket.PING_FREQUENCY + "=2000";
+      locatorURI += "&" + DefaultCallbackErrorHandler.CALLBACK_ERRORS_ALLOWED + "=100";
+      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");
+      secondaryServerSocketPort = PortUtil.findFreePort(host);
+      config.put(Bisocket.SECONDARY_BIND_PORT, Integer.toString(secondaryServerSocketPort));
+      config.put(ServerInvoker.SERVER_SOCKET_FACTORY, getServerSocketName());
+      config.put("numberOfCallRetries", "5");
+      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
+   {
+      int counter;
+      
+      public void addListener(final InvokerCallbackHandler callbackHandler)
+      {
+         if (counter++ > 0)
+            return;
+         
+         new Thread()
+         {
+            public void run()
+            {
+               for (int i = 0; i < 10 * numberOfCallbacks; i++)
+               {
+                  try
+                  {
+                     if (testCallbackHandler.counter >= numberOfCallbacks)
+                     {
+                        return;
+                     }
+                     try
+                     {
+                        Thread.sleep(1000);
+                     }
+                     catch (InterruptedException e)
+                     {
+                        log.error("Unexpected interrupt", e);
+                     }
+                     log.info("sending callback: " + i);
+                     callbackHandler.handleCallback(new Callback(Integer.toString(i)));
+                     log.info("sent callback: " + i);
+                  }
+                  catch (HandleCallbackException e)
+                  {
+                     log.error("Callback error", e);
+                  }
+               }  
+            }
+         }.start();
+      }
+      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 TestCallbackHandler implements InvokerCallbackHandler
+   {
+      int counter;
+      int max;
+      
+      public void handleCallback(Callback callback) throws HandleCallbackException
+      {
+         log.info("received callback: " + counter++);
+         max = Math.max(Integer.valueOf((String) callback.getParameter()).intValue(), max);
+         log.info("max: " + max);
+         if (counter >= numberOfCallbacks)
+         {
+            synchronized (lock)
+            {
+               lock.notifyAll();
+            }
+         }
+      }  
+   }
+   
+   static public class TestServerSocketFactory extends ServerSocketFactory
+   {
+      int timeout;
+      int initialWrites;
+      
+      public TestServerSocketFactory()
+      {
+         this.timeout = 5000;
+         this.initialWrites = INITIAL_WRITES;
+      }      
+      public TestServerSocketFactory(int timeout, int initialWrites)
+      {
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public ServerSocket createServerSocket() throws IOException
+      {
+         ServerSocket ss = ServerSocketFactory.getDefault().createServerSocket();
+         log.info("returning: " + ss);
+         return ss;
+      }
+      public ServerSocket createServerSocket(int port) throws IOException
+      {
+         ServerSocket ss = null;
+         if (port != secondaryServerSocketPort)
+         {
+            ss = ServerSocketFactory.getDefault().createServerSocket(port);
+         }
+         else
+         {
+            ss = new TestServerSocket(port, timeout, initialWrites);
+         }
+         log.info("returning: " + ss);
+         return ss;
+      }
+
+      public ServerSocket createServerSocket(int port, int backlog) throws IOException
+      {
+         ServerSocket ss = null;
+         if (port != secondaryServerSocketPort)
+         {
+            ss = ServerSocketFactory.getDefault().createServerSocket(port, backlog);
+         }
+         else
+         {
+            ss = new TestServerSocket(port, backlog, timeout, initialWrites);
+         }
+         log.info("returning: " + ss);
+         return ss;
+      }
+
+      public ServerSocket createServerSocket(int port, int backlog, InetAddress ifAddress) throws IOException
+      {
+         ServerSocket ss = null;
+         if (port != secondaryServerSocketPort)
+         {
+            ss = ServerSocketFactory.getDefault().createServerSocket(port, backlog, ifAddress);
+         }
+         else
+         {
+            ss = new TestServerSocket(port, backlog, ifAddress, timeout, initialWrites);
+         }
+         log.info("returning: " + ss);
+         return ss;
+      }
+   }
+   
+   
+   static class TestServerSocket extends ServerSocket
+   {
+      int timeout;
+      int initialWrites;
+
+      public TestServerSocket(int timeout, int initialWrites) throws IOException
+      {
+         super();
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestServerSocket(int port, int timeout, int initialWrites) throws IOException
+      {
+         super(port);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestServerSocket(int port, int backlog, int timeout, int initialWrites) throws IOException
+      {
+         super(port, backlog);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestServerSocket(int port, int backlog, InetAddress bindAddr, int timeout, int initialWrites) throws IOException
+      {
+         super(port, backlog, bindAddr);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public Socket accept() throws IOException
+      {
+         Socket s = new TestSocket(timeout, initialWrites);
+         implAccept(s);
+         return s;
+      }
+      public String toString()
+      {
+         return "TestServerSocket[" + getLocalPort() + "]";
+      }
+   }
+   
+   
+   static class TestSocket extends Socket
+   {
+      int timeout;
+      int initialWrites;
+      
+      public TestSocket(int timeout, int initialWrites)
+      {
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestSocket(String host, int port, int timeout, int initialWrites) throws UnknownHostException, IOException
+      {
+         super(host, port);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestSocket(InetAddress address, int port, int timeout, int initialWrites) throws IOException
+      {
+         super(address, port);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestSocket(String host, int port, InetAddress localAddr, int localPort, int timeout, int initialWrites) throws IOException
+      {
+         super(host, port, localAddr, localPort);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public TestSocket(InetAddress address, int port, InetAddress localAddr, int localPort, int timeout, int initialWrites) throws IOException
+      {
+         super(address, port, localAddr, localPort);
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public OutputStream getOutputStream() throws IOException
+      {
+         return new TestOutputStream(super.getOutputStream(), timeout, initialWrites);
+      }
+      public String toString()
+      {
+         return "TestSocket[" + getLocalPort() + "->" + getPort() + "]";
+      }
+   }
+ 
+   public static class TestOutputStream extends OutputStream
+   {
+      OutputStream os;
+      int timeout;
+      boolean closed;
+      int initialWrites;
+      boolean doCounterTest = true;
+      int counter;
+      
+      public TestOutputStream(OutputStream os, int timeout, int initialWrites)
+      {
+         this.os = os;
+         this.timeout = timeout;
+         this.initialWrites = initialWrites;
+      }
+      public void close()throws IOException
+      {
+         closed = true;
+         super.close();
+         log.info(this + " closed");
+      }
+      public void write(int b) throws IOException
+      {
+         if (closed)
+         {
+            log.info("TestOutputStream closed, cannot write");
+            throw new SocketException("closed");
+         }
+         if (doCounterTest && ++counter > initialWrites)
+         {
+            close();
+            throw new SocketException("closed");
+         }
+         os.write(b);
+      }
+      public void write(byte b[], int off, int len) throws IOException
+      {
+         for (int i = 0; i < len; i++)
+         {
+            System.out.print(b[i] + " ");
+         }
+         System.out.println("");
+         
+         if (closed)
+         {
+            log.info("TestOutputStream closed, cannot write");
+            throw new SocketException("closed");
+         }
+         log.info("TestOutputStream: counter = " + counter + ", initialWrites = " + initialWrites);
+         if (++counter > initialWrites)
+         {
+            close();
+            throw new SocketException("closed");
+         }
+         try
+         {
+            log.info(this + " writing");
+            doCounterTest = false;
+            os.write(b, off, len);
+            doCounterTest = true;
+            log.info(this + " back from writing");
+         }
+         catch (IOException e)
+         {
+            log.info("exception: ", e);
+            throw e;
+         }
+      }
+   }
 }
\ No newline at end of file


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

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerClientTest.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerClientTest.java	2010-08-05 01:18:04 UTC (rev 5995)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerClientTest.java	2010-08-05 01:20:38 UTC (rev 5996)
@@ -1,56 +1,56 @@
-/*
-* 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.transport.bisocket;
-
-import org.jboss.test.remoting.transport.InvokerClientTest;
-
-/**
- * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
- */
-public class BisocketInvokerClientTest extends InvokerClientTest
-{
-   public String getTransport()
-   {
-      return "bisocket";
-   }
-
-   public static void main(String[] args)
-   {
-      BisocketInvokerClientTest client = new BisocketInvokerClientTest();
-      try
-      {
-         client.setUp();
-         client.testArrayReturn();
-         client.testLocalPushCallback();
-         client.testPullCallback();
-         client.testPullCallback();
-         client.testRemotePushCallback();
-         client.testThrownException();
-         client.tearDown();
-      }
-      catch (Throwable throwable)
-      {
-         throwable.printStackTrace();
-      }
-   }
+/*
+* 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.transport.bisocket;
+
+import org.jboss.test.remoting.transport.InvokerClientTest;
+
+/**
+ * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+ */
+public class BisocketInvokerClientTest extends InvokerClientTest
+{
+   public String getTransport()
+   {
+      return "bisocket";
+   }
+
+   public static void main(String[] args)
+   {
+      BisocketInvokerClientTest client = new BisocketInvokerClientTest();
+      try
+      {
+         client.setUp();
+         client.testArrayReturn();
+         client.testLocalPushCallback();
+         client.testPullCallback();
+         client.testPullCallback();
+         client.testRemotePushCallback();
+         client.testThrownException();
+         client.tearDown();
+      }
+      catch (Throwable throwable)
+      {
+         throwable.printStackTrace();
+      }
+   }
 }
\ No newline at end of file


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

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerServerTest.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerServerTest.java	2010-08-05 01:18:04 UTC (rev 5995)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/BisocketInvokerServerTest.java	2010-08-05 01:20:38 UTC (rev 5996)
@@ -1,63 +1,63 @@
-/*
-* 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.transport.bisocket;
-
-import org.apache.log4j.Level;
-import org.jboss.test.remoting.transport.InvokerServerTest;
-
-/**
- * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
- */
-public class BisocketInvokerServerTest extends InvokerServerTest
-{
-   public String getTransport()
-   {
-      return "bisocket";
-   }
-
-   public static void main(String[] args)
-   {
-      org.apache.log4j.BasicConfigurator.configure();
-      org.apache.log4j.Category.getRoot().setLevel(Level.INFO);
-      org.apache.log4j.Category.getInstance("org.jboss.remoting.transport.socket").setLevel(Level.DEBUG);
-      org.apache.log4j.Category.getInstance("org.jboss.test.remoting").setLevel(Level.DEBUG);
-//      org.apache.log4j.Category.getInstance("org.jboss.remoting.marshall.dynamic.local").setLevel(Level.DEBUG);
-//      org.apache.log4j.Category.getInstance("org.jboss.dtf").setLevel(Level.DEBUG);
-      org.apache.log4j.Category.getInstance("org.jgroups").setLevel(Level.FATAL);
-
-      InvokerServerTest server = new BisocketInvokerServerTest();
-      try
-      {
-         server.setUp();
-         Thread.sleep(300000);
-         server.tearDown();
-         System.out.println("Have torn down test.");
-         Thread.sleep(30000);
-      }
-      catch(Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-
+/*
+* 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.transport.bisocket;
+
+import org.apache.log4j.Level;
+import org.jboss.test.remoting.transport.InvokerServerTest;
+
+/**
+ * @author <a href="mailto:tom.elrod at jboss.com">Tom Elrod</a>
+ */
+public class BisocketInvokerServerTest extends InvokerServerTest
+{
+   public String getTransport()
+   {
+      return "bisocket";
+   }
+
+   public static void main(String[] args)
+   {
+      org.apache.log4j.BasicConfigurator.configure();
+      org.apache.log4j.Category.getRoot().setLevel(Level.INFO);
+      org.apache.log4j.Category.getInstance("org.jboss.remoting.transport.socket").setLevel(Level.DEBUG);
+      org.apache.log4j.Category.getInstance("org.jboss.test.remoting").setLevel(Level.DEBUG);
+//      org.apache.log4j.Category.getInstance("org.jboss.remoting.marshall.dynamic.local").setLevel(Level.DEBUG);
+//      org.apache.log4j.Category.getInstance("org.jboss.dtf").setLevel(Level.DEBUG);
+      org.apache.log4j.Category.getInstance("org.jgroups").setLevel(Level.FATAL);
+
+      InvokerServerTest server = new BisocketInvokerServerTest();
+      try
+      {
+         server.setUp();
+         Thread.sleep(300000);
+         server.tearDown();
+         System.out.println("Have torn down test.");
+         Thread.sleep(30000);
+      }
+      catch(Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+
 }
\ No newline at end of file


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

Modified: remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/CallbackClientWithZeroTimeoutTestCase.java
===================================================================
--- remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/CallbackClientWithZeroTimeoutTestCase.java	2010-08-05 01:18:04 UTC (rev 5995)
+++ remoting2/branches/2.2/src/tests/org/jboss/test/remoting/transport/bisocket/CallbackClientWithZeroTimeoutTestCase.java	2010-08-05 01:20:38 UTC (rev 5996)
@@ -1,276 +1,276 @@
-/*
-* 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.transport.bisocket;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-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.InvocationRequest;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.ServerInvoker;
-import org.jboss.remoting.callback.Callback;
-import org.jboss.remoting.callback.HandleCallbackException;
-import org.jboss.remoting.callback.InvokerCallbackHandler;
-import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.PortUtil;
-import org.jboss.remoting.transport.bisocket.Bisocket;
-import org.jboss.remoting.transport.bisocket.BisocketServerInvoker;
-import org.jboss.remoting.transport.socket.SocketClientInvoker;
-
-
-/**
- * Unit test for JBREM-845.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Dec 11, 2007
- * </p>
- */
-public class CallbackClientWithZeroTimeoutTestCase extends TestCase
-{
-   private static Logger log = Logger.getLogger(CallbackClientWithZeroTimeoutTestCase.class);
-   
-   private static boolean firstTime = true;
-   private static String CALLBACK = "callback";
-   protected String host;
-   protected int port;
-   protected String locatorURI;
-   protected InvokerLocator serverLocator;
-   protected Connector connector;
-   protected TestInvocationHandler invocationHandler;
-
-   
-   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 testCallbackSocketFailure() 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");
-      addExtraClientConfig(clientConfig);
-      Client client = new Client(clientLocator, clientConfig);
-      client.connect();
-      log.info("client is connected");
-      
-      // Test connections.
-      assertEquals("abc", client.invoke("abc"));
-      log.info("connection is good");
-      
-      // Add callback handler.
-      TestCallbackHandler callbackHandler = new TestCallbackHandler();
-      Map metadata = new HashMap();
-      metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
-      client.addListener(callbackHandler, metadata);
-      log.info("callback handler is installed");
-      
-      // Make sure callback client invoker has timeout == 0.
-      Client callbackClient = invocationHandler.callbackHandler.getCallbackClient();
-      SocketClientInvoker callbackClientInvoker = (SocketClientInvoker) callbackClient.getInvoker();
-      assertEquals(0, callbackClientInvoker.getTimeout());
-      log.info("timeout == 0");
-      
-      // Verify failing PingTimerTask kicks thread out of BisocketClientInvoker.createSocket().
-      // 1. Get client side control socket.
-      Set callbackConnectors = client.getCallbackConnectors(callbackHandler);
-      assertEquals(1, callbackConnectors.size());
-      Connector callbackConnector = (Connector) callbackConnectors.iterator().next();
-      BisocketServerInvoker callbackServerInvoker = (BisocketServerInvoker) callbackConnector.getServerInvoker();
-      Field field = BisocketServerInvoker.class.getDeclaredField("controlConnectionThreadMap");
-      field.setAccessible(true);
-      Map controlConnectionThreadMap = (Map) field.get(callbackServerInvoker);
-      assertEquals(1, controlConnectionThreadMap.size());
-      Thread controlConnectionThread = (Thread) controlConnectionThreadMap.values().iterator().next();
-      assertNotNull(controlConnectionThread);
-  
-      Class controlConnectionThreadClass = null;
-      Class[] classes = BisocketServerInvoker.class.getDeclaredClasses();
-      for (int i = 0; i < classes.length; i++)
-      {
-         log.info(classes[i]);
-         if (classes[i].getName().indexOf("ControlConnectionThread") >= 0)
-         {
-            controlConnectionThreadClass = classes[i];
-            break;
-         }
-      }
-      assertNotNull(controlConnectionThreadClass);
-      field = controlConnectionThreadClass.getDeclaredField("controlSocket");
-      field.setAccessible(true);
-      Socket controlSocket = (Socket) field.get(controlConnectionThread);
-      assertNotNull(controlSocket);
-      
-      // 2. Get server side ControlConnectionThread and stop it.
-      field = BisocketServerInvoker.class.getDeclaredField("secondaryServerSocketThread");
-      field.setAccessible(true);
-      Thread secondaryServerSocketThread = (Thread) field.get(connector.getServerInvoker());
-      assertNotNull(secondaryServerSocketThread);
-      secondaryServerSocketThread.stop();
-      
-      // 3. Try to do callback.
-      client.invokeOneway(CALLBACK);
-      
-      // 4. Close client side control socket so PING fails.
-      controlSocket.close();
-      
-      // 5. Test that attempt to create a socket for callback threw exception.
-      Thread.sleep(5000);
-      assertTrue(invocationHandler.ok);
-      log.info("got expected Exception doing callback");
-
-      client.removeListener(callbackHandler);
-      client.disconnect();
-      shutdownServer();
-      log.info(getName() + " PASSES");
-   }
-   
-   
-   protected String getTransport()
-   {
-      return "bisocket";
-   }
-   
-   
-   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 + "/?timeout=0";
-      locatorURI += "&" + Bisocket.PING_FREQUENCY + "=1000";
-      locatorURI += "&" + Bisocket.MAX_RETRIES + "=1";
-      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("numberOfCallRetries", "1");
-      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 boolean ok;
-      public ServerInvokerCallbackHandler callbackHandler;
-      
-      public void addListener(InvokerCallbackHandler callbackHandler)
-      {
-         this.callbackHandler = (ServerInvokerCallbackHandler) callbackHandler;
-      }
-      public Object invoke(final InvocationRequest invocation) throws Throwable
-      {
-         if (CALLBACK.equals(invocation.getParameter()))
-         {
-            try
-            {
-               log.info("calling handleCallback()");
-               callbackHandler.handleCallback(new Callback(CALLBACK));
-               log.info("called handleCallback()");
-            }
-            catch (HandleCallbackException e)
-            {
-               log.info("error", e);
-               Throwable cause = e.getCause();
-               log.info("cause: " + cause);
-               cause = cause.getCause();
-               log.info("cause: " + cause);
-               if (cause instanceof IOException && "Unable to create socket".equals(cause.getMessage()))
-               {
-                  ok = true;
-               }
-            }
-         }
-         return invocation.getParameter();
-      }
-      public void removeListener(InvokerCallbackHandler callbackHandler) {}
-      public void setMBeanServer(MBeanServer server) {}
-      public void setInvoker(ServerInvoker invoker) {}
-   }
-   
-   
-   static class TestCallbackHandler implements InvokerCallbackHandler
-   {
-      public boolean ok;
-      
-      public void handleCallback(Callback callback) throws HandleCallbackException
-      {
-         ok = true;
-         log.info("received callback");
-      }  
-   }
+/*
+* 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.transport.bisocket;
+
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+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.InvocationRequest;
+import org.jboss.remoting.InvokerLocator;
+import org.jboss.remoting.ServerInvocationHandler;
+import org.jboss.remoting.ServerInvoker;
+import org.jboss.remoting.callback.Callback;
+import org.jboss.remoting.callback.HandleCallbackException;
+import org.jboss.remoting.callback.InvokerCallbackHandler;
+import org.jboss.remoting.callback.ServerInvokerCallbackHandler;
+import org.jboss.remoting.transport.Connector;
+import org.jboss.remoting.transport.PortUtil;
+import org.jboss.remoting.transport.bisocket.Bisocket;
+import org.jboss.remoting.transport.bisocket.BisocketServerInvoker;
+import org.jboss.remoting.transport.socket.SocketClientInvoker;
+
+
+/**
+ * Unit test for JBREM-845.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Dec 11, 2007
+ * </p>
+ */
+public class CallbackClientWithZeroTimeoutTestCase extends TestCase
+{
+   private static Logger log = Logger.getLogger(CallbackClientWithZeroTimeoutTestCase.class);
+   
+   private static boolean firstTime = true;
+   private static String CALLBACK = "callback";
+   protected String host;
+   protected int port;
+   protected String locatorURI;
+   protected InvokerLocator serverLocator;
+   protected Connector connector;
+   protected TestInvocationHandler invocationHandler;
+
+   
+   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 testCallbackSocketFailure() 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");
+      addExtraClientConfig(clientConfig);
+      Client client = new Client(clientLocator, clientConfig);
+      client.connect();
+      log.info("client is connected");
+      
+      // Test connections.
+      assertEquals("abc", client.invoke("abc"));
+      log.info("connection is good");
+      
+      // Add callback handler.
+      TestCallbackHandler callbackHandler = new TestCallbackHandler();
+      Map metadata = new HashMap();
+      metadata.put(Bisocket.IS_CALLBACK_SERVER, "true");
+      client.addListener(callbackHandler, metadata);
+      log.info("callback handler is installed");
+      
+      // Make sure callback client invoker has timeout == 0.
+      Client callbackClient = invocationHandler.callbackHandler.getCallbackClient();
+      SocketClientInvoker callbackClientInvoker = (SocketClientInvoker) callbackClient.getInvoker();
+      assertEquals(0, callbackClientInvoker.getTimeout());
+      log.info("timeout == 0");
+      
+      // Verify failing PingTimerTask kicks thread out of BisocketClientInvoker.createSocket().
+      // 1. Get client side control socket.
+      Set callbackConnectors = client.getCallbackConnectors(callbackHandler);
+      assertEquals(1, callbackConnectors.size());
+      Connector callbackConnector = (Connector) callbackConnectors.iterator().next();
+      BisocketServerInvoker callbackServerInvoker = (BisocketServerInvoker) callbackConnector.getServerInvoker();
+      Field field = BisocketServerInvoker.class.getDeclaredField("controlConnectionThreadMap");
+      field.setAccessible(true);
+      Map controlConnectionThreadMap = (Map) field.get(callbackServerInvoker);
+      assertEquals(1, controlConnectionThreadMap.size());
+      Thread controlConnectionThread = (Thread) controlConnectionThreadMap.values().iterator().next();
+      assertNotNull(controlConnectionThread);
+  
+      Class controlConnectionThreadClass = null;
+      Class[] classes = BisocketServerInvoker.class.getDeclaredClasses();
+      for (int i = 0; i < classes.length; i++)
+      {
+         log.info(classes[i]);
+         if (classes[i].getName().indexOf("ControlConnectionThread") >= 0)
+         {
+            controlConnectionThreadClass = classes[i];
+            break;
+         }
+      }
+      assertNotNull(controlConnectionThreadClass);
+      field = controlConnectionThreadClass.getDeclaredField("controlSocket");
+      field.setAccessible(true);
+      Socket controlSocket = (Socket) field.get(controlConnectionThread);
+      assertNotNull(controlSocket);
+      
+      // 2. Get server side ControlConnectionThread and stop it.
+      field = BisocketServerInvoker.class.getDeclaredField("secondaryServerSocketThread");
+      field.setAccessible(true);
+      Thread secondaryServerSocketThread = (Thread) field.get(connector.getServerInvoker());
+      assertNotNull(secondaryServerSocketThread);
+      secondaryServerSocketThread.stop();
+      
+      // 3. Try to do callback.
+      client.invokeOneway(CALLBACK);
+      
+      // 4. Close client side control socket so PING fails.
+      controlSocket.close();
+      
+      // 5. Test that attempt to create a socket for callback threw exception.
+      Thread.sleep(5000);
+      assertTrue(invocationHandler.ok);
+      log.info("got expected Exception doing callback");
+
+      client.removeListener(callbackHandler);
+      client.disconnect();
+      shutdownServer();
+      log.info(getName() + " PASSES");
+   }
+   
+   
+   protected String getTransport()
+   {
+      return "bisocket";
+   }
+   
+   
+   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 + "/?timeout=0";
+      locatorURI += "&" + Bisocket.PING_FREQUENCY + "=1000";
+      locatorURI += "&" + Bisocket.MAX_RETRIES + "=1";
+      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("numberOfCallRetries", "1");
+      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 boolean ok;
+      public ServerInvokerCallbackHandler callbackHandler;
+      
+      public void addListener(InvokerCallbackHandler callbackHandler)
+      {
+         this.callbackHandler = (ServerInvokerCallbackHandler) callbackHandler;
+      }
+      public Object invoke(final InvocationRequest invocation) throws Throwable
+      {
+         if (CALLBACK.equals(invocation.getParameter()))
+         {
+            try
+            {
+               log.info("calling handleCallback()");
+               callbackHandler.handleCallback(new Callback(CALLBACK));
+               log.info("called handleCallback()");
+            }
+            catch (HandleCallbackException e)
+            {
+               log.info("error", e);
+               Throwable cause = e.getCause();
+               log.info("cause: " + cause);
+               cause = cause.getCause();
+               log.info("cause: " + cause);
+               if (cause instanceof IOException && "Unable to create socket".equals(cause.getMessage()))
+               {
+                  ok = true;
+               }
+            }
+         }
+         return invocation.getParameter();
+      }
+      public void removeListener(InvokerCallbackHandler callbackHandler) {}
+      public void setMBeanServer(MBeanServer server) {}
+      public void setInvoker(ServerInvoker invoker) {}
+   }
+   
+   
+   static class TestCallbackHandler implements InvokerCallbackHandler
+   {
+      public boolean ok;
+      
+      public void handleCallback(Callback callback) throws HandleCallbackException
+      {
+         ok = true;
+         log.info("received callback");
+      }  
+   }
 }
\ No newline at end of file


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



More information about the jboss-remoting-commits mailing list