[openejb-scm] openejb/modules/openejb-builder/src/test/org/openejb/deployment StatelessSystemMethodIndicesTest.java StatelfulSystemMethodIndicesTest.java

[dain]

dain        2005/01/26 18:28:02

  Modified:    modules/openejb-builder/src/test/org/openejb/deployment
                        StatelessSystemMethodIndicesTest.java
                        StatelfulSystemMethodIndicesTest.java
  Log:

  ENC is now passed around as a Map instead of a jndi Context.  This allows the 
ejb container to modify it and inject the kernel and class loader into 
references.
  Changed Stateless and MDB containers to use system chain for ejbCreate and 
ejbRemove invocations.
  Added test to verify that ejbRemove is propertly called from the cache code.
  
  Revision  Changes    Path
  1.2       +5 -5      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/StatelessSystemMethodIndicesTest.java
  
  Index: StatelessSystemMethodIndicesTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/StatelessSystemMethodIndicesTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatelessSystemMethodIndicesTest.java     10 Nov 2004 01:35:10 -0000      
1.1
  +++ StatelessSystemMethodIndicesTest.java     26 Jan 2005 23:28:02 -0000      
1.2
  @@ -53,7 +53,7 @@
   import junit.framework.TestCase;
   import org.openejb.dispatch.InterfaceMethodSignature;
   import org.openejb.dispatch.SystemMethodIndices;
  -import org.openejb.slsb.MockEJB;
  +import org.openejb.deployment.slsb.MockEJB;
   
   /**
    *
  @@ -69,11 +69,11 @@
           Map vopMap = builder.buildVopMap(MockEJB.class);
           InterfaceMethodSignature[] signatures = (InterfaceMethodSignature[]) 
vopMap.keySet().toArray(new InterfaceMethodSignature[vopMap.size()]);
           SystemMethodIndices systemMethodIndices = 
SystemMethodIndices.createSystemMethodIndices(signatures, "setSessionContext", 
new String(SessionContext.class.getName()), null);
  -        
assertFalse(systemMethodIndices.getEjbActivateInvocation(null).getMethodIndex() 
== -1);
  +        
assertTrue(systemMethodIndices.getEjbActivateInvocation(null).getMethodIndex() 
== -1);
           
assertTrue(systemMethodIndices.getEjbLoadInvocation(null).getMethodIndex() == 
-1);
  -        
assertFalse(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex()
 == -1);
  +        
assertTrue(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex() 
== -1);
           
assertTrue(systemMethodIndices.getEjbStoreInvocation(null).getMethodIndex() == 
-1);
  -        assertFalse(systemMethodIndices.getSetContextInvocation(null, 
null).getMethodIndex() == -1);
  +        assertTrue(systemMethodIndices.getSetContextInvocation(null, 
null).getMethodIndex() != -1);
           
assertTrue(systemMethodIndices.getUnsetContextInvocation(null).getMethodIndex() 
== -1);
       }
   }
  
  
  
  1.2       +2 -2      
openejb/modules/openejb-builder/src/test/org/openejb/deployment/StatelfulSystemMethodIndicesTest.java
  
  Index: StatelfulSystemMethodIndicesTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/StatelfulSystemMethodIndicesTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- StatelfulSystemMethodIndicesTest.java     10 Nov 2004 01:35:10 -0000      
1.1
  +++ StatelfulSystemMethodIndicesTest.java     26 Jan 2005 23:28:02 -0000      
1.2
  @@ -53,7 +53,7 @@
   import junit.framework.TestCase;
   import org.openejb.dispatch.InterfaceMethodSignature;
   import org.openejb.dispatch.SystemMethodIndices;
  -import org.openejb.slsb.MockEJB;
  +import org.openejb.deployment.slsb.MockEJB;
   
   /**
    *