[jboss-cvs] JBossAS SVN: r58403 - trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2006-11-15 11:14:37 -0500 (Wed, 15 Nov 2006)
New Revision: 58403

Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
using JBoss Messaging DLQ instead of MQ DLQ

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2006-11-15 15:00:39 UTC (rev 58402)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2006-11-15 16:14:37 UTC (rev 58403)
@@ -24,8 +24,8 @@
 import java.util.Enumeration;
 import java.util.List;
 
+import javax.jms.DeliveryMode;
 import javax.jms.MessageProducer;
-import javax.jms.DeliveryMode;
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 import javax.jms.QueueConnection;
@@ -33,19 +33,17 @@
 import javax.jms.QueueReceiver;
 import javax.jms.QueueSender;
 import javax.jms.QueueSession;
-import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 import javax.jms.TopicConnection;
 import javax.jms.TopicConnectionFactory;
 import javax.jms.TopicSession;
-
-import javax.management.Attribute;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
 
+import junit.framework.Test;
+
 import org.jboss.ejb3.ClientKernelAbstraction;
 import org.jboss.ejb3.InitialContextFactory;
 import org.jboss.ejb3.KernelAbstractionFactory;
@@ -57,8 +55,6 @@
 import org.jboss.test.JBossTestCase;
 import org.jboss.util.collection.CollectionsUtil;
 
-import junit.framework.Test;
-
 /**
  * Sample client for the jboss container.
  * 
@@ -67,6 +63,7 @@
  */
 public class MDBUnitTestCase extends JBossTestCase
 {
+   @SuppressWarnings("unused")
    private static final Logger log = Logger.getLogger(MDBUnitTestCase.class);
 
    static boolean deployed = false;
@@ -80,6 +77,13 @@
 
    }
 
+   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
    {
       SecurityAssociation.setPrincipal(new SimplePrincipal("anyone"));
@@ -339,11 +343,7 @@
 
       Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
 
-      ObjectName dlqName = new ObjectName(
-            "jboss.mq.destination:name=DLQ,service=Queue");
-      
-      ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
-      kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
+      removeAllMessagesFromDLQ();
 
       long now = System.currentTimeMillis();
 
@@ -397,10 +397,7 @@
 
       Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
 
-      ObjectName dlqName = new ObjectName(
-            "jboss.mq.destination:name=DLQ,service=Queue");
-      ClientKernelAbstraction kernel = KernelAbstractionFactory.getClientInstance();
-      kernel.invoke(dlqName, "removeAllMessages", new Object[0], new String[0]);
+      removeAllMessagesFromDLQ();
 
       TextMessage message = session.createTextMessage();
       message.setStringProperty("foo", "bar");
@@ -418,7 +415,11 @@
       QueueReceiver receiver = session.createReceiver(dlq);
       message = (TextMessage) receiver.receiveNoWait();
       assertNotNull(message);
-      assertEquals("QUEUE.dlqtest", message
+      // AS 4.x
+//      assertEquals("QUEUE.dlqtest", message
+//            .getStringProperty("JBOSS_ORIG_DESTINATION"));
+      // AS 5.x
+      assertEquals("JBossQueue[dlqtest]", message
             .getStringProperty("JBOSS_ORIG_DESTINATION"));
       assertEquals(0L, message.getJMSExpiration());
       assertEquals(text, message.getText());