[jboss-cvs] jbosstest/src/main/org/jboss/test/invokers/test MultiInvokersUnitTestCase.java RemoteClientStandAloneUnitTestCase.java

[David J. <d_j...@us...>]

  User: d_jencks
  Date: 03/02/04 21:24:19

  Modified:    src/main/org/jboss/test/invokers/test
                        MultiInvokersUnitTestCase.java
                        RemoteClientStandAloneUnitTestCase.java
  Log:
  Split transaction interceptor into client and server halves so tx are not distributed unless necessary.  Refactored client side mbean creation to be more related to the objects being deserialized.  Refactored client side XAResource into an interceptor-like invoker class.
  
  Revision  Changes    Path
  1.2       +4 -2      jbosstest/src/main/org/jboss/test/invokers/test/MultiInvokersUnitTestCase.java
  
  Index: MultiInvokersUnitTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/invokers/test/MultiInvokersUnitTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- MultiInvokersUnitTestCase.java	28 Apr 2002 23:25:43 -0000	1.1
  +++ MultiInvokersUnitTestCase.java	5 Feb 2003 05:24:19 -0000	1.2
  @@ -28,7 +28,7 @@
    * Test use of multiple invokers per container
    *
    * @author    bi...@bu...
  - * @version   $Revision: 1.1 $
  + * @version   $Revision: 1.2 $
    */
   public class MultiInvokersUnitTestCase extends JBossTestCase
   {
  @@ -64,7 +64,9 @@
         bmp1.setName("burke");
         getLog().debug("bmp1 name: " + bmp1.getName());
         getLog().debug("bmp2 name: " + bmp2.getName());
  -      assertTrue("bmp1 " + bmp1.getName() + "  == bmp2 " + bmp2.getName(), bmp1.getName().equals(bmp2.getName()));
  +      String n1 = bmp1.getName();
  +      String n2 = bmp2.getName();
  +      assertTrue("bmp1 " + n1 + "  == bmp2 " + n2, n1.equals(n2));
   
         StatelessSessionHome shome1 = (StatelessSessionHome)ctx.lookup("StatelessSession");
         StatelessSessionHome shome2 = (StatelessSessionHome)ctx.lookup("CompressionStatelessSession");
  
  
  
  1.2       +8 -4      jbosstest/src/main/org/jboss/test/invokers/test/RemoteClientStandAloneUnitTestCase.java
  
  Index: RemoteClientStandAloneUnitTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/invokers/test/RemoteClientStandAloneUnitTestCase.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RemoteClientStandAloneUnitTestCase.java	9 Dec 2002 01:47:50 -0000	1.1
  +++ RemoteClientStandAloneUnitTestCase.java	5 Feb 2003 05:24:19 -0000	1.2
  @@ -16,8 +16,9 @@
   import javax.management.ObjectName;
   import javax.transaction.UserTransaction;
   import junit.framework.*;
  -import org.jboss.invocation.trunk.client.ClientSetup;
  +import org.jboss.invocation.InvokerXAResource;
   import org.jboss.invocation.ServerID;
  +import org.jboss.invocation.trunk.client.ClientSetup;
   import org.jboss.invocation.trunk.client.TrunkInvokerProxy;
   import org.jboss.system.client.Client;
   import org.jboss.test.JBossTestCase;
  @@ -47,7 +48,10 @@
      {
         ServerID sa = new ServerID("TestAddress", 9999, true, 0);
         TrunkInvokerProxy tip = new TrunkInvokerProxy(sa);
  -      TrunkInvokerProxy tip2 = ClientSetup.setUpClient(tip);
  +      InvokerXAResource xares = new InvokerXAResource();
  +      xares.setInvoker(tip);
  +      tip.internalReadResolve();
  +      xares.internalReadResolve();
         MBeanServer server = Client.getMBeanServer();
         assertTrue("TrunkInvokerProxy should be registered",
   		 server.isRegistered(
  @@ -65,9 +69,9 @@
   		 server.isRegistered(
   		    new ObjectName("jboss.client:service=UserTransaction," 
   				   + sa.toObjectNameClause())));
  -      assertTrue("ProxyXAResource should be registered",
  +      assertTrue("InvokerXAResource should be registered",
   		 server.isRegistered(
  -		    new ObjectName("jboss.client:service=ProxyXAResource," 
  +		    new ObjectName("jboss.client:service=TrunkInvokerXAResource," 
   				   + sa.toObjectNameClause())));
         assertTrue("TrunkInvokerWorkManager should be registered",
   		 server.isRegistered(