[jboss-cvs] JBossAS SVN: r103268 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/mdbtransactions/unit and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 30 10:49:16 EDT 2010
Author: jaikiran
Date: 2010-03-30 10:49:16 -0400 (Tue, 30 Mar 2010)
New Revision: 103268
Removed:
projects/ejb3/trunk/testsuite/src/test/resources/test/mdbtransactions/mdbtransactionstest-service.xml
Modified:
projects/ejb3/trunk/testsuite/build-test.xml
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
Log:
EJBTHREE-2057 Fixed the mdbtransactions testcase to take care of HornetQ integration changes
Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml 2010-03-30 14:48:40 UTC (rev 103267)
+++ projects/ejb3/trunk/testsuite/build-test.xml 2010-03-30 14:49:16 UTC (rev 103268)
@@ -2970,11 +2970,6 @@
</fileset>
</jar>
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test/mdbtransactions">
- <include name="*.xml"/>
- </fileset>
- </copy>
</target>
<target name="lifecycle" >
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java 2010-03-30 14:48:40 UTC (rev 103267)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java 2010-03-30 14:49:16 UTC (rev 103268)
@@ -21,35 +21,34 @@
*/
package org.jboss.ejb3.test.mdbtransactions.unit;
-import java.util.Enumeration;
-
import javax.jms.Message;
+import javax.jms.ObjectMessage;
import javax.jms.Queue;
-import javax.jms.QueueBrowser;
import javax.jms.QueueConnection;
import javax.jms.QueueConnectionFactory;
import javax.jms.QueueReceiver;
import javax.jms.QueueSender;
import javax.jms.QueueSession;
-import javax.jms.ObjectMessage;
import javax.jms.TextMessage;
-
import javax.naming.InitialContext;
-import javax.naming.NamingException;
+import junit.extensions.TestSetup;
+import junit.framework.Test;
+
import org.jboss.ejb3.InitialContextFactory;
import org.jboss.ejb3.test.mdbtransactions.Entity;
import org.jboss.ejb3.test.mdbtransactions.StatelessFacade;
import org.jboss.ejb3.test.mdbtransactions.TestStatus;
import org.jboss.logging.Logger;
-import org.jboss.test.JBossTestCase;
+import org.jboss.test.JBossJMSTestCase;
-import junit.framework.Test;
-
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
-public class MDBUnitTestCase extends JBossTestCase
+// extending from EJB3TestCase doesn't work because EJB3TestCase has a final method testServerFound() which
+// checks for failed deployments. This MDBUnitTestCase intentionally deploys a MDB which is expected
+// to fail (BadCreationMDB). Extending from EJB3TestCase will result in the test being marked as a erroneous.
+public class MDBUnitTestCase extends JBossJMSTestCase
{
private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
@@ -289,8 +288,32 @@
public static Test suite() throws Exception
{
- return getDeploySetup(MDBUnitTestCase.class,
- "mdbtransactionstest-service.xml, mdbtransactions-test.jar");
+ return new TestSetup(getDeploySetup(MDBUnitTestCase.class, "mdbtransactions-test.jar"))
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ deployQueue("mdbtest");
+ deployQueue("badcreationmdb");
+ deployQueue("rollbackmdbtest");
+ deployQueue("mdb21test");
+ deployQueue("A");
+ deployQueue("B");
+ deployQueue("C");
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ undeployQueue("mdbtest");
+ undeployQueue("badcreationmdb");
+ undeployQueue("rollbackmdbtest");
+ undeployQueue("mdb21test");
+ undeployQueue("A");
+ undeployQueue("B");
+ undeployQueue("C");
+ }
+ };
}
}
\ No newline at end of file
Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/mdbtransactions/mdbtransactionstest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/mdbtransactions/mdbtransactionstest-service.xml 2010-03-30 14:48:40 UTC (rev 103267)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/mdbtransactions/mdbtransactionstest-service.xml 2010-03-30 14:49:16 UTC (rev 103268)
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=queuetest">
- <attribute name="JNDIName">queue/mdbtest</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=badcreationtest">
- <attribute name="JNDIName">queue/badcreationmdb</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=rollbackqueuetest">
- <attribute name="JNDIName">queue/rollbackmdbtest</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=queue21test">
- <attribute name="JNDIName">queue/mdb21test</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-
- <!-- there have nothing to do with the test itself, just to test preconditions -->
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=A">
- <attribute name="JNDIName">queue/A</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=B">
- <attribute name="JNDIName">queue/B</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=C">
- <attribute name="JNDIName">queue/C</attribute>
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-</server>
More information about the jboss-cvs-commits
mailing list