[jboss-cvs] JBossAS SVN: r78704 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test: common and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 19 07:36:15 EDT 2008
Author: wolfc
Date: 2008-09-19 07:36:14 -0400 (Fri, 19 Sep 2008)
New Revision: 78704
Added:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/
Modified:
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21Bean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21Home.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStatefulBean.java
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/unit/PreDestroyCallsTestCase.java
Log:
EJBTHREE-670: unit test in core
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java 2008-09-19 10:30:09 UTC (rev 78703)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -24,6 +24,9 @@
import java.net.URL;
import java.util.Hashtable;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+
import org.jboss.aop.AspectManager;
import org.jboss.aop.AspectXmlLoader;
import org.jboss.aop.Domain;
@@ -67,6 +70,8 @@
private static final String OBJECT_STORE_NAME_PM_FACTORY_REGISTRY = "EJB3PersistenceManagerFactoryRegistry";
+ private static InitialContext initialContext;
+
/**
* Types of Containers Supported
*/
@@ -77,6 +82,10 @@
@AfterClass
public static void afterClass() throws Exception
{
+ if(initialContext != null)
+ initialContext.close();
+ initialContext = null;
+
URL url = Thread.currentThread().getContextClassLoader().getResource("ejb3-interceptors-aop.xml");
if (url != null)
AspectXmlLoader.undeployXML(url);
@@ -112,6 +121,8 @@
throw new IllegalStateException("Can't find ejb3-interceptors-aop.xml on class loader "
+ Thread.currentThread().getContextClassLoader());
AspectXmlLoader.deployXML(url);
+
+ initialContext = new InitialContext();
}
private static void deploy(String resourceName)
@@ -136,6 +147,11 @@
return (Domain) domainDef.getManager();
}
+ protected static InitialContext getInitialContext()
+ {
+ return initialContext;
+ }
+
/**
* Creates and deploys a Session EJB represented by the specified implementation class
*
@@ -259,7 +275,11 @@
return container;
}
-
+ protected static <T> T lookup(String name, Class<T> type) throws NamingException
+ {
+ return type.cast(getInitialContext().lookup(name));
+ }
+
/**
* Deploys, registers the specified Session Container
*
Copied: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670 (from rev 78696, projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670)
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670/MyStateful.java 2008-09-19 07:13:28 UTC (rev 78696)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.regression.ejbthree670;
+package org.jboss.ejb3.core.test.ejbthree670;
/**
* Comment
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21.java 2008-09-19 07:13:28 UTC (rev 78696)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.regression.ejbthree670;
+package org.jboss.ejb3.core.test.ejbthree670;
import javax.ejb.EJBObject;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21Bean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Bean.java 2008-09-19 07:13:28 UTC (rev 78696)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21Bean.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.regression.ejbthree670;
+package org.jboss.ejb3.core.test.ejbthree670;
import java.rmi.RemoteException;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21Home.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670/MyStateful21Home.java 2008-09-19 07:13:28 UTC (rev 78696)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStateful21Home.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.regression.ejbthree670;
+package org.jboss.ejb3.core.test.ejbthree670;
import java.rmi.RemoteException;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStatefulBean.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670/MyStatefulBean.java 2008-09-19 07:13:28 UTC (rev 78696)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/MyStatefulBean.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.regression.ejbthree670;
+package org.jboss.ejb3.core.test.ejbthree670;
import javax.annotation.PreDestroy;
import javax.ejb.Remote;
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/unit/PreDestroyCallsTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/regression/ejbthree670/unit/PreDestroyCallsTestCase.java 2008-09-19 07:13:28 UTC (rev 78696)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/ejbthree670/unit/PreDestroyCallsTestCase.java 2008-09-19 11:36:14 UTC (rev 78704)
@@ -19,29 +19,47 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.ejb3.test.regression.ejbthree670.unit;
+package org.jboss.ejb3.core.test.ejbthree670.unit;
-import junit.framework.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
-import org.jboss.ejb3.test.regression.ejbthree670.MyStateful;
-import org.jboss.ejb3.test.regression.ejbthree670.MyStateful21;
-import org.jboss.ejb3.test.regression.ejbthree670.MyStateful21Home;
-import org.jboss.test.JBossTestCase;
+import javax.transaction.TransactionManager;
+import org.jboss.ejb3.core.test.common.AbstractEJB3TestCase;
+import org.jboss.ejb3.core.test.ejbthree670.MyStateful;
+import org.jboss.ejb3.core.test.ejbthree670.MyStateful21;
+import org.jboss.ejb3.core.test.ejbthree670.MyStateful21Bean;
+import org.jboss.ejb3.core.test.ejbthree670.MyStateful21Home;
+import org.jboss.ejb3.core.test.ejbthree670.MyStatefulBean;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
/**
* Comment
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision: $
*/
-public class PreDestroyCallsTestCase extends JBossTestCase
+public class PreDestroyCallsTestCase extends AbstractEJB3TestCase
{
-
- public PreDestroyCallsTestCase(String name)
+ @AfterClass
+ public static void afterClass() throws Exception
{
- super(name);
+ AbstractEJB3TestCase.afterClass();
}
-
+
+ @BeforeClass
+ public static void beforeClass() throws Exception
+ {
+ AbstractEJB3TestCase.beforeClass();
+
+ deploySessionEjb(MyStatefulBean.class);
+ deploySessionEjb(MyStateful21Bean.class);
+ }
+
+ @Test
public void test1() throws Exception
{
MyStateful session = (MyStateful) getInitialContext().lookup("MyStatefulBean/remote");
@@ -60,6 +78,7 @@
}
}
+ @Test
public void test21() throws Exception
{
MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/home");
@@ -79,6 +98,7 @@
}
}
+ @Test
public void testRemoveByHandle() throws Exception
{
MyStateful21Home home = (MyStateful21Home) getInitialContext().lookup("MyStateful21Bean/home");
@@ -98,8 +118,18 @@
}
}
- public static Test suite() throws Exception
+ @Test
+ public void testWithInTransaction() throws Exception
{
- return getDeploySetup(PreDestroyCallsTestCase.class, "ejbthree670.jar");
+ TransactionManager tm = lookup("java:/TransactionManager", TransactionManager.class);
+ tm.begin();
+ try
+ {
+ test1();
+ }
+ finally
+ {
+ tm.rollback();
+ }
}
}
More information about the jboss-cvs-commits
mailing list