[jboss-cvs] jboss-ejb3/src/test/org/jboss/ejb3/test/mdb/unit ...

[Bill DeCoste]

  User: bdecoste
  Date: 06/07/24 17:28:31

  Modified:    src/test/org/jboss/ejb3/test/mdb/unit  MDBUnitTestCase.java
  Log:
  MDB cleanup, standalone test for standard testcases, fixed class level @Resources jndi env bindings
  
  Revision  Changes    Path
  1.15      +37 -10    jboss-ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MDBUnitTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- MDBUnitTestCase.java	30 Jun 2006 19:23:45 -0000	1.14
  +++ MDBUnitTestCase.java	24 Jul 2006 21:28:31 -0000	1.15
  @@ -36,6 +36,7 @@
   
   import javax.naming.InitialContext;
   import javax.naming.NamingEnumeration;
  +import javax.naming.NamingException;
   
   import org.jboss.ejb3.InitialContextFactory;
   import org.jboss.ejb3.test.mdb.Stateless;
  @@ -50,7 +51,7 @@
    * Sample client for the jboss container.
    *
    * @author <a href="mailto:bill at burkecentral.com">Bill Burke</a>
  - * @version $Id: MDBUnitTestCase.java,v 1.14 2006/06/30 19:23:45 bdecoste Exp $
  + * @version $Id: MDBUnitTestCase.java,v 1.15 2006/07/24 21:28:31 bdecoste Exp $
    */
   
   public class MDBUnitTestCase
  @@ -81,7 +82,7 @@
         QueueSession session = null;
         
         Queue queue = (Queue) getInitialContext().lookup("queue/overridequeuetest");
  -      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("ConnectionFactory");
  +      QueueConnectionFactory factory = getQueueConnectionFactory();
         cnn = factory.createQueueConnection();
         session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
   
  @@ -89,8 +90,10 @@
   
         sender = session.createSender(queue);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
  -      Thread.sleep(1000);
  +      Thread.sleep(5000);
         assertEquals(1, status.overrideQueueFired());
      }
      
  @@ -116,8 +119,10 @@
         sender = session.createSender(queue);
         sender.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
  -      Thread.sleep(1000);
  +      Thread.sleep(2000);
         assertEquals(1, status.nondurableQueueFired());
      }
      
  @@ -141,8 +146,10 @@
   
         sender = session.createSender(queue);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
  -      Thread.sleep(1000);
  +      Thread.sleep(2000);
         assertEquals(1, status.defaultedQueueFired());
      }
      
  @@ -166,8 +173,10 @@
   
         sender = session.createSender(queue);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
  -      Thread.sleep(1000);
  +      Thread.sleep(2000);
         assertEquals(1, status.overrideDefaultedQueueFired());
      }
      
  @@ -195,12 +204,14 @@
         sender.send(msg);
         sender.send(msg);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
         Thread.sleep(2000);
         assertEquals(5, status.queueFired());
         assertTrue(status.interceptedQueue());
         assertTrue(status.postConstruct());
  -  //    assertEquals(5, status.messageCount());
  +      assertEquals(5, status.messageCount());
   
         //TODO: Figure out how to test preDestroy gets invoked
         //assertTrue(status.preDestroy());
  @@ -228,8 +239,10 @@
   
         sender = session.createProducer(topic);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
  -      Thread.sleep(1000);
  +      Thread.sleep(2000);
         assertEquals(1, status.topicFired());
         assertTrue(status.interceptedTopic());
         assertFalse(status.postConstruct());
  @@ -245,7 +258,7 @@
         QueueSession session = null;
   
         Queue queue = (Queue) getInitialContext().lookup("queue/bmtmdbtest");
  -      QueueConnectionFactory factory = (QueueConnectionFactory) getInitialContext().lookup("ConnectionFactory");
  +      QueueConnectionFactory factory = getQueueConnectionFactory();
         cnn = factory.createQueueConnection();
         session = cnn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
   
  @@ -253,11 +266,25 @@
   
         sender = session.createSender(queue);
         sender.send(msg);
  +      session.close();
  +      cnn.close();
   
  -      Thread.sleep(1000);
  +      Thread.sleep(2000);
         assertEquals(1, status.bmtQueueRan());
      }
      
  +   protected QueueConnectionFactory getQueueConnectionFactory() throws Exception
  +   {
  +      try
  +      {
  +         return (QueueConnectionFactory) getInitialContext().lookup("ConnectionFactory");
  +      }
  +      catch (NamingException e)
  +      {
  +         return (QueueConnectionFactory) getInitialContext().lookup("java:/ConnectionFactory");
  +      }
  +   }
  +   
      protected void clear(TestStatus status)
      {
         status.clear();