[jboss-cvs] JBossAS SVN: r61745 - branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support.

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

Author: adrian at jboss.org
Date: 2007-03-27 11:44:37 -0400 (Tue, 27 Mar 2007)
New Revision: 61745

Modified:
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/JMSContainerInvokerSimpleMessageDrivenUnitTest.java
   branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java
Log:
[JBAS-4247] - Fix this broken test where the exception listener was not being installed and the sendMessage was not retrying

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java	2007-03-27 15:40:12 UTC (rev 61744)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/BasicMessageDrivenUnitTest.java	2007-03-27 15:44:37 UTC (rev 61745)
@@ -178,6 +178,7 @@
       
       ConnectionFactory factory = (ConnectionFactory) lookup(connectionFactoryJNDI, ConnectionFactory.class);
       connection = factory.createConnection();
+      connection.setExceptionListener(this);
       return connection;
    }
    

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/JMSContainerInvokerSimpleMessageDrivenUnitTest.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/JMSContainerInvokerSimpleMessageDrivenUnitTest.java	2007-03-27 15:40:12 UTC (rev 61744)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/JMSContainerInvokerSimpleMessageDrivenUnitTest.java	2007-03-27 15:44:37 UTC (rev 61745)
@@ -35,7 +35,7 @@
  */
 public abstract class JMSContainerInvokerSimpleMessageDrivenUnitTest extends SimpleMessageDrivenUnitTest
 {
-   protected ObjectName persistenceManager = ObjectNameFactory.create("jboss.mq:service=DestinationManager");
+   protected ObjectName persistenceManager = ObjectNameFactory.create("jboss.mq:service=PersistenceManager");
    
    protected ObjectName mdbInvoker = ObjectNameFactory.create("jboss.j2ee:service=EJB,jndiName=TestMDB,plugin=invoker,binding=jms-container-invoker-driven-bean");
    

Modified: branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java
===================================================================
--- branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java	2007-03-27 15:40:12 UTC (rev 61744)
+++ branches/Branch_4_0/testsuite/src/main/org/jboss/test/messagedriven/support/SendMessageOperation.java	2007-03-27 15:44:37 UTC (rev 61745)
@@ -21,6 +21,7 @@
  */
 package org.jboss.test.messagedriven.support;
 
+import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageProducer;
 
@@ -44,9 +45,26 @@
 
    public void run() throws Exception
    {
-      MessageProducer producer = test.getMessageProducer();
-      Message message = test.getTestMessage();
-      message.setStringProperty(MESSAGEID, id);
-      producer.send(message);
+      int retries = 5;
+      while (true)
+      {
+         try
+         {
+            MessageProducer producer = test.getMessageProducer();
+            Message message = test.getTestMessage();
+            message.setStringProperty(MESSAGEID, id);
+            producer.send(message);
+            // DONE
+            return;
+         }
+         catch (JMSException e)
+         {
+            // Got an error, sleep then retry
+            if (retries-- > 0)
+               Thread.sleep(1000);
+            else
+               throw e;
+         }
+      }
    }
 }