[jboss-remoting-commits] JBoss Remoting SVN: r3668 - remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi.

[jboss-remoting-commits at lists.jboss.org]

Author: ron.sigal at jboss.com
Date: 2008-03-20 01:42:13 -0400 (Thu, 20 Mar 2008)
New Revision: 3668

Added:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerClientTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerServerTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerTestCase.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerClientTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerServerTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerTestCase.java
Removed:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerClientTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingClientTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingServerTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingTestCase.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerServerTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerTestCase.java
Modified:
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerClientTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerServerTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerClientTest.java
   remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerServerTest.java
Log:
JBREM-167, JBREM-923: Decomposed RMIInvokerTestCase into four variations.

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerClientTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerClientTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerClientTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -1,460 +0,0 @@
-/*
-* 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.rmi;
-
-import junit.framework.TestCase;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.invocation.NameBasedInvocation;
-import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.rmi.RMIServerInvoker;
-import org.jboss.test.remoting.ComplexReturn;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
-import org.jboss.test.remoting.transport.mock.MockInvokerCallbackHandler;
-import org.jboss.test.remoting.transport.mock.MockTest;
-import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.ByteArrayInputStream;
-import java.rmi.MarshalledObject;
-import java.rmi.server.UID;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * This is the actual concrete test for the invoker client.
- *
- * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
- */
-public class RMIInvokerClientTest extends TestCase
-{
-
-   private String sessionId = new UID().toString();
-   private Client client;
-   private Connector connector;
-   private InvokerLocator locator;
-   private int port = RMIServerInvoker.DEFAULT_REGISTRY_PORT - 1;
-   protected String transport = "rmi";
-
-   private static final Logger log = Logger.getLogger(RMIInvokerClientTest.class);
-
-   public void init(Map metadata)
-   {
-      try
-      {
-         InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, this.port));
-         //InvokerLocator locator = new InvokerLocator(getTransport() + "://localhost:" + port);
-         System.out.println("client locator: " + locator);
-         client = new Client(locator, "mock");
-         client.connect();
-      }
-      catch(Exception e)
-      {
-         log.error(e.getMessage(), e);
-      }
-   }
-
-   private String buildLocatorURI(Map metadata, int port)
-   {
-      if(metadata == null || metadata.size() == 0)
-      {
-         return transport + "://localhost:" + port;
-      }
-      else
-      {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port + "/?");
-
-         Set keys = metadata.keySet();
-         if(keys.size() > 0)
-         {
-            uriBuffer.append("/?");
-         }
-
-         Iterator itr = keys.iterator();
-         while(itr.hasNext())
-         {
-            String key = (String) itr.next();
-            String value = (String) metadata.get(key);
-            uriBuffer.append(key + "=" + value + "&");
-         }
-         return uriBuffer.substring(0, uriBuffer.length() - 1);
-      }
-   }
-
-   private InvokerLocator initServer(Map metadata, int serverPort) throws Exception
-   {
-      if(serverPort < 0)
-      {
-         serverPort = TestUtil.getRandomPort();
-      }
-      log.debug("port = " + serverPort);
-
-//      InvokerRegistry.registerInvoker("mock", MockClientInvoker.class, MockServerInvoker.class);
-      connector = new Connector();
-
-      InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, serverPort));
-      System.out.println("Server locator: " + locator);
-
-      //InvokerLocator locator = new InvokerLocator(transport + "://localhost:" + port);
-      StringBuffer buf = new StringBuffer();
-      buf.append("<?xml version=\"1.0\"?>\n");
-      buf.append("<handlers>\n");
-      buf.append("  <handler subsystem=\"mock\">org.jboss.test.remoting.transport.mock.MockServerInvocationHandler</handler>\n");
-      buf.append("</handlers>\n");
-      Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(buf.toString().getBytes()));
-      connector.setInvokerLocator(locator.getLocatorURI());
-      connector.setConfiguration(xml.getDocumentElement());
-      //connector.create();
-      connector.start();
-      return locator;
-   }
-
-
-   public void setUp(boolean withNativeMarshaller) throws Exception
-   {
-      Map metadata = new HashMap();
-      String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
-      if(newMetadata != null && newMetadata.length() > 0)
-      {
-         metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
-      }
-
-      metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
-      locator = initServer(metadata, -1);
-      if(!withNativeMarshaller)
-      {
-         metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      }
-      init(metadata);
-      log.info("Using metadata: " + metadata);
-   }
-
-   public void tearDown() throws Exception
-   {
-      if(connector != null)
-      {
-         connector.stop();
-         connector.destroy();
-         connector = null;
-      }
-      locator = null;
-      if(client != null)
-      {
-         client.disconnect();
-         client = null;
-      }
-   }
-
-   /**
-    * Test simple invocation and adding of listener with push callback (meaning server
-    * will send callback message when it gets it) to a local callback server
-    *
-    * @throws Throwable
-    */
-   public void testLocalPushCallback() throws Throwable
-   {
-      setUp(true);
-      runLocalPushCallback();
-   }
-
-   public void testLocalPushCallbackWithDatatype() throws Throwable
-   {
-      setUp(false);
-      runLocalPushCallback();
-   }
-
-   public void runLocalPushCallback() throws Throwable
-   {
-      log.debug("running testLocalPushCallback()");
-
-      sessionId = new UID().toString();
-
-      sessionId = client.getSessionId();
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      log.debug("client.getInvoker().getLocator()" + client.getInvoker().getLocator());
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("foo", "bar");
-      assertTrue("Result of testLocalPushCallback() invocation of foo.", "bar".equals(ret));
-      client.addListener(handler, locator);
-      // invoke which should cause callback
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(3000);
-      log.debug("done sleeping.");
-      int callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbacksPerformed after adding listener is " + callbacksPerformed);
-      assertTrue("Result of testLocalPushCallback() failed since did not get callback.",
-                 (callbacksPerformed == 1));
-      // Can now call direct on client
-      client.removeListener(handler);
-      // shouldn't get callback now since removed listener
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      log.debug("done sleeping.");
-      callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbackPerformed after removing listener is " + callbacksPerformed);
-      assertTrue("Result of testLocalPushCallback() failed since did get callback " +
-                 "but have been removed as listener.",
-                 (callbacksPerformed == 1));
-   }
-
-   /**
-    * Test simple invocation and adding of listener with push callback (meaning server
-    * will send callback message when it gets it) to a remote callback server
-    *
-    * @throws Throwable
-    */
-   public void testRemotePushCallback() throws Throwable
-   {
-      setUp(true);
-      runRemotePushCallback();
-   }
-
-   public void testRemotePushCallbackWithDataType() throws Throwable
-   {
-      setUp(false);
-      runRemotePushCallback();
-   }
-
-   public void runRemotePushCallback() throws Throwable
-   {
-      log.debug("running testRemotePushCallback()");
-
-      sessionId = new UID().toString();
-      //InvokerLocator locator = client.getInvoker().getLocator();
-      sessionId = client.getSessionId();
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      log.debug("client.getInvoker().getLocator()" + client.getInvoker().getLocator());
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("foo", "bar");
-      assertTrue("Result of testRemotePushCallback() invocation of foo.", "bar".equals(ret));
-      client.addListener(handler, locator);
-      // invoke which should cause callback
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(3000);
-      log.debug("done sleeping.");
-      // TODO: No way to currently check the remote callback handler
-      // to see if it got callback -TME
-      /*
-      int callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbacksPerformed after adding listener is " + callbacksPerformed);
-      assertTrue("Result of testRemotePushCallback() failed since did not get callback.",
-                 (callbacksPerformed == 1));
-      */
-      // Can now call direct on client
-      client.removeListener(handler);
-      // shouldn't get callback now since removed listener
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      log.debug("done sleeping.");
-      /*
-      callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbackPerformed after removing listener is " + callbacksPerformed);
-      assertTrue("Result of testRemotePushCallback() failed since did get callback " +
-                 "but have been removed as listener.",
-                 (callbacksPerformed == 1));
-      */
-   }
-
-   /**
-    * Tests simple invocation and pull callbacks.  Meaning will add a listener and
-    * will then have to get the callbacks from the server.
-    *
-    * @throws Throwable
-    */
-   public void testPullCallback() throws Throwable
-   {
-      setUp(true);
-      runPullCallback();
-   }
-
-   public void testPullCallbackWithDataType() throws Throwable
-   {
-      setUp(false);
-      runPullCallback();
-   }
-
-   public void runPullCallback() throws Throwable
-   {
-      log.debug("running testPullCallback()");
-
-      // should be null by default, since don't have connector started, but setting anyway
-      //client.setClientLocator(null);
-
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("bar", "foo");
-      assertTrue("Result of runPullCallbackTest() invocation of bar.", "foo".equals(ret));
-      client.addListener(handler);
-      // invoke which should cause callback on server side
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      ret = client.getCallbacks(handler);
-      log.debug("getCallbacks returned " + ret);
-      log.debug("should have something.");
-      assertTrue("Result of runPullCallbackTest() getCallbacks() after add listener.",
-                 ret != null);
-      // can now call directly on client
-      //ret = makeInvocation("removeListener", null);
-      client.removeListener(handler);
-      ret = makeInvocation("getCallbacks", null);
-      log.debug("getCallbacks returned " + ret);
-      log.debug("should have been empty.");
-      assertTrue("Result of runPullCallbackTest() getCallbacks() after remove listener.",
-                 ret == null);
-   }
-
-   /**
-    * Tests complex invocation to get object containing array of complex objects.
-    *
-    * @throws Throwable
-    */
-   public void testArrayReturn() throws Throwable
-   {
-      setUp(true);
-      runArrayReturn();
-   }
-
-   public void testArrayReturnWithDataType() throws Throwable
-   {
-      setUp(false);
-      runArrayReturn();
-   }
-
-   public void runArrayReturn() throws Throwable
-   {
-      // simple invoke, should return bar
-      Object ret = makeInvocation("testComplexReturn", null);
-      ComplexReturn complexRet = (ComplexReturn) ret;
-      MockTest[] mockTests = complexRet.getMockTests();
-      assertTrue("ComplexReturn's array should contain 2 items",
-                 2 == mockTests.length);
-      for(int x = 0; x < mockTests.length; x++)
-      {
-         System.err.println(mockTests[x]);
-         MockTest test = mockTests[x];
-         assertNotNull("MockTest should not be null", test);
-      }
-
-//            assertTrue("Result of runPullCallbackTest() invocation of bar.",
-//                       "foo".equals(ret));
-   }
-
-   /**
-    * Tests complex invocation to get marshalled object.
-    *
-    * @throws Throwable
-    */
-   public void testMarshalledObjectReturn() throws Throwable
-   {
-      setUp(true);
-      runMarshalledObjectReturn();
-   }
-
-   public void testMarshalledObjectReturnWithDataType() throws Throwable
-   {
-      setUp(false);
-      runMarshalledObjectReturn();
-   }
-
-   public void runMarshalledObjectReturn() throws Throwable
-   {
-      // simple invoke, should return bar
-      Object ret = makeInvocation("testMarshalledObject", null);
-      ret = ((MarshalledObject) ret).get();
-      ComplexReturn complexRet = (ComplexReturn) ret;
-      MockTest[] mockTests = complexRet.getMockTests();
-      assertTrue("ComplexReturn's array should contain 2 items",
-                 2 == mockTests.length);
-      for(int x = 0; x < mockTests.length; x++)
-      {
-         System.err.println(mockTests[x]);
-         MockTest test = mockTests[x];
-         assertNotNull("MockTest should not be null", test);
-      }
-
-//            assertTrue("Result of runPullCallbackTest() invocation of bar.",
-//                       "foo".equals(ret));
-   }
-
-   private Object makeInvocation(String method, String param) throws Throwable
-   {
-      Object ret = client.invoke(new NameBasedInvocation(method,
-                                                         new Object[]{param},
-                                                         new String[]{String.class.getName()}),
-                                 null);
-
-      return ret;
-   }
-
-   public static void main(String[] args)
-   {
-      RMIInvokerClientTest client = new RMIInvokerClientTest();
-      try
-      {
-         client.setUp();
-         client.testArrayReturn();
-         client.testArrayReturnWithDataType();
-         client.testLocalPushCallback();
-         client.testLocalPushCallbackWithDatatype();
-         client.testMarshalledObjectReturn();
-         client.testMarshalledObjectReturnWithDataType();
-         client.testPullCallback();
-         client.testPullCallbackWithDataType();
-         client.testRemotePushCallback();
-         client.testRemotePushCallbackWithDataType();
-      }
-      catch (Throwable throwable)
-      {
-         throwable.printStackTrace();
-      }
-      finally
-      {
-         try
-         {
-            client.tearDown();
-         }
-         catch (Exception e)
-         {
-            e.printStackTrace();
-         }
-      }
-
-   }
-
-}

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerClientTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerClientTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerClientTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -27,7 +27,6 @@
 import org.jboss.remoting.Client;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.invocation.NameBasedInvocation;
-import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
 import org.jboss.remoting.transport.Connector;
 import org.jboss.remoting.transport.rmi.RMIServerInvoker;
 import org.jboss.test.remoting.ComplexReturn;
@@ -119,7 +118,7 @@
       connector = new Connector();
 
       InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, serverPort));
-      System.out.println("Server locator: " + locator);
+      System.out.println("Callback locator: " + locator);
 
       //InvokerLocator locator = new InvokerLocator(transport + "://localhost:" + port);
       StringBuffer buf = new StringBuffer();
@@ -136,7 +135,7 @@
    }
 
 
-   public void setUp(boolean withNativeMarshaller) throws Exception
+   public void setUp() throws Exception
    {
       Map metadata = new HashMap();
       String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
@@ -146,11 +145,8 @@
       }
 
       metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
+      addMetadata(metadata);
       locator = initServer(metadata, -1);
-      if(!withNativeMarshaller)
-      {
-         metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      }
       init(metadata);
       log.info("Using metadata: " + metadata);
    }
@@ -179,12 +175,6 @@
     */
    public void testLocalPushCallback() throws Throwable
    {
-      setUp(true);
-      runLocalPushCallback();
-   }
-
-   public void runLocalPushCallback() throws Throwable
-   {
       log.debug("running testLocalPushCallback()");
 
       sessionId = new UID().toString();
@@ -229,12 +219,6 @@
     */
    public void testRemotePushCallback() throws Throwable
    {
-      setUp(true);
-      runRemotePushCallback();
-   }
-
-   public void runRemotePushCallback() throws Throwable
-   {
       log.debug("running testRemotePushCallback()");
 
       sessionId = new UID().toString();
@@ -285,12 +269,6 @@
     */
    public void testPullCallback() throws Throwable
    {
-      setUp(true);
-      runPullCallback();
-   }
-
-   public void runPullCallback() throws Throwable
-   {
       log.debug("running testPullCallback()");
 
       // should be null by default, since don't have connector started, but setting anyway
@@ -328,12 +306,6 @@
     */
    public void testArrayReturn() throws Throwable
    {
-      setUp(true);
-      runArrayReturn();
-   }
-
-   public void runArrayReturn() throws Throwable
-   {
       // simple invoke, should return bar
       Object ret = makeInvocation("testComplexReturn", null);
       ComplexReturn complexRet = (ComplexReturn) ret;
@@ -358,12 +330,6 @@
     */
    public void testMarshalledObjectReturn() throws Throwable
    {
-      setUp(true);
-      runMarshalledObjectReturn();
-   }
-
-   public void runMarshalledObjectReturn() throws Throwable
-   {
       // simple invoke, should return bar
       Object ret = makeInvocation("testMarshalledObject", null);
       ret = ((MarshalledObject) ret).get();
@@ -381,6 +347,10 @@
 //            assertTrue("Result of runPullCallbackTest() invocation of bar.",
 //                       "foo".equals(ret));
    }
+   
+   protected void addMetadata(Map metadata)
+   {
+   }
 
    private Object makeInvocation(String method, String param) throws Throwable
    {

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerServerTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerServerTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerNativeMarshallerServerTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -30,7 +30,6 @@
 import org.jboss.logging.Logger;
 import org.jboss.remoting.InvokerLocator;
 import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
 import org.jboss.remoting.transport.Connector;
 import org.jboss.remoting.transport.rmi.RMIServerInvoker;
 import org.jboss.test.remoting.TestUtil;
@@ -76,7 +75,7 @@
       }
       else
       {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port + "/?");
+         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port);
 
          Set keys = metadata.keySet();
          if(keys.size() > 0)
@@ -114,6 +113,7 @@
          metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
       }
       metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
+      addMetadata(metadata);
       init(metadata);
    }
 
@@ -125,6 +125,10 @@
          connector.destroy();
       }
    }
+   
+   protected void addMetadata(Map metadata)
+   {
+   }
 
    public static void main(String[] args)
    {

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingClientTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingClientTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingClientTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -1,433 +0,0 @@
-/*
-* 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.rmi;
-
-import junit.framework.TestCase;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.Client;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.invocation.NameBasedInvocation;
-import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.rmi.RMIServerInvoker;
-import org.jboss.test.remoting.ComplexReturn;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
-import org.jboss.test.remoting.transport.mock.MockInvokerCallbackHandler;
-import org.jboss.test.remoting.transport.mock.MockTest;
-import org.w3c.dom.Document;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.ByteArrayInputStream;
-import java.rmi.MarshalledObject;
-import java.rmi.server.UID;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Unit test for JBREM-167.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Mar 12, 2008
- * </p>
- */
-public class RMIInvokerOnewayMarshallingClientTest extends TestCase
-{
-
-   private String sessionId = new UID().toString();
-   private Client client;
-   private Connector connector;
-   private InvokerLocator locator;
-   private int port = RMIServerInvoker.DEFAULT_REGISTRY_PORT - 1;
-   protected String transport = "rmi";
-
-   private static final Logger log = Logger.getLogger(RMIInvokerOnewayMarshallingClientTest.class);
-
-   public void init(Map metadata)
-   {
-      try
-      {
-         InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, this.port));
-         //InvokerLocator locator = new InvokerLocator(getTransport() + "://localhost:" + port);
-         System.out.println("client locator: " + locator);
-         client = new Client(locator, "mock");
-         client.connect();
-      }
-      catch(Exception e)
-      {
-         log.error(e.getMessage(), e);
-      }
-   }
-
-   private String buildLocatorURI(Map metadata, int port)
-   {
-      if(metadata == null || metadata.size() == 0)
-      {
-         return transport + "://localhost:" + port;
-      }
-      else
-      {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port);
-
-         Set keys = metadata.keySet();
-         if(keys.size() > 0)
-         {
-            uriBuffer.append("/?");
-         }
-
-         Iterator itr = keys.iterator();
-         while(itr.hasNext())
-         {
-            String key = (String) itr.next();
-            String value = (String) metadata.get(key);
-            uriBuffer.append(key + "=" + value + "&");
-         }
-         return uriBuffer.substring(0, uriBuffer.length() - 1);
-      }
-   }
-
-   private InvokerLocator initServer(Map metadata, int serverPort) throws Exception
-   {
-      if(serverPort < 0)
-      {
-         serverPort = TestUtil.getRandomPort();
-      }
-      log.debug("port = " + serverPort);
-
-//      InvokerRegistry.registerInvoker("mock", MockClientInvoker.class, MockServerInvoker.class);
-      connector = new Connector();
-
-      InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, serverPort));
-      System.out.println("Server locator: " + locator);
-
-      //InvokerLocator locator = new InvokerLocator(transport + "://localhost:" + port);
-      StringBuffer buf = new StringBuffer();
-      buf.append("<?xml version=\"1.0\"?>\n");
-      buf.append("<handlers>\n");
-      buf.append("  <handler subsystem=\"mock\">org.jboss.test.remoting.transport.mock.MockServerInvocationHandler</handler>\n");
-      buf.append("</handlers>\n");
-      Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(buf.toString().getBytes()));
-      connector.setInvokerLocator(locator.getLocatorURI());
-      connector.setConfiguration(xml.getDocumentElement());
-      //connector.create();
-      connector.start();
-      return locator;
-   }
-
-
-   public void setUp() throws Exception
-   {
-      Map metadata = new HashMap();
-      String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
-      if(newMetadata != null && newMetadata.length() > 0)
-      {
-         metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
-      }
-
-      metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
-      locator = initServer(metadata, -1);
-      metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      metadata.put(RMIServerInvoker.RMI_ONEWAY_MARSHALLING, "true");
-      metadata.put("serializationtype", "jboss");
-      init(metadata);
-      log.info("Using metadata: " + metadata);
-   }
-
-   public void tearDown() throws Exception
-   {
-      if(connector != null)
-      {
-         connector.stop();
-         connector.destroy();
-         connector = null;
-      }
-      locator = null;
-      if(client != null)
-      {
-         client.disconnect();
-         client = null;
-      }
-   }
-
-   /**
-    * Test simple invocation and adding of listener with push callback (meaning server
-    * will send callback message when it gets it) to a local callback server
-    *
-    * @throws Throwable
-    */
-   public void testLocalPushCallbackWithDatatype() throws Throwable
-   {
-      setUp();
-      runLocalPushCallback();
-   }
-
-   public void runLocalPushCallback() throws Throwable
-   {
-      log.debug("running testLocalPushCallback()");
-
-      sessionId = new UID().toString();
-
-      sessionId = client.getSessionId();
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      log.debug("client.getInvoker().getLocator()" + client.getInvoker().getLocator());
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("foo", "bar");
-      assertTrue("Result of testLocalPushCallback() invocation of foo.", "bar".equals(ret));
-      client.addListener(handler, locator);
-      // invoke which should cause callback
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(3000);
-      log.debug("done sleeping.");
-      int callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbacksPerformed after adding listener is " + callbacksPerformed);
-      assertTrue("Result of testLocalPushCallback() failed since did not get callback.",
-                 (callbacksPerformed == 1));
-      // Can now call direct on client
-      client.removeListener(handler);
-      // shouldn't get callback now since removed listener
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      log.debug("done sleeping.");
-      callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbackPerformed after removing listener is " + callbacksPerformed);
-      assertTrue("Result of testLocalPushCallback() failed since did get callback " +
-                 "but have been removed as listener.",
-                 (callbacksPerformed == 1));
-   }
-
-   /**
-    * Test simple invocation and adding of listener with push callback (meaning server
-    * will send callback message when it gets it) to a remote callback server
-    *
-    * @throws Throwable
-    */
-   public void testRemotePushCallbackWithDataType() throws Throwable
-   {
-      setUp();
-      runRemotePushCallback();
-   }
-
-   public void runRemotePushCallback() throws Throwable
-   {
-      log.debug("running testRemotePushCallback()");
-
-      sessionId = new UID().toString();
-      //InvokerLocator locator = client.getInvoker().getLocator();
-      sessionId = client.getSessionId();
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      log.debug("client.getInvoker().getLocator()" + client.getInvoker().getLocator());
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("foo", "bar");
-      assertTrue("Result of testRemotePushCallback() invocation of foo.", "bar".equals(ret));
-      client.addListener(handler, locator);
-      // invoke which should cause callback
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(3000);
-      log.debug("done sleeping.");
-      // TODO: No way to currently check the remote callback handler
-      // to see if it got callback -TME
-      /*
-      int callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbacksPerformed after adding listener is " + callbacksPerformed);
-      assertTrue("Result of testRemotePushCallback() failed since did not get callback.",
-                 (callbacksPerformed == 1));
-      */
-      // Can now call direct on client
-      client.removeListener(handler);
-      // shouldn't get callback now since removed listener
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      log.debug("done sleeping.");
-      /*
-      callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbackPerformed after removing listener is " + callbacksPerformed);
-      assertTrue("Result of testRemotePushCallback() failed since did get callback " +
-                 "but have been removed as listener.",
-                 (callbacksPerformed == 1));
-      */
-   }
-
-   /**
-    * Tests simple invocation and pull callbacks.  Meaning will add a listener and
-    * will then have to get the callbacks from the server.
-    *
-    * @throws Throwable
-    */
-   public void testPullCallbackWithDataType() throws Throwable
-   {
-      setUp();
-      runPullCallback();
-   }
-
-   public void runPullCallback() throws Throwable
-   {
-      log.debug("running testPullCallback()");
-
-      // should be null by default, since don't have connector started, but setting anyway
-      //client.setClientLocator(null);
-
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("bar", "foo");
-      assertTrue("Result of runPullCallbackTest() invocation of bar.", "foo".equals(ret));
-      client.addListener(handler);
-      // invoke which should cause callback on server side
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      ret = client.getCallbacks(handler);
-      log.debug("getCallbacks returned " + ret);
-      log.debug("should have something.");
-      assertTrue("Result of runPullCallbackTest() getCallbacks() after add listener.",
-                 ret != null);
-      // can now call directly on client
-      //ret = makeInvocation("removeListener", null);
-      client.removeListener(handler);
-      ret = makeInvocation("getCallbacks", null);
-      log.debug("getCallbacks returned " + ret);
-      log.debug("should have been empty.");
-      assertTrue("Result of runPullCallbackTest() getCallbacks() after remove listener.",
-                 ret == null);
-   }
-
-   /**
-    * Tests complex invocation to get object containing array of complex objects.
-    *
-    * @throws Throwable
-    */
-   public void testArrayReturnWithDataType() throws Throwable
-   {
-      setUp();
-      runArrayReturn();
-   }
-
-   public void runArrayReturn() throws Throwable
-   {
-      // simple invoke, should return bar
-      Object ret = makeInvocation("testComplexReturn", null);
-      ComplexReturn complexRet = (ComplexReturn) ret;
-      MockTest[] mockTests = complexRet.getMockTests();
-      assertTrue("ComplexReturn's array should contain 2 items",
-                 2 == mockTests.length);
-      for(int x = 0; x < mockTests.length; x++)
-      {
-         System.err.println(mockTests[x]);
-         MockTest test = mockTests[x];
-         assertNotNull("MockTest should not be null", test);
-      }
-
-//            assertTrue("Result of runPullCallbackTest() invocation of bar.",
-//                       "foo".equals(ret));
-   }
-
-   /**
-    * Tests complex invocation to get marshalled object.
-    *
-    * @throws Throwable
-    */
-   public void testMarshalledObjectReturnWithDataType() throws Throwable
-   {
-      setUp();
-      runMarshalledObjectReturn();
-   }
-
-   public void runMarshalledObjectReturn() throws Throwable
-   {
-      // simple invoke, should return bar
-      Object ret = makeInvocation("testMarshalledObject", null);
-      ret = ((MarshalledObject) ret).get();
-      ComplexReturn complexRet = (ComplexReturn) ret;
-      MockTest[] mockTests = complexRet.getMockTests();
-      assertTrue("ComplexReturn's array should contain 2 items",
-                 2 == mockTests.length);
-      for(int x = 0; x < mockTests.length; x++)
-      {
-         System.err.println(mockTests[x]);
-         MockTest test = mockTests[x];
-         assertNotNull("MockTest should not be null", test);
-      }
-
-//            assertTrue("Result of runPullCallbackTest() invocation of bar.",
-//                       "foo".equals(ret));
-   }
-
-   private Object makeInvocation(String method, String param) throws Throwable
-   {
-      Object ret = client.invoke(new NameBasedInvocation(method,
-                                                         new Object[]{param},
-                                                         new String[]{String.class.getName()}),
-                                 null);
-
-      return ret;
-   }
-
-//   public static void main(String[] args)
-//   {
-//      RMIInvokerClientTest client = new RMIInvokerClientTest();
-//      try
-//      {
-//         client.setUp();
-//         client.testArrayReturn();
-//         client.testArrayReturnWithDataType();
-//         client.testLocalPushCallback();
-//         client.testLocalPushCallbackWithDatatype();
-//         client.testMarshalledObjectReturn();
-//         client.testMarshalledObjectReturnWithDataType();
-//         client.testPullCallback();
-//         client.testPullCallbackWithDataType();
-//         client.testRemotePushCallback();
-//         client.testRemotePushCallbackWithDataType();
-//      }
-//      catch (Throwable throwable)
-//      {
-//         throwable.printStackTrace();
-//      }
-//      finally
-//      {
-//         try
-//         {
-//            client.tearDown();
-//         }
-//         catch (Exception e)
-//         {
-//            e.printStackTrace();
-//         }
-//      }
-//
-//   }
-
-}

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingServerTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingServerTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingServerTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -1,151 +0,0 @@
-/*
-* 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.rmi;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import org.jboss.jrunit.extensions.ServerTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.rmi.RMIServerInvoker;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
-import org.jboss.test.remoting.transport.mock.MockServerInvocationHandler;
-
-
-/**
- * Unit test for JBREM-167.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Mar 12, 2008
- * </p>
- */
-public class RMIInvokerOnewayMarshallingServerTest extends ServerTestCase
-{
-   private int port = RMIServerInvoker.DEFAULT_REGISTRY_PORT - 1;
-   protected String transport = "rmi";
-   private Connector connector;
-
-   private static final Logger log = Logger.getLogger(RMIInvokerOnewayMarshallingServerTest.class);
-
-   public void init(Map metatdata) throws Exception
-   {
-      if(port < 0)
-      {
-         port = TestUtil.getRandomPort();
-      }
-      log.debug("port = " + port);
-
-      connector = new Connector();
-      InvokerLocator locator = new InvokerLocator(buildLocatorURI(metatdata));
-      System.out.println("server locator: " + locator);
-      connector.setInvokerLocator(locator.getLocatorURI());
-      connector.start();
-      connector.addInvocationHandler(getSubsystem(), getServerInvocationHandler());
-   }
-
-   private String buildLocatorURI(Map metadata)
-   {
-      if(metadata == null || metadata.size() == 0)
-      {
-         return transport + "://localhost:" + port;
-      }
-      else
-      {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port);
-
-         Set keys = metadata.keySet();
-         if(keys.size() > 0)
-         {
-            uriBuffer.append("/?");
-         }
-
-         Iterator itr = keys.iterator();
-         while(itr.hasNext())
-         {
-            String key = (String) itr.next();
-            String value = (String) metadata.get(key);
-            uriBuffer.append(key + "=" + value + "&");
-         }
-         return uriBuffer.substring(0, uriBuffer.length() - 1);
-      }
-   }
-
-   protected String getSubsystem()
-   {
-      return "mock";
-   }
-
-   protected ServerInvocationHandler getServerInvocationHandler()
-   {
-      return new MockServerInvocationHandler();
-   }
-
-   public void setUp() throws Exception
-   {
-      Map metadata = new HashMap();
-      String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
-      if(newMetadata != null && newMetadata.length() > 0)
-      {
-         metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
-      }
-      metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
-      metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      metadata.put(RMIServerInvoker.RMI_ONEWAY_MARSHALLING, "true");
-      metadata.put("serializationtype", "jboss");
-      init(metadata);
-   }
-
-   public void tearDown() throws Exception
-   {
-      if(connector != null)
-      {
-         connector.stop();
-         connector.destroy();
-      }
-   }
-
-   public static void main(String[] args)
-   {
-      RMIInvokerOnewayMarshallingServerTest server = new RMIInvokerOnewayMarshallingServerTest();
-      try
-      {
-         server.setUp();
-         Thread.currentThread().sleep(6000000);
-      }
-      catch(Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-
-
-}

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingTestCase.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingTestCase.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -1,44 +0,0 @@
-/*
-* 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.rmi;
-
-import org.jboss.test.remoting.transport.InvokerTestDriver;
-
-/**
- * Unit test for JBREM-167.
- * 
- * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @version $Revision: 1.1 $
- * <p>
- * Copyright Mar 12, 2008
- * </p>
- */
-public class RMIInvokerOnewayMarshallingTestCase extends InvokerTestDriver
-{
-   public void declareTestClasses()
-   {
-      addTestClasses(RMIInvokerOnewayMarshallingClientTest.class.getName(),
-                     1,
-                     RMIInvokerOnewayMarshallingServerTest.class.getName());
-   }
-}
\ No newline at end of file

Copied: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerClientTest.java (from rev 3661, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingClientTest.java)
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerClientTest.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerClientTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -0,0 +1,53 @@
+/*
+* 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.rmi;
+
+import java.util.Map;
+
+import org.jboss.remoting.transport.rmi.RMIServerInvoker;
+
+/**
+ * Unit test for JBREM-167.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 12, 2008
+ * </p>
+ */
+public class RMIInvokerOnewayNativeMarshallerClientTest
+extends RMIInvokerNativeMarshallerClientTest
+{
+   protected void addMetadata(Map metadata)
+   {
+      try
+      {
+         metadata.put(RMIServerInvoker.RMI_ONEWAY_MARSHALLING, "true");
+      }
+      catch (NoSuchFieldError e)
+      {
+         // For versioning tests.
+         System.out.println(e);
+      }
+   }
+}

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerServerTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerServerTest.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerServerTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -0,0 +1,68 @@
+/*
+* 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.rmi;
+
+import java.util.Map;
+
+import org.jboss.remoting.transport.rmi.RMIServerInvoker;
+
+
+/**
+ * Unit test for JBREM-167.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 12, 2008
+ * </p>
+ */
+public class RMIInvokerOnewayNativeMarshallerServerTest
+extends RMIInvokerNativeMarshallerServerTest
+{
+   protected void addMetadata(Map metadata)
+   {
+      try
+      {
+         metadata.put(RMIServerInvoker.RMI_ONEWAY_MARSHALLING, "true");
+      }
+      catch (NoSuchFieldError e)
+      {
+         // For versioning tests.
+         System.out.println(e);
+      }
+   }
+   
+   public static void main(String[] args)
+   {
+      RMIInvokerOnewayNativeMarshallerServerTest server = new RMIInvokerOnewayNativeMarshallerServerTest();
+      try
+      {
+         server.setUp();
+         Thread.currentThread().sleep(6000000);
+      }
+      catch(Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayNativeMarshallerTestCase.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -0,0 +1,44 @@
+/*
+* 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.rmi;
+
+import org.jboss.test.remoting.transport.InvokerTestDriver;
+
+/**
+ * Unit test for JBREM-167.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 12, 2008
+ * </p>
+ */
+public class RMIInvokerOnewayNativeMarshallerTestCase extends InvokerTestDriver
+{
+   public void declareTestClasses()
+   {
+      addTestClasses(RMIInvokerOnewayNativeMarshallerClientTest.class.getName(),
+                     1,
+                     RMIInvokerOnewayNativeMarshallerServerTest.class.getName());
+   }
+}
\ No newline at end of file

Added: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerClientTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerClientTest.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerClientTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -0,0 +1,50 @@
+/*
+* 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.rmi;
+
+import java.util.Map;
+
+import org.jboss.remoting.transport.rmi.RMIServerInvoker;
+
+/**
+ * This is the actual concrete test for the invoker client.
+ *
+ * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
+ */
+public class RMIInvokerOnewaySerializableMarshallerClientTest
+extends RMIInvokerSerializableMarshallerClientTest
+{
+   protected void addMetadata(Map metadata)
+   {
+      super.addMetadata(metadata);
+      try
+      {
+         metadata.put(RMIServerInvoker.RMI_ONEWAY_MARSHALLING, "true");
+      }
+      catch (NoSuchFieldError e)
+      {
+         // For versioning tests.
+         System.out.println(e);
+      }
+   }
+}

Copied: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerServerTest.java (from rev 3661, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingServerTest.java)
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerServerTest.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerServerTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -0,0 +1,69 @@
+/*
+* 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.rmi;
+
+import java.util.Map;
+
+import org.jboss.remoting.transport.rmi.RMIServerInvoker;
+
+
+/**
+ * Unit test for JBREM-167.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 12, 2008
+ * </p>
+ */
+public class RMIInvokerOnewaySerializableMarshallerServerTest
+extends RMIInvokerSerializableMarshallerServerTest
+{
+   protected void addMetadata(Map metadata)
+   {
+      super.addMetadata(metadata);
+      try
+      {
+         metadata.put(RMIServerInvoker.RMI_ONEWAY_MARSHALLING, "true");
+      }
+      catch (NoSuchFieldError e)
+      {
+         // For versioning tests.
+         System.out.println(e);
+      }
+   }
+   
+   public static void main(String[] args)
+   {
+      RMIInvokerOnewaySerializableMarshallerServerTest server = new RMIInvokerOnewaySerializableMarshallerServerTest();
+      try
+      {
+         server.setUp();
+         Thread.currentThread().sleep(6000000);
+      }
+      catch(Exception e)
+      {
+         e.printStackTrace();
+      }
+   }
+}

Copied: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerTestCase.java (from rev 3661, remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewayMarshallingTestCase.java)
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerTestCase.java	                        (rev 0)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerOnewaySerializableMarshallerTestCase.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -0,0 +1,44 @@
+/*
+* 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.rmi;
+
+import org.jboss.test.remoting.transport.InvokerTestDriver;
+
+/**
+ * Unit test for JBREM-167.
+ * 
+ * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
+ * @version $Revision: 1.1 $
+ * <p>
+ * Copyright Mar 12, 2008
+ * </p>
+ */
+public class RMIInvokerOnewaySerializableMarshallerTestCase extends InvokerTestDriver
+{
+   public void declareTestClasses()
+   {
+      addTestClasses(RMIInvokerOnewaySerializableMarshallerClientTest.class.getName(),
+                     1,
+                     RMIInvokerOnewaySerializableMarshallerServerTest.class.getName());
+   }
+}
\ No newline at end of file

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerClientTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerClientTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerClientTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -22,409 +22,21 @@
 
 package org.jboss.test.remoting.transport.rmi;
 
-import junit.framework.TestCase;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.Client;
+import java.util.Map;
+
 import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.invocation.NameBasedInvocation;
 import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.rmi.RMIServerInvoker;
-import org.jboss.test.remoting.ComplexReturn;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
-import org.jboss.test.remoting.transport.mock.MockInvokerCallbackHandler;
-import org.jboss.test.remoting.transport.mock.MockTest;
-import org.w3c.dom.Document;
 
-import javax.xml.parsers.DocumentBuilderFactory;
-import java.io.ByteArrayInputStream;
-import java.rmi.MarshalledObject;
-import java.rmi.server.UID;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
 /**
  * This is the actual concrete test for the invoker client.
  *
  * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  */
-public class RMIInvokerSerializableMarshallerClientTest extends TestCase
+public class RMIInvokerSerializableMarshallerClientTest
+extends RMIInvokerNativeMarshallerClientTest
 {
-
-   private String sessionId = new UID().toString();
-   private Client client;
-   private Connector connector;
-   private InvokerLocator locator;
-   private int port = RMIServerInvoker.DEFAULT_REGISTRY_PORT - 1;
-   protected String transport = "rmi";
-
-   private static final Logger log = Logger.getLogger(RMIInvokerSerializableMarshallerClientTest.class);
-
-   public void init(Map metadata)
+   protected void addMetadata(Map metadata)
    {
-      try
-      {
-         InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, this.port));
-         //InvokerLocator locator = new InvokerLocator(getTransport() + "://localhost:" + port);
-         System.out.println("client locator: " + locator);
-         client = new Client(locator, "mock");
-         client.connect();
-      }
-      catch(Exception e)
-      {
-         log.error(e.getMessage(), e);
-      }
+      metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
    }
-
-   private String buildLocatorURI(Map metadata, int port)
-   {
-      if(metadata == null || metadata.size() == 0)
-      {
-         return transport + "://localhost:" + port;
-      }
-      else
-      {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port);
-
-         Set keys = metadata.keySet();
-         if(keys.size() > 0)
-         {
-            uriBuffer.append("/?");
-         }
-
-         Iterator itr = keys.iterator();
-         while(itr.hasNext())
-         {
-            String key = (String) itr.next();
-            String value = (String) metadata.get(key);
-            uriBuffer.append(key + "=" + value + "&");
-         }
-         return uriBuffer.substring(0, uriBuffer.length() - 1);
-      }
-   }
-
-   private InvokerLocator initServer(Map metadata, int serverPort) throws Exception
-   {
-      if(serverPort < 0)
-      {
-         serverPort = TestUtil.getRandomPort();
-      }
-      log.debug("port = " + serverPort);
-
-//      InvokerRegistry.registerInvoker("mock", MockClientInvoker.class, MockServerInvoker.class);
-      connector = new Connector();
-
-      InvokerLocator locator = new InvokerLocator(buildLocatorURI(metadata, serverPort));
-      System.out.println("Server locator: " + locator);
-
-      //InvokerLocator locator = new InvokerLocator(transport + "://localhost:" + port);
-      StringBuffer buf = new StringBuffer();
-      buf.append("<?xml version=\"1.0\"?>\n");
-      buf.append("<handlers>\n");
-      buf.append("  <handler subsystem=\"mock\">org.jboss.test.remoting.transport.mock.MockServerInvocationHandler</handler>\n");
-      buf.append("</handlers>\n");
-      Document xml = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(buf.toString().getBytes()));
-      connector.setInvokerLocator(locator.getLocatorURI());
-      connector.setConfiguration(xml.getDocumentElement());
-      //connector.create();
-      connector.start();
-      return locator;
-   }
-
-
-   public void setUp(boolean withNativeMarshaller) throws Exception
-   {
-      Map metadata = new HashMap();
-      String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
-      if(newMetadata != null && newMetadata.length() > 0)
-      {
-         metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
-      }
-
-      metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
-      locator = initServer(metadata, -1);
-      if(!withNativeMarshaller)
-      {
-         metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      }
-      init(metadata);
-      log.info("Using metadata: " + metadata);
-   }
-
-   public void tearDown() throws Exception
-   {
-      if(connector != null)
-      {
-         connector.stop();
-         connector.destroy();
-         connector = null;
-      }
-      locator = null;
-      if(client != null)
-      {
-         client.disconnect();
-         client = null;
-      }
-   }
-
-   /**
-    * Test simple invocation and adding of listener with push callback (meaning server
-    * will send callback message when it gets it) to a local callback server
-    *
-    * @throws Throwable
-    */
-   public void testLocalPushCallbackWithDatatype() throws Throwable
-   {
-      setUp(false);
-      runLocalPushCallback();
-   }
-
-   public void runLocalPushCallback() throws Throwable
-   {
-      log.debug("running testLocalPushCallback()");
-
-      sessionId = new UID().toString();
-
-      sessionId = client.getSessionId();
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      log.debug("client.getInvoker().getLocator()" + client.getInvoker().getLocator());
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("foo", "bar");
-      assertTrue("Result of testLocalPushCallback() invocation of foo.", "bar".equals(ret));
-      client.addListener(handler, locator);
-      // invoke which should cause callback
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(3000);
-      log.debug("done sleeping.");
-      int callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbacksPerformed after adding listener is " + callbacksPerformed);
-      assertTrue("Result of testLocalPushCallback() failed since did not get callback.",
-                 (callbacksPerformed == 1));
-      // Can now call direct on client
-      client.removeListener(handler);
-      // shouldn't get callback now since removed listener
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      log.debug("done sleeping.");
-      callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbackPerformed after removing listener is " + callbacksPerformed);
-      assertTrue("Result of testLocalPushCallback() failed since did get callback " +
-                 "but have been removed as listener.",
-                 (callbacksPerformed == 1));
-   }
-
-   /**
-    * Test simple invocation and adding of listener with push callback (meaning server
-    * will send callback message when it gets it) to a remote callback server
-    *
-    * @throws Throwable
-    */
-   public void testRemotePushCallbackWithDataType() throws Throwable
-   {
-      setUp(false);
-      runRemotePushCallback();
-   }
-
-   public void runRemotePushCallback() throws Throwable
-   {
-      log.debug("running testRemotePushCallback()");
-
-      sessionId = new UID().toString();
-      //InvokerLocator locator = client.getInvoker().getLocator();
-      sessionId = client.getSessionId();
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      log.debug("client.getInvoker().getLocator()" + client.getInvoker().getLocator());
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("foo", "bar");
-      assertTrue("Result of testRemotePushCallback() invocation of foo.", "bar".equals(ret));
-      client.addListener(handler, locator);
-      // invoke which should cause callback
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(3000);
-      log.debug("done sleeping.");
-      // TODO: No way to currently check the remote callback handler
-      // to see if it got callback -TME
-      /*
-      int callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbacksPerformed after adding listener is " + callbacksPerformed);
-      assertTrue("Result of testRemotePushCallback() failed since did not get callback.",
-                 (callbacksPerformed == 1));
-      */
-      // Can now call direct on client
-      client.removeListener(handler);
-      // shouldn't get callback now since removed listener
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      log.debug("done sleeping.");
-      /*
-      callbacksPerformed = handler.isCallbackReceived();
-      log.debug("callbackPerformed after removing listener is " + callbacksPerformed);
-      assertTrue("Result of testRemotePushCallback() failed since did get callback " +
-                 "but have been removed as listener.",
-                 (callbacksPerformed == 1));
-      */
-   }
-
-   /**
-    * Tests simple invocation and pull callbacks.  Meaning will add a listener and
-    * will then have to get the callbacks from the server.
-    *
-    * @throws Throwable
-    */
-   public void testPullCallbackWithDataType() throws Throwable
-   {
-      setUp(false);
-      runPullCallback();
-   }
-
-   public void runPullCallback() throws Throwable
-   {
-      log.debug("running testPullCallback()");
-
-      // should be null by default, since don't have connector started, but setting anyway
-      //client.setClientLocator(null);
-
-      MockInvokerCallbackHandler handler = new MockInvokerCallbackHandler(sessionId);
-
-      // simple invoke, should return bar
-      Object ret = makeInvocation("bar", "foo");
-      assertTrue("Result of runPullCallbackTest() invocation of bar.", "foo".equals(ret));
-      client.addListener(handler);
-      // invoke which should cause callback on server side
-      ret = makeInvocation("test", "test");
-      // allow time for callback
-      Thread.sleep(2000);
-      ret = client.getCallbacks(handler);
-      log.debug("getCallbacks returned " + ret);
-      log.debug("should have something.");
-      assertTrue("Result of runPullCallbackTest() getCallbacks() after add listener.",
-                 ret != null);
-      // can now call directly on client
-      //ret = makeInvocation("removeListener", null);
-      client.removeListener(handler);
-      ret = makeInvocation("getCallbacks", null);
-      log.debug("getCallbacks returned " + ret);
-      log.debug("should have been empty.");
-      assertTrue("Result of runPullCallbackTest() getCallbacks() after remove listener.",
-                 ret == null);
-   }
-
-   /**
-    * Tests complex invocation to get object containing array of complex objects.
-    *
-    * @throws Throwable
-    */
-   public void testArrayReturnWithDataType() throws Throwable
-   {
-      setUp(false);
-      runArrayReturn();
-   }
-
-   public void runArrayReturn() throws Throwable
-   {
-      // simple invoke, should return bar
-      Object ret = makeInvocation("testComplexReturn", null);
-      ComplexReturn complexRet = (ComplexReturn) ret;
-      MockTest[] mockTests = complexRet.getMockTests();
-      assertTrue("ComplexReturn's array should contain 2 items",
-                 2 == mockTests.length);
-      for(int x = 0; x < mockTests.length; x++)
-      {
-         System.err.println(mockTests[x]);
-         MockTest test = mockTests[x];
-         assertNotNull("MockTest should not be null", test);
-      }
-
-//            assertTrue("Result of runPullCallbackTest() invocation of bar.",
-//                       "foo".equals(ret));
-   }
-
-   /**
-    * Tests complex invocation to get marshalled object.
-    *
-    * @throws Throwable
-    */
-   public void testMarshalledObjectReturnWithDataType() throws Throwable
-   {
-      setUp(false);
-      runMarshalledObjectReturn();
-   }
-
-   public void runMarshalledObjectReturn() throws Throwable
-   {
-      // simple invoke, should return bar
-      Object ret = makeInvocation("testMarshalledObject", null);
-      ret = ((MarshalledObject) ret).get();
-      ComplexReturn complexRet = (ComplexReturn) ret;
-      MockTest[] mockTests = complexRet.getMockTests();
-      assertTrue("ComplexReturn's array should contain 2 items",
-                 2 == mockTests.length);
-      for(int x = 0; x < mockTests.length; x++)
-      {
-         System.err.println(mockTests[x]);
-         MockTest test = mockTests[x];
-         assertNotNull("MockTest should not be null", test);
-      }
-
-//            assertTrue("Result of runPullCallbackTest() invocation of bar.",
-//                       "foo".equals(ret));
-   }
-
-   private Object makeInvocation(String method, String param) throws Throwable
-   {
-      Object ret = client.invoke(new NameBasedInvocation(method,
-                                                         new Object[]{param},
-                                                         new String[]{String.class.getName()}),
-                                 null);
-
-      return ret;
-   }
-
-//   public static void main(String[] args)
-//   {
-//      RMIInvokerClientTest client = new RMIInvokerClientTest();
-//      try
-//      {
-//         client.setUp();
-//         client.testArrayReturn();
-//         client.testArrayReturnWithDataType();
-//         client.testLocalPushCallback();
-//         client.testLocalPushCallbackWithDatatype();
-//         client.testMarshalledObjectReturn();
-//         client.testMarshalledObjectReturnWithDataType();
-//         client.testPullCallback();
-//         client.testPullCallbackWithDataType();
-//         client.testRemotePushCallback();
-//         client.testRemotePushCallbackWithDataType();
-//      }
-//      catch (Throwable throwable)
-//      {
-//         throwable.printStackTrace();
-//      }
-//      finally
-//      {
-//         try
-//         {
-//            client.tearDown();
-//         }
-//         catch (Exception e)
-//         {
-//            e.printStackTrace();
-//         }
-//      }
-//
-//   }
-
 }

Modified: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerServerTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerServerTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerSerializableMarshallerServerTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -22,21 +22,10 @@
 
 package org.jboss.test.remoting.transport.rmi;
 
-import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
-import org.jboss.jrunit.extensions.ServerTestCase;
-import org.jboss.logging.Logger;
+
 import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
 import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.rmi.RMIServerInvoker;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
-import org.jboss.test.remoting.transport.mock.MockServerInvocationHandler;
 
 
 /**
@@ -44,89 +33,14 @@
  *
  * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
  */
-public class RMIInvokerSerializableMarshallerServerTest extends ServerTestCase
+public class RMIInvokerSerializableMarshallerServerTest extends RMIInvokerNativeMarshallerServerTest
 {
-   private int port = RMIServerInvoker.DEFAULT_REGISTRY_PORT - 1;
-   protected String transport = "rmi";
-   private Connector connector;
-
-   private static final Logger log = Logger.getLogger(RMIInvokerSerializableMarshallerServerTest.class);
-
-   public void init(Map metatdata) throws Exception
+   protected void addMetadata(Map metadata)
    {
-      if(port < 0)
-      {
-         port = TestUtil.getRandomPort();
-      }
-      log.debug("port = " + port);
-
-      connector = new Connector();
-      InvokerLocator locator = new InvokerLocator(buildLocatorURI(metatdata));
-      System.out.println("server locator: " + locator);
-      connector.setInvokerLocator(locator.getLocatorURI());
-      connector.start();
-      connector.addInvocationHandler(getSubsystem(), getServerInvocationHandler());
-   }
-
-   private String buildLocatorURI(Map metadata)
-   {
-      if(metadata == null || metadata.size() == 0)
-      {
-         return transport + "://localhost:" + port;
-      }
-      else
-      {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port);
-
-         Set keys = metadata.keySet();
-         if(keys.size() > 0)
-         {
-            uriBuffer.append("/?");
-         }
-
-         Iterator itr = keys.iterator();
-         while(itr.hasNext())
-         {
-            String key = (String) itr.next();
-            String value = (String) metadata.get(key);
-            uriBuffer.append(key + "=" + value + "&");
-         }
-         return uriBuffer.substring(0, uriBuffer.length() - 1);
-      }
-   }
-
-   protected String getSubsystem()
-   {
-      return "mock";
-   }
-
-   protected ServerInvocationHandler getServerInvocationHandler()
-   {
-      return new MockServerInvocationHandler();
-   }
-
-   public void setUp() throws Exception
-   {
-      Map metadata = new HashMap();
-      String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
-      if(newMetadata != null && newMetadata.length() > 0)
-      {
-         metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
-      }
-      metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
       metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      init(metadata);
    }
+   
 
-   public void tearDown() throws Exception
-   {
-      if(connector != null)
-      {
-         connector.stop();
-         connector.destroy();
-      }
-   }
-
    public static void main(String[] args)
    {
       RMIInvokerSerializableMarshallerServerTest server = new RMIInvokerSerializableMarshallerServerTest();
@@ -140,6 +54,4 @@
          e.printStackTrace();
       }
    }
-
-
 }

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerServerTest.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerServerTest.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerServerTest.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -1,145 +0,0 @@
-/*
-* 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.rmi;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import org.jboss.jrunit.extensions.ServerTestCase;
-import org.jboss.logging.Logger;
-import org.jboss.remoting.InvokerLocator;
-import org.jboss.remoting.ServerInvocationHandler;
-import org.jboss.remoting.marshal.serializable.SerializableMarshaller;
-import org.jboss.remoting.transport.Connector;
-import org.jboss.remoting.transport.rmi.RMIServerInvoker;
-import org.jboss.test.remoting.TestUtil;
-import org.jboss.test.remoting.performance.synchronous.PerformanceServerTest;
-import org.jboss.test.remoting.performance.synchronous.PerformanceTestCase;
-import org.jboss.test.remoting.transport.mock.MockServerInvocationHandler;
-
-
-/**
- * This is the concrete test for invoker server.
- *
- * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
- */
-public class RMIInvokerServerTest extends ServerTestCase
-{
-   private int port = RMIServerInvoker.DEFAULT_REGISTRY_PORT - 1;
-   protected String transport = "rmi";
-   private Connector connector;
-
-   private static final Logger log = Logger.getLogger(RMIInvokerServerTest.class);
-
-   public void init(Map metatdata) throws Exception
-   {
-      if(port < 0)
-      {
-         port = TestUtil.getRandomPort();
-      }
-      log.debug("port = " + port);
-
-      connector = new Connector();
-      InvokerLocator locator = new InvokerLocator(buildLocatorURI(metatdata));
-      System.out.println("server locator: " + locator);
-      connector.setInvokerLocator(locator.getLocatorURI());
-      connector.start();
-      connector.addInvocationHandler(getSubsystem(), getServerInvocationHandler());
-   }
-
-   private String buildLocatorURI(Map metadata)
-   {
-      if(metadata == null || metadata.size() == 0)
-      {
-         return transport + "://localhost:" + port;
-      }
-      else
-      {
-         StringBuffer uriBuffer = new StringBuffer(transport + "://localhost:" + port + "/?");
-
-         Set keys = metadata.keySet();
-         if(keys.size() > 0)
-         {
-            uriBuffer.append("/?");
-         }
-
-         Iterator itr = keys.iterator();
-         while(itr.hasNext())
-         {
-            String key = (String) itr.next();
-            String value = (String) metadata.get(key);
-            uriBuffer.append(key + "=" + value + "&");
-         }
-         return uriBuffer.substring(0, uriBuffer.length() - 1);
-      }
-   }
-
-   protected String getSubsystem()
-   {
-      return "mock";
-   }
-
-   protected ServerInvocationHandler getServerInvocationHandler()
-   {
-      return new MockServerInvocationHandler();
-   }
-
-   public void setUp() throws Exception
-   {
-      Map metadata = new HashMap();
-      String newMetadata = System.getProperty(PerformanceTestCase.REMOTING_METADATA);
-      if(newMetadata != null && newMetadata.length() > 0)
-      {
-         metadata.putAll(PerformanceServerTest.parseMetadataString(newMetadata));
-      }
-      metadata.put(RMIServerInvoker.REGISTRY_PORT_KEY, String.valueOf(port + 1));
-      metadata.put(InvokerLocator.DATATYPE, SerializableMarshaller.DATATYPE);
-      init(metadata);
-   }
-
-   public void tearDown() throws Exception
-   {
-      if(connector != null)
-      {
-         connector.stop();
-         connector.destroy();
-      }
-   }
-
-   public static void main(String[] args)
-   {
-      RMIInvokerServerTest server = new RMIInvokerServerTest();
-      try
-      {
-         server.setUp();
-         Thread.currentThread().sleep(6000000);
-      }
-      catch(Exception e)
-      {
-         e.printStackTrace();
-      }
-   }
-
-
-}

Deleted: remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerTestCase.java
===================================================================
--- remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerTestCase.java	2008-03-20 04:31:28 UTC (rev 3667)
+++ remoting2/branches/2.x/src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerTestCase.java	2008-03-20 05:42:13 UTC (rev 3668)
@@ -1,43 +0,0 @@
-/*
-* 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.rmi;
-
-import org.jboss.test.remoting.transport.InvokerTestDriver;
-
-/**
- * This should be used as the main test case for the invoker client/server.
- * It will start one instance of the client and one of the server and will
- * gather the test results and report them in standard JUnit format.  When
- * wanting to run JUnit test for invoker, this is the class to use.
- *
- * @author <a href="mailto:telrod at e2technologies.net">Tom Elrod</a>
- */
-public class RMIInvokerTestCase extends InvokerTestDriver
-{
-   public void declareTestClasses()
-   {
-      addTestClasses(RMIInvokerClientTest.class.getName(),
-                     1,
-                     RMIInvokerServerTest.class.getName());
-   }
-}
\ No newline at end of file