[openejb-scm] openejb/modules/core/src/test/org/openejb/slsb StatelessInstanceInterceptorTest.java

[dain]

dain        2005/03/01 18:34:36

  Modified:    modules/core/src/test/org/openejb/slsb
                        StatelessInstanceInterceptorTest.java
  Log:

  Changed to use new TransactionManagerContext methods managing bean 
transactions
  Fixed improper handling of bean transactions in StatefulInstanceInterceptor
  Removed excessive handling of bean transactions in the SFSB and SLSB vops
  
  Revision  Changes    Path
  1.9       +9 -5      
openejb/modules/core/src/test/org/openejb/slsb/StatelessInstanceInterceptorTest.java
  
  Index: StatelessInstanceInterceptorTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/slsb/StatelessInstanceInterceptorTest.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- StatelessInstanceInterceptorTest.java     25 Feb 2005 23:06:15 -0000      
1.8
  +++ StatelessInstanceInterceptorTest.java     1 Mar 2005 23:34:36 -0000       
1.9
  @@ -56,7 +56,8 @@
   import org.apache.geronimo.core.service.Invocation;
   import org.apache.geronimo.core.service.InvocationKey;
   import org.apache.geronimo.core.service.InvocationResult;
  -import org.apache.geronimo.transaction.context.UnspecifiedTransactionContext;
  +import org.apache.geronimo.transaction.context.TransactionContextManager;
  +import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
   import junit.framework.TestCase;
   
   import org.openejb.cache.InstancePool;
  @@ -79,6 +80,8 @@
               return false;
           }
       };
  +    private TransactionManagerImpl transactionManager;
  +    private TransactionContextManager transactionContextManager;
       private MockPool pool;
       private StatelessInstanceInterceptor interceptor;
       private EJBInstanceContext ctx;
  @@ -95,10 +98,9 @@
       };
   
   
  -
       public void testNormalInvocation() throws Throwable {
           EJBInvocationImpl invocation = new 
EJBInvocationImpl(EJBInterfaceType.REMOTE, 0, null);
  -        invocation.setTransactionContext(new 
UnspecifiedTransactionContext());
  +        
invocation.setTransactionContext(transactionContextManager.newUnspecifiedTransactionContext());
           invocation.put(KEY, Boolean.FALSE);
           assertNull(interceptor.invoke(invocation));
           assertNull(invocation.getEJBInstanceContext());
  @@ -109,7 +111,7 @@
   
       public void testSystemException() throws Throwable {
           EJBInvocationImpl invocation = new 
EJBInvocationImpl(EJBInterfaceType.REMOTE, 0, null);
  -        invocation.setTransactionContext(new 
UnspecifiedTransactionContext());
  +        
invocation.setTransactionContext(transactionContextManager.newUnspecifiedTransactionContext());
           invocation.put(KEY, Boolean.TRUE);
           try {
               interceptor.invoke(invocation);
  @@ -126,6 +128,8 @@
       protected void setUp() throws Exception {
           super.setUp();
   
  +        transactionManager = new TransactionManagerImpl(10 * 1000, null, 
null);
  +        transactionContextManager = new 
TransactionContextManager(transactionManager, transactionManager);
           mockEJB = new MockEJB();
           pool = new MockPool(mockEJB);
           interceptor = new StatelessInstanceInterceptor(new 
MockInterceptor(), pool);