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

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

Author: bdecoste
Date: 2007-11-12 14:49:33 -0500 (Mon, 12 Nov 2007)
New Revision: 66974

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
Log:
cleaned up tests - had flawed DLQ logic

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java	2007-11-12 19:29:38 UTC (rev 66973)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/QueueTestMDB.java	2007-11-12 19:49:33 UTC (rev 66974)
@@ -22,14 +22,13 @@
 package org.jboss.ejb3.test.mdbtransactions;
 
 import javax.ejb.ActivationConfigProperty;
-import javax.ejb.EJB;
 import javax.ejb.MessageDriven;
+import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.ObjectMessage;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-
 import org.jboss.logging.Logger;
 
 /**
@@ -45,20 +44,19 @@
    private static final Logger log = Logger.getLogger(QueueTestMDB.class);
    
    private @PersistenceContext EntityManager manager;
-   @EJB StatelessFacade stateless;
    
    public void onMessage(Message recvMsg)
    {    
       try
       {
          ObjectMessage message = (ObjectMessage)recvMsg;
-         Entity entity = (Entity)message.getObject(); 
-         stateless.persist(entity);
-         ++TestStatusBean.messageCount;
+         Entity entity = (Entity)message.getObject();
+         manager.remove(entity);
       }
-      catch (Throwable t)
+      catch (JMSException e)
       {
-         TestStatusBean.caughtRollback = true;
+         e.printStackTrace();
+         throw new RuntimeException(e);
       }
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java	2007-11-12 19:29:38 UTC (rev 66973)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/RollbackQueueTestMDB.java	2007-11-12 19:49:33 UTC (rev 66974)
@@ -24,6 +24,7 @@
 import javax.ejb.ActivationConfigProperty;
 import javax.ejb.EJB;
 import javax.ejb.MessageDriven;
+import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import javax.jms.ObjectMessage;
@@ -52,12 +53,18 @@
       try
       {
          ObjectMessage message = (ObjectMessage)recvMsg;
-         Entity entity = (Entity)message.getObject();
-         manager.remove(entity);
+         Entity entity = (Entity)message.getObject(); 
+         stateless.persist(entity);
+         ++TestStatusBean.messageCount;
       }
-      catch (Throwable t)
+      catch (JMSException e)
       {
-          t.printStackTrace();
+         e.printStackTrace();
       }
+      catch (RuntimeException e)
+      {
+         TestStatusBean.caughtRollback = true;
+         throw e;
+      }
    }
 }

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-11-12 19:29:38 UTC (rev 66973)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbtransactions/unit/MDBUnitTestCase.java	2007-11-12 19:49:33 UTC (rev 66974)
@@ -65,23 +65,13 @@
       TestStatus status = (TestStatus)getInitialContext().lookup("TestStatusBean/remote");
       status.clear();
       
-      sendMessages("queue/mdbtest", 2);
+      sendMessages("queue/rollbackmdbtest", 2);
       
       Thread.sleep(5000);
       
       assertEquals(1, status.messageCount());
       assertTrue(status.caughtRollback());
-   }
-   
-   public void testRollback() throws Exception
-   {
-      TestStatus status = (TestStatus)getInitialContext().lookup("TestStatusBean/remote");
-      status.clear();
       
-      sendMessages("queue/rollbackmdbtest", 1);
-      
-      Thread.sleep(5000);
-      
       Queue queue = (Queue) getInitialContext().lookup("queue/DLQ");
       QueueConnectionFactory factory = getQueueConnectionFactory();
       QueueConnection connection = factory.createQueueConnection();
@@ -93,6 +83,11 @@
       
       session.close();
       connection.close();
+      
+      // remove Entity
+      sendMessages("queue/mdbtest", 1);
+      
+      Thread.sleep(5000);
    }
    
    public void testBadCreation() throws Exception