[jboss-cvs] JBossAS SVN: r103324 - in projects/ejb3/trunk/testsuite: src/test/java/org/jboss/ejb3/test/mdb/unit and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 31 09:03:54 EDT 2010
Author: jaikiran
Date: 2010-03-31 09:03:54 -0400 (Wed, 31 Mar 2010)
New Revision: 103324
Removed:
projects/ejb3/trunk/testsuite/src/test/resources/test/mdb/mdbtest-service.xml
Modified:
projects/ejb3/trunk/testsuite/build-test.xml
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
EJBTHREE-2057 Fixed the mdb tests to take care of HornetQ integration changes
Modified: projects/ejb3/trunk/testsuite/build-test.xml
===================================================================
--- projects/ejb3/trunk/testsuite/build-test.xml 2010-03-31 13:01:50 UTC (rev 103323)
+++ projects/ejb3/trunk/testsuite/build-test.xml 2010-03-31 13:03:54 UTC (rev 103324)
@@ -3138,12 +3138,6 @@
</fileset>
</jar>
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test/mdb">
- <include name="*.xml"/>
- </fileset>
- </copy>
-
</target>
<target name="mdbtopic"
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2010-03-31 13:01:50 UTC (rev 103323)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java 2010-03-31 13:03:54 UTC (rev 103324)
@@ -38,21 +38,19 @@
import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory;
import javax.jms.TopicSession;
-import javax.management.ObjectName;
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import junit.extensions.TestSetup;
import junit.framework.Test;
-import org.jboss.ejb3.ClientKernelAbstraction;
import org.jboss.ejb3.InitialContextFactory;
-import org.jboss.ejb3.KernelAbstractionFactory;
+import org.jboss.ejb3.test.common.EJB3TestCase;
import org.jboss.ejb3.test.mdb.Stateless;
import org.jboss.ejb3.test.mdb.TestStatus;
import org.jboss.logging.Logger;
import org.jboss.security.client.SecurityClient;
import org.jboss.security.client.SecurityClientFactory;
-import org.jboss.test.JBossTestCase;
import org.jboss.util.collection.CollectionsUtil;
/**
@@ -61,7 +59,7 @@
* @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
* @version $Id$
*/
-public class MDBUnitTestCase extends JBossTestCase
+public class MDBUnitTestCase extends EJB3TestCase
{
@SuppressWarnings("unused")
private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
@@ -80,12 +78,12 @@
private static final String PRINCIPAL_ANYONE = "anyone";
private static final String PASSWORD_PASSWORD = "password";
- private static void removeAllMessagesFromDLQ() throws Exception
- {
- ObjectName dlqName = new ObjectName("jboss.messaging.destination:name=DLQ,service=Queue");
- ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
- kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
- }
+// private static void removeAllMessagesFromDLQ() throws Exception
+// {
+// ObjectName dlqName = new ObjectName("jboss.messaging.destination:name=DLQ,service=Queue");
+// ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
+// kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
+// }
public void testOverrideQueue() throws Exception
{
@@ -329,6 +327,7 @@
cnn.close();
Thread.sleep(2000);
+ log.info("Checking bmtQueueRan");
assertEquals(1, status.bmtQueueRan());
}
@@ -375,8 +374,10 @@
Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
- removeAllMessagesFromDLQ();
- assertSize(session, dlq, 0);
+ //removeAllMessagesFromDLQ();
+ // assertSize(session, dlq, 0);
+ int initialDLQMessageCount = this.size(session, dlq);
+
TextMessage message = session.createTextMessage();
message.setStringProperty("foo", "bar");
@@ -389,7 +390,7 @@
Thread.sleep(1000 * 10);
assertSize(session, queue, 0);
- assertSize(session, dlq, 1);
+ assertSize(session, dlq, initialDLQMessageCount + 1);
MessageConsumer receiver = session.createConsumer(dlq);
message = (TextMessage) receiver.receive(1000); //.receiveNoWait();
@@ -398,8 +399,7 @@
// assertEquals("QUEUE.dlqtest", message
// .getStringProperty("JBOSS_ORIG_DESTINATION"));
// AS 5.x
- assertEquals("JBossQueue[dlqtest]", message
- .getStringProperty("JBOSS_ORIG_DESTINATION"));
+ // assertEquals("JBossQueue[dlqtest]", message.getStringProperty("JBOSS_ORIG_DESTINATION")); // disabled during migration to hornetq EJBTHREE-2057
assertEquals(0L, message.getJMSExpiration());
assertEquals(text, message.getText());
assertEquals("bar", message.getStringProperty("foo"));
@@ -458,9 +458,9 @@
Queue queue = (Queue) getInitialContext().lookup("queue/expirationmdbtest");
sender = session.createSender(queue);
- Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
+ //Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
- removeAllMessagesFromDLQ();
+ // removeAllMessagesFromDLQ();
long now = System.currentTimeMillis();
@@ -536,6 +536,7 @@
cnn.close();
Thread.sleep(2000);
+ log.info("Checking queueFired");
assertEquals(1, status.queueFired());
}
@@ -659,8 +660,50 @@
public static Test suite() throws Exception
{
- return getDeploySetup(MDBUnitTestCase.class,
- "mdbtest-service.xml, mdb-test.jar");
+ return new TestSetup(getDeploySetup(MDBUnitTestCase.class, "mdb-test.jar"))
+ {
+ @Override
+ protected void setUp() throws Exception
+ {
+ deployQueue("cmtmdbtest");
+ deployQueue("mdbtest");
+ deployQueue("defaultedmdbtest");
+ deployQueue("overridedefaultedmdbtest");
+ deployQueue("nondurablemdbtest");
+ deployQueue("bmtmdbtest");
+ deployQueue("overridequeuetest");
+ deployTopic("mdbtest");
+ deployQueue("transactionmdbtest");
+ deployQueue("expirytest");
+ deployQueue("dlqtest");
+ deployQueue("cmttxnotsupmdbtest");
+ deployQueue("expirationmdbtest");
+ deployQueue("rollbackcmtmdbtest");
+ deployQueue("mismatchedmdbtest");
+
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ undeployQueue("cmtmdbtest");
+ undeployQueue("mdbtest");
+ undeployQueue("defaultedmdbtest");
+ undeployQueue("overridedefaultedmdbtest");
+ undeployQueue("nondurablemdbtest");
+ undeployQueue("bmtmdbtest");
+ undeployQueue("overridequeuetest");
+ undeployTopic("mdbtest");
+ undeployQueue("transactionmdbtest");
+ undeployQueue("expirytest");
+ undeployQueue("dlqtest");
+ undeployQueue("cmttxnotsupmdbtest");
+ undeployQueue("expirationmdbtest");
+ undeployQueue("rollbackcmtmdbtest");
+ undeployQueue("mismatchedmdbtest");
+
+ }
+ };
}
}
\ No newline at end of file
Deleted: projects/ejb3/trunk/testsuite/src/test/resources/test/mdb/mdbtest-service.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/mdb/mdbtest-service.xml 2010-03-31 13:01:50 UTC (rev 103323)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/mdb/mdbtest-service.xml 2010-03-31 13:03:54 UTC (rev 103324)
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=cmtmdbtest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/cmtmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=queuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/mdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=defaultedqueuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/defaultedmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=overridedefaultedqueuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/overridedefaultedmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=nondurablequeuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/nondurablemdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=bmtqueuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/bmtmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=overridequeuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/overridequeuetest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.TopicService"
- name="jboss.messaging.destination:service=Topic,name=topictest"
- xmbean-dd="xmdesc/Topic-xmbean.xml">
- <attribute name="JNDIName">topic/mdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=transactionmdbtest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/transactionmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=expirytest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/expirytest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=dlqtest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/dlqtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=cmttxnotsupmdbtest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/cmttxnotsupmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=expirationmdbtest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/expirationmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=rollbackcmtmdbtest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/rollbackcmtmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-
- <mbean code="org.jboss.jms.server.destination.QueueService"
- name="jboss.messaging.destination:service=Queue,name=mismatchedqueuetest"
- xmbean-dd="xmdesc/Queue-xmbean.xml">
- <attribute name="JNDIName">queue/mismatchedmdbtest</attribute>
- <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
- <depends>jboss.messaging:service=PostOffice</depends>
- </mbean>
-</server>
More information about the jboss-cvs-commits
mailing list