[jboss-cvs] JBossAS SVN: r60421 - in branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb: unit and 1 other directory.

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

Author: wolfc
Date: 2007-02-08 06:11:20 -0500 (Thu, 08 Feb 2007)
New Revision: 60421

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
Fixed mdb unit test

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java	2007-02-08 10:09:48 UTC (rev 60420)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java	2007-02-08 11:11:20 UTC (rev 60421)
@@ -45,28 +45,33 @@
         {
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
         @ActivationConfigProperty(propertyName="destination", propertyValue="queue/transactionmdbtest"),
-        @ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
+        @ActivationConfigProperty(propertyName="maxSession", propertyValue="1"),
+        @ActivationConfigProperty(propertyName="dLQMaxResent", propertyValue="3")
         })
 @TransactionTimeout(1)
-//@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ at TransactionAttribute(TransactionAttributeType.REQUIRED)
 public class TransactionQueueTestMDB implements MessageListener
 {
    private static final Logger log = Logger.getLogger(TransactionQueueTestMDB.class);
    
-
+   @Resource 
+   private MessageDrivenContext ctx;
+   
    public void onMessage(Message recvMsg)
    {
       System.out.println("*** TransactionQueueTestMDB onMessage " + this);
       
       try
       {
-    	  Thread.sleep(1000 * 60 * 6);
+    	  Thread.sleep(1000 * 3);
       } 
       catch (InterruptedException e)
       {
     	  e.printStackTrace();
       }
       
+      ctx.setRollbackOnly();
+      
       TestStatusBean.transactionQueueRan++;
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2007-02-08 10:09:48 UTC (rev 60420)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2007-02-08 11:11:20 UTC (rev 60421)
@@ -79,7 +79,7 @@
 
    private static void removeAllMessagesFromDLQ() throws Exception
    {
-      ObjectName dlqName = new ObjectName("jboss.messaging.destination:name=DLQ,service=Queue");
+      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]);
    }
@@ -417,11 +417,11 @@
       message = (TextMessage) receiver.receiveNoWait();
       assertNotNull(message);
       // AS 4.x
-//      assertEquals("QUEUE.dlqtest", message
+      assertEquals("QUEUE.dlqtest", message
+            .getStringProperty("JBOSS_ORIG_DESTINATION"));
+      // AS 5.x
+//      assertEquals("JBossQueue[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());
       assertEquals("bar", message.getStringProperty("foo"));
@@ -569,6 +569,10 @@
       QueueSender sender = null;
       QueueSession session = null;
 
+      Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
+
+      removeAllMessagesFromDLQ();
+      
       Queue queue = (Queue) getInitialContext().lookup("queue/transactionmdbtest");
       QueueConnectionFactory factory = getQueueConnectionFactory();
       cnn = factory.createQueueConnection();
@@ -582,16 +586,20 @@
       sender.send(msg);
       session.commit();
 
-      Thread.sleep(1000 * 60 * 7);
-      assertEquals(1, status.transactionQueueRan());
+      Thread.sleep(1000 * 20);
+      assertEquals(4, status.transactionQueueRan());
       
+      assertSize(session, dlq, 1);
+      
       msg = session.createTextMessage("Hello World II");
       sender.send(msg);
       session.commit();
       
-      Thread.sleep(1000 * 60 * 7);
-      assertEquals(2, status.transactionQueueRan());
+      Thread.sleep(1000 * 20);
+      assertEquals(8, status.transactionQueueRan());
       
+      assertSize(session, dlq, 2);
+      
       session.close();
       cnn.close();
    }