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

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

Author: wolfc
Date: 2006-11-17 08:03:03 -0500 (Fri, 17 Nov 2006)
New Revision: 58493

Added:
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java
Modified:
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java
   trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
setting max resents in activation config

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java	2006-11-17 12:01:07 UTC (rev 58492)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/BMTQueueTestMDB.java	2006-11-17 13:03:03 UTC (rev 58493)
@@ -44,7 +44,8 @@
 @MessageDriven(activationConfig =
         {
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/bmtmdbtest")
+        @ActivationConfigProperty(propertyName="destination", propertyValue="queue/bmtmdbtest"),
+        @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
         })
 @RunAs("TestRole")
 @SecurityDomain("other")

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java	2006-11-17 12:01:07 UTC (rev 58492)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/CMTQueueTestMDB.java	2006-11-17 13:03:03 UTC (rev 58493)
@@ -41,7 +41,8 @@
 @MessageDriven(activationConfig =
    {
       @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
-      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/cmtmdbtest")
+      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/cmtmdbtest"),
+      @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
    })
 @RunAs("TestRole")
 @SecurityDomain("other")

Added: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java	2006-11-17 12:01:07 UTC (rev 58492)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/RollbackCMTQueueTestMDB.java	2006-11-17 13:03:03 UTC (rev 58493)
@@ -0,0 +1,71 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, Red Hat Middleware LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * 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.mdb;
+
+import javax.annotation.Resource;
+import javax.annotation.security.RunAs;
+import javax.ejb.ActivationConfigProperty;
+import javax.ejb.MessageDriven;
+import javax.ejb.MessageDrivenContext;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+
+import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.logging.Logger;
+
+/**
+ * Comment
+ *
+ * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @version $Revision: $
+ */
+ at MessageDriven(activationConfig =
+   {
+      @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
+      @ActivationConfigProperty(propertyName="destination", propertyValue="queue/rollbackcmtmdbtest"),
+      @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
+   })
+ at RunAs("TestRole")
+ at SecurityDomain("other")
+public class RollbackCMTQueueTestMDB implements MessageListener
+{
+   @SuppressWarnings("unused")
+   private static final Logger log = Logger.getLogger(RollbackCMTQueueTestMDB.class);
+   
+   private static boolean rolledback = false;
+   @Resource MessageDrivenContext ctx;
+
+   public void onMessage(Message recvMsg)
+   {
+      System.out.println("*** RollbackCMTQueueTestMDB onMessage " + rolledback);
+      if (ctx == null) throw new RuntimeException("FAILED ON CTX LOOKUP");
+      
+      if (!rolledback)
+      {
+         rolledback = true;
+         ctx.setRollbackOnly();
+         return;
+      }
+      
+      TestStatusBean.rollbackCmtQueueRan++;
+   }
+}

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java	2006-11-17 12:01:07 UTC (rev 58492)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatus.java	2006-11-17 13:03:03 UTC (rev 58493)
@@ -60,4 +60,5 @@
 
    boolean preDestroy();
    
+   int rollbackCmtQueueRan();
 }

Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java	2006-11-17 12:01:07 UTC (rev 58492)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java	2006-11-17 13:03:03 UTC (rev 58493)
@@ -52,6 +52,7 @@
    public static boolean interceptedQueue = false;
    public static boolean postConstruct = false;
    public static boolean preDestroy = false;
+   static int rollbackCmtQueueRan = 0;
 
    public void clear()
    {
@@ -134,4 +135,9 @@
    {
       return messageCount;
    }
+   
+   public int rollbackCmtQueueRan()
+   {
+      return rollbackCmtQueueRan;
+   }
 }

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-17 12:01:07 UTC (rev 58492)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2006-11-17 13:03:03 UTC (rev 58493)
@@ -433,6 +433,31 @@
       connection.close();
    }
 
+   public void testRollbackCMT() throws Exception
+   {
+      TestStatus status = (TestStatus) getInitialContext().lookup("TestStatusBean/remote");
+      clear(status);
+      QueueConnection cnn = null;
+      QueueSender sender = null;
+      QueueSession session = null;
+
+      Queue queue = (Queue) getInitialContext().lookup("queue/rollbackcmtmdbtest");
+      QueueConnectionFactory factory = getQueueConnectionFactory();
+      cnn = factory.createQueueConnection();
+      session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
+
+      TextMessage msg = session.createTextMessage("Hello World");
+      msg.setIntProperty("JMS_JBOSS_REDELIVERY_LIMIT", 1);
+
+      sender = session.createSender(queue);
+      sender.send(msg);
+      session.close();
+      cnn.close();
+
+      Thread.sleep(2000);
+      assertEquals(1, status.rollbackCmtQueueRan());
+   }
+
    private List list(QueueSession session, Queue queue) throws Exception
    {
       QueueBrowser browser = session.createBrowser(queue);