djencks 2004/07/18 18:32:27
Modified: modules/core/src/test/org/openejb/entity
BasicBMPEntityContainerTest.java
BasicCMPEntityContainerTest.java
Log:
Add timer support to session and mdbs. (entities still todo). Adapt to
TransactionContextManager. Adapt to deploying with external plan.
Revision Changes Path
1.8 +11 -23
openejb/modules/core/src/test/org/openejb/entity/BasicBMPEntityContainerTest.java
Index: BasicBMPEntityContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/entity/BasicBMPEntityContainerTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BasicBMPEntityContainerTest.java 15 Jul 2004 03:34:20 -0000 1.7
+++ BasicBMPEntityContainerTest.java 18 Jul 2004 22:32:27 -0000 1.8
@@ -65,20 +65,19 @@
import org.openejb.entity.bmp.BMPContainerBuilder;
import org.openejb.transaction.ContainerPolicy;
import org.openejb.transaction.TransactionPolicy;
+import org.openejb.DeploymentHelper;
/**
* @version $Revision$ $Date$
*/
public class BasicBMPEntityContainerTest extends TestCase {
private static final ObjectName CONTAINER_NAME =
JMXUtil.getObjectName("geronimo.test:ejb=Mock");
- private static final ObjectName TM_NAME =
JMXUtil.getObjectName("geronimo.test:role=TransactionManager");
- private static final ObjectName TCA_NAME =
JMXUtil.getObjectName("geronimo.test:role=TrackedConnectionAssociator");
private Kernel kernel;
private GBeanMBean container;
public void testSimpleConfig() throws Throwable {
- MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "EJBHome");
+ MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "ejbHome");
assertEquals(5 + 1, home.intMethod(5));
EJBObject ejbObject1 = home.findByPrimaryKey(new Integer(1));
@@ -95,7 +94,7 @@
}
public void testRemoteInvoke() throws Exception {
- MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "EJBHome");
+ MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "ejbHome");
assertEquals(2, home.intMethod(1));
MockRemote remote = home.findByPrimaryKey(new Integer(1));
@@ -103,7 +102,7 @@
}
public void testLocalInvoke() throws Exception {
- MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"EJBLocalHome");
+ MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"ejbLocalHome");
assertEquals(2, home.intMethod(1));
@@ -113,13 +112,13 @@
}
public void testLocalCreate() throws Exception {
- MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"EJBLocalHome");
+ MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"ejbLocalHome");
MockLocal local = home.create(new Integer(1), null);
assertEquals(new Integer(1), local.getPrimaryKey());
}
public void testLocalRemove() throws Exception {
- MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"EJBLocalHome");
+ MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"ejbLocalHome");
home.remove(new Integer(1));
MockLocal local = home.create(new Integer(1), null);
@@ -128,6 +127,8 @@
protected void setUp() throws Exception {
super.setUp();
+ kernel =
DeploymentHelper.setUpKernelWithTransactionManager("BeanManagedPersistenceTest");
+ DeploymentHelper.setUpTimer(kernel);
BMPContainerBuilder builder = new BMPContainerBuilder();
builder.setClassLoader(this.getClass().getClassLoader());
@@ -150,27 +151,14 @@
builder.setComponentContext(new ReadOnlyContext());
container = builder.createConfiguration();
- kernel = new Kernel("BeanManagedPersistenceTest");
- kernel.boot();
-
- GBeanMBean tmGBean = new GBeanMBean(GeronimoTransactionManager.GBEAN_INFO);
- Set rmpatterns = new HashSet();
-
rmpatterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*"));
- tmGBean.setReferencePatterns("ResourceManagers", rmpatterns);
- start(TM_NAME, tmGBean);
- GBeanMBean trackedConnectionAssociator = new
GBeanMBean(ConnectionTrackingCoordinator.GBEAN_INFO);
- start(TCA_NAME, trackedConnectionAssociator);
-
//start the ejb container
- container.setReferencePatterns("TransactionManager",
Collections.singleton(TM_NAME));
- container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(TCA_NAME));
+ container.setReferencePatterns("TransactionContextManager",
Collections.singleton(DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME));
+ container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME));
start(CONTAINER_NAME, container);
}
protected void tearDown() throws Exception {
stop(CONTAINER_NAME);
- stop(TCA_NAME);
- stop(TM_NAME);
kernel.shutdown();
}
1.17 +15 -25
openejb/modules/core/src/test/org/openejb/entity/BasicCMPEntityContainerTest.java
Index: BasicCMPEntityContainerTest.java
===================================================================
RCS file:
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/entity/BasicCMPEntityContainerTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BasicCMPEntityContainerTest.java 15 Jul 2004 03:34:20 -0000 1.16
+++ BasicCMPEntityContainerTest.java 18 Jul 2004 22:32:27 -0000 1.17
@@ -72,6 +72,7 @@
import org.apache.geronimo.transaction.GeronimoTransactionManager;
import org.axiondb.jdbc.AxionDataSource;
import org.openejb.ContainerIndex;
+import org.openejb.DeploymentHelper;
import org.openejb.deployment.MockConnectionProxyFactory;
import org.openejb.deployment.TransactionPolicySource;
import org.openejb.dispatch.InterfaceMethodSignature;
@@ -91,8 +92,6 @@
*/
public class BasicCMPEntityContainerTest extends TestCase {
private static final ObjectName CONTAINER_NAME =
JMXUtil.getObjectName("geronimo.test:ejb=Mock");
- private static final ObjectName TM_NAME =
JMXUtil.getObjectName("geronimo.test:role=TransactionManager");
- private static final ObjectName TCA_NAME =
JMXUtil.getObjectName("geronimo.test:role=TrackedConnectionAssociator");
private static final ObjectName CI_NAME =
JMXUtil.getObjectName("geronimo.test:role=ContainerIndex");
private Kernel kernel;
private GBeanMBean container;
@@ -100,7 +99,7 @@
private DataSource ds;
public void testLocalInvoke() throws Exception {
- MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"EJBLocalHome");
+ MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"ejbLocalHome");
assertEquals(2, home.intMethod(1));
Integer pk = new Integer(33);
@@ -119,7 +118,7 @@
}
public void testRemoteInvoke() throws Exception {
- MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "EJBHome");
+ MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "ejbHome");
assertEquals(2, home.intMethod(1));
Integer pk = new Integer(33);
@@ -138,7 +137,7 @@
}
public void testFields() throws Exception {
- MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"EJBLocalHome");
+ MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"ejbLocalHome");
MockLocal local = home.findByPrimaryKey(new Integer(1));
assertEquals("Hello", local.getValue());
local.setValue("World");
@@ -166,7 +165,7 @@
rs.close();
// add new
- MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"EJBLocalHome");
+ MockLocalHome home = (MockLocalHome) kernel.getAttribute(CONTAINER_NAME,
"ejbLocalHome");
MockLocal local = home.create(new Integer(2), "Hello");
rs = s.executeQuery("SELECT VALUE FROM MOCK WHERE ID=2");
assertTrue(rs.next());
@@ -239,7 +238,7 @@
rs.close();
// add new
- MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "EJBHome");
+ MockHome home = (MockHome) kernel.getAttribute(CONTAINER_NAME, "ejbHome");
MockRemote remote = home.create(new Integer(2), "Hello");
rs = s.executeQuery("SELECT VALUE FROM MOCK WHERE ID=2");
assertTrue(rs.next());
@@ -381,6 +380,10 @@
// cmpConfig.relations = new CMRelation[]{};
// cmpConfig.schema = "Mock";
+ kernel =
DeploymentHelper.setUpKernelWithTransactionManager("ContainerManagedPersistenceTest");
+ DeploymentHelper.setUpTimer(kernel);
+
+
CMPContainerBuilder builder = new CMPContainerBuilder();
builder.setClassLoader(this.getClass().getClassLoader());
builder.setContainerId(CONTAINER_NAME.getCanonicalName());
@@ -404,7 +407,7 @@
builder.setEJBSchema(ejbSchema);
builder.setSQLSchema(sqlSchema);
builder.setComponentContext(new ReadOnlyContext());
- builder.setConnectionFactoryName("DefaultDatasource");
+ builder.setConnectionFactoryName("defaultDatasource");
EJBProxyFactory proxyFactory = new
EJBProxyFactory(CONTAINER_NAME.getCanonicalName(), false, MockRemote.class,
MockHome.class, MockLocal.class, MockLocalHome.class);
EJB ejb = new EJB("MockEJB", "MOCK", proxyFactory);
@@ -423,18 +426,6 @@
container = builder.createConfiguration();
- kernel = new Kernel("ContainerManagedPersistenceTest");
- kernel.boot();
-
- GBeanMBean tmGBean = new GBeanMBean(GeronimoTransactionManager.GBEAN_INFO);
- Set rmpatterns = new HashSet();
-
rmpatterns.add(ObjectName.getInstance("geronimo.server:j2eeType=JCAManagedConnectionFactory,*"));
- tmGBean.setReferencePatterns("ResourceManagers", rmpatterns);
- start(TM_NAME, tmGBean);
-
- GBeanMBean trackedConnectionAssociator = new
GBeanMBean(ConnectionTrackingCoordinator.GBEAN_INFO);
- start(TCA_NAME, trackedConnectionAssociator);
-
GBeanMBean containerIndex = new GBeanMBean(ContainerIndex.GBEAN_INFO);
containerIndex.setReferencePatterns("EJBContainers",
Collections.singleton(CONTAINER_NAME));
start(CI_NAME, containerIndex);
@@ -445,14 +436,13 @@
kernel.startGBean(connectionProxyFactoryObjectName);
//start the ejb container
- container.setReferencePatterns("TransactionManager",
Collections.singleton(TM_NAME));
- container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(TCA_NAME));
+ container.setReferencePatterns("TransactionContextManager",
Collections.singleton(DeploymentHelper.TRANSACTIONCONTEXTMANAGER_NAME));
+ container.setReferencePatterns("TrackedConnectionAssociator",
Collections.singleton(DeploymentHelper.TRACKEDCONNECTIONASSOCIATOR_NAME));
+
start(CONTAINER_NAME, container);
}
protected void tearDown() throws Exception {
- stop(TM_NAME);
- stop(TCA_NAME);
stop(CONTAINER_NAME);
kernel.shutdown();
java.sql.Connection c = ds.getConnection();
