djencks 2005/02/04 21:36:25
Modified: modules/openejb-builder/src/test/org/openejb/deployment
BMPSystemMethodIndicesTest.java
CMPSystemMethodIndicesTest.java
MessageDrivenSystemMethodIndicesTest.java
StatelessSystemMethodIndicesTest.java
StatelfulSystemMethodIndicesTest.java
Log:
Don't try to construct invalid EJBInvocations, or expect an AssertionError if
you do.
Revision Changes Path
1.2 +14 -7
openejb/modules/openejb-builder/src/test/org/openejb/deployment/BMPSystemMethodIndicesTest.java
Index: BMPSystemMethodIndicesTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/BMPSystemMethodIndicesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BMPSystemMethodIndicesTest.java 10 Nov 2004 01:35:10 -0000 1.1
+++ BMPSystemMethodIndicesTest.java 5 Feb 2005 02:36:25 -0000 1.2
@@ -48,12 +48,18 @@
package org.openejb.deployment;
import java.util.Map;
+import java.util.Set;
+import javax.ejb.EnterpriseBean;
import javax.ejb.EntityContext;
+import javax.ejb.TimerService;
import junit.framework.TestCase;
+import org.openejb.EJBInstanceContext;
+import org.openejb.EJBOperation;
import org.openejb.deployment.entity.MockBMPEJB;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.dispatch.SystemMethodIndices;
+import org.openejb.proxy.EJBProxyFactory;
/**
*
@@ -69,11 +75,12 @@
Map vopMap = builder.buildVopMap(MockBMPEJB.class);
InterfaceMethodSignature[] signatures = (InterfaceMethodSignature[])
vopMap.keySet().toArray(new InterfaceMethodSignature[vopMap.size()]);
SystemMethodIndices systemMethodIndices =
SystemMethodIndices.createSystemMethodIndices(signatures, "setEntityContext",
new String(EntityContext.class.getName()), "unsetEntityContext");
-
assertFalse(systemMethodIndices.getEjbActivateInvocation(null).getMethodIndex()
== -1);
-
assertFalse(systemMethodIndices.getEjbLoadInvocation(null).getMethodIndex() ==
-1);
-
assertFalse(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex()
== -1);
-
assertFalse(systemMethodIndices.getEjbStoreInvocation(null).getMethodIndex() ==
-1);
- assertFalse(systemMethodIndices.getSetContextInvocation(null,
null).getMethodIndex() == -1);
-
assertFalse(systemMethodIndices.getUnsetContextInvocation(null).getMethodIndex()
== -1);
+ EJBInstanceContext ctx = MockEJBInstanceContext.INSTANCE;
+
assertFalse(systemMethodIndices.getEjbActivateInvocation(ctx).getMethodIndex()
== -1);
+
assertFalse(systemMethodIndices.getEjbLoadInvocation(ctx).getMethodIndex() ==
-1);
+
assertFalse(systemMethodIndices.getEjbPassivateInvocation(ctx).getMethodIndex()
== -1);
+
assertFalse(systemMethodIndices.getEjbStoreInvocation(ctx).getMethodIndex() ==
-1);
+ assertFalse(systemMethodIndices.getSetContextInvocation(ctx,
null).getMethodIndex() == -1);
+
assertFalse(systemMethodIndices.getUnsetContextInvocation(ctx).getMethodIndex()
== -1);
}
}
1.5 +9 -7
openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPSystemMethodIndicesTest.java
Index: CMPSystemMethodIndicesTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/CMPSystemMethodIndicesTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CMPSystemMethodIndicesTest.java 2 Feb 2005 12:53:08 -0000 1.4
+++ CMPSystemMethodIndicesTest.java 5 Feb 2005 02:36:25 -0000 1.5
@@ -57,6 +57,7 @@
import org.openejb.deployment.entity.MockCMPEJB;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.dispatch.SystemMethodIndices;
+import org.openejb.EJBInstanceContext;
import org.tranql.cache.CacheSlot;
import org.tranql.cache.CacheTable;
@@ -74,11 +75,12 @@
Map vopMap = builder.buildVopMap(MockCMPEJB.class, new
CacheTable("mock", new CacheSlot[0], null, null, null, null),
Collections.EMPTY_MAP, null, null, null, null, null, null, new HashMap());
InterfaceMethodSignature[] signatures = (InterfaceMethodSignature[])
vopMap.keySet().toArray(new InterfaceMethodSignature[vopMap.size()]);
SystemMethodIndices systemMethodIndices =
SystemMethodIndices.createSystemMethodIndices(signatures, "setEntityContext",
new String(EntityContext.class.getName()), "unsetEntityContext");
-
assertFalse(systemMethodIndices.getEjbActivateInvocation(null).getMethodIndex()
== -1);
-
assertFalse(systemMethodIndices.getEjbLoadInvocation(null).getMethodIndex() ==
-1);
-
assertFalse(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex()
== -1);
-
assertFalse(systemMethodIndices.getEjbStoreInvocation(null).getMethodIndex() ==
-1);
- assertFalse(systemMethodIndices.getSetContextInvocation(null,
null).getMethodIndex() == -1);
-
assertFalse(systemMethodIndices.getUnsetContextInvocation(null).getMethodIndex()
== -1);
+ EJBInstanceContext ctx = MockEJBInstanceContext.INSTANCE;
+
assertFalse(systemMethodIndices.getEjbActivateInvocation(ctx).getMethodIndex()
== -1);
+
assertFalse(systemMethodIndices.getEjbLoadInvocation(ctx).getMethodIndex() ==
-1);
+
assertFalse(systemMethodIndices.getEjbPassivateInvocation(ctx).getMethodIndex()
== -1);
+
assertFalse(systemMethodIndices.getEjbStoreInvocation(ctx).getMethodIndex() ==
-1);
+ assertFalse(systemMethodIndices.getSetContextInvocation(ctx,
null).getMethodIndex() == -1);
+
assertFalse(systemMethodIndices.getUnsetContextInvocation(ctx).getMethodIndex()
== -1);
}
}
1.2 +35 -12
openejb/modules/openejb-builder/src/test/org/openejb/deployment/MessageDrivenSystemMethodIndicesTest.java
Index: MessageDrivenSystemMethodIndicesTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/test/org/openejb/deployment/MessageDrivenSystemMethodIndicesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessageDrivenSystemMethodIndicesTest.java 10 Nov 2004 01:35:10 -0000
1.1
+++ MessageDrivenSystemMethodIndicesTest.java 5 Feb 2005 02:36:25 -0000
1.2
@@ -54,13 +54,11 @@
import org.openejb.deployment.mdb.MockEJB;
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.dispatch.SystemMethodIndices;
+import org.openejb.EJBInstanceContext;
/**
- *
- *
* @version $Revision$ $Date$
- *
- * */
+ */
public class MessageDrivenSystemMethodIndicesTest extends TestCase {
public void testSystemMethodIndices() throws Exception {
@@ -69,11 +67,36 @@
Map vopMap = builder.buildVopMap(MockEJB.class);
InterfaceMethodSignature[] signatures = (InterfaceMethodSignature[])
vopMap.keySet().toArray(new InterfaceMethodSignature[vopMap.size()]);
SystemMethodIndices systemMethodIndices =
SystemMethodIndices.createSystemMethodIndices(signatures,
"setMessageDrivenContext", new String(MessageDrivenContext.class.getName()),
null);
-
assertTrue(systemMethodIndices.getEjbActivateInvocation(null).getMethodIndex()
== -1);
-
assertTrue(systemMethodIndices.getEjbLoadInvocation(null).getMethodIndex() ==
-1);
-
assertTrue(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex()
== -1);
-
assertTrue(systemMethodIndices.getEjbStoreInvocation(null).getMethodIndex() ==
-1);
- assertFalse(systemMethodIndices.getSetContextInvocation(null,
null).getMethodIndex() == -1);
-
assertTrue(systemMethodIndices.getUnsetContextInvocation(null).getMethodIndex()
== -1);
+ EJBInstanceContext ctx = MockEJBInstanceContext.INSTANCE;
+ try {
+
assertTrue(systemMethodIndices.getEjbActivateInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbLoadInvocation(ctx).getMethodIndex() ==
-1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbPassivateInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbStoreInvocation(ctx).getMethodIndex() ==
-1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+ assertFalse(systemMethodIndices.getSetContextInvocation(ctx,
null).getMethodIndex() == -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getUnsetContextInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
}
-}
+}
\ No newline at end of file
1.3 +30 -11
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatelessSystemMethodIndicesTest.java 26 Jan 2005 23:28:02 -0000
1.2
+++ StatelessSystemMethodIndicesTest.java 5 Feb 2005 02:36:25 -0000
1.3
@@ -54,13 +54,11 @@
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.dispatch.SystemMethodIndices;
import org.openejb.deployment.slsb.MockEJB;
+import org.openejb.EJBInstanceContext;
/**
- *
- *
* @version $Revision$ $Date$
- *
- * */
+ */
public class StatelessSystemMethodIndicesTest extends TestCase {
public void testSystemMethodIndices() throws Exception {
@@ -69,11 +67,32 @@
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);
-
assertTrue(systemMethodIndices.getEjbActivateInvocation(null).getMethodIndex()
== -1);
-
assertTrue(systemMethodIndices.getEjbLoadInvocation(null).getMethodIndex() ==
-1);
-
assertTrue(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex()
== -1);
-
assertTrue(systemMethodIndices.getEjbStoreInvocation(null).getMethodIndex() ==
-1);
- assertTrue(systemMethodIndices.getSetContextInvocation(null,
null).getMethodIndex() != -1);
-
assertTrue(systemMethodIndices.getUnsetContextInvocation(null).getMethodIndex()
== -1);
+ EJBInstanceContext ctx = MockEJBInstanceContext.INSTANCE;
+ try {
+
assertTrue(systemMethodIndices.getEjbActivateInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbLoadInvocation(ctx).getMethodIndex() ==
-1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbPassivateInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbStoreInvocation(ctx).getMethodIndex() ==
-1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ assertTrue(systemMethodIndices.getSetContextInvocation(ctx,
null).getMethodIndex() != -1);
+ try {
+
assertTrue(systemMethodIndices.getUnsetContextInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
}
}
1.3 +34 -11
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StatelfulSystemMethodIndicesTest.java 26 Jan 2005 23:28:02 -0000
1.2
+++ StatelfulSystemMethodIndicesTest.java 5 Feb 2005 02:36:25 -0000
1.3
@@ -54,13 +54,11 @@
import org.openejb.dispatch.InterfaceMethodSignature;
import org.openejb.dispatch.SystemMethodIndices;
import org.openejb.deployment.slsb.MockEJB;
+import org.openejb.EJBInstanceContext;
/**
- *
- *
* @version $Revision$ $Date$
- *
- * */
+ */
public class StatelfulSystemMethodIndicesTest extends TestCase {
public void testSystemMethodIndices() throws Exception {
@@ -69,11 +67,36 @@
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.getEjbLoadInvocation(null).getMethodIndex() ==
-1);
-
assertFalse(systemMethodIndices.getEjbPassivateInvocation(null).getMethodIndex()
== -1);
-
assertTrue(systemMethodIndices.getEjbStoreInvocation(null).getMethodIndex() ==
-1);
- assertFalse(systemMethodIndices.getSetContextInvocation(null,
null).getMethodIndex() == -1);
-
assertTrue(systemMethodIndices.getUnsetContextInvocation(null).getMethodIndex()
== -1);
+ EJBInstanceContext ctx = MockEJBInstanceContext.INSTANCE;
+ try {
+
assertFalse(systemMethodIndices.getEjbActivateInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbLoadInvocation(ctx).getMethodIndex() ==
-1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertFalse(systemMethodIndices.getEjbPassivateInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getEjbStoreInvocation(ctx).getMethodIndex() ==
-1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+ assertFalse(systemMethodIndices.getSetContextInvocation(ctx,
null).getMethodIndex() == -1);
+ } catch (AssertionError e) {
+ //expected
+ }
+ try {
+
assertTrue(systemMethodIndices.getUnsetContextInvocation(ctx).getMethodIndex()
== -1);
+ } catch (AssertionError e) {
+ //expected
+ }
}
}
