[jboss-cvs] JBossAS SVN: r70052 - in projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb: unit and 1 other directory.

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

Author: bdecoste
Date: 2008-02-24 20:05:39 -0500 (Sun, 24 Feb 2008)
New Revision: 70052

Modified:
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/QueueTestMDB.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
   projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
fixed tests

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/QueueTestMDB.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/QueueTestMDB.java	2008-02-24 23:28:02 UTC (rev 70051)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/QueueTestMDB.java	2008-02-25 01:05:39 UTC (rev 70052)
@@ -52,7 +52,7 @@
         })
 @Pool(value="StrictMaxPool", maxSize=1, timeout=10000)
 @RunAs("TestRole")
- at SecurityDomain(value="other",unauthenticatedPrincipal="nobody")
+ at SecurityDomain(value="other",unauthenticatedPrincipal="user")
 public class QueueTestMDB implements MessageListener
 {
    private static final Logger log = Logger.getLogger(QueueTestMDB.class);

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java	2008-02-24 23:28:02 UTC (rev 70051)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/TransactionQueueTestMDB.java	2008-02-25 01:05:39 UTC (rev 70052)
@@ -25,6 +25,8 @@
 import javax.ejb.MessageDriven;
 import javax.jms.Message;
 import javax.jms.MessageListener;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
 
 import org.jboss.ejb3.annotation.Pool;
 import org.jboss.ejb3.annotation.TransactionTimeout;
@@ -38,11 +40,10 @@
         @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
         @ActivationConfigProperty(propertyName="destination", propertyValue="queue/transactionmdbtest"),
         @ActivationConfigProperty(propertyName="maxSession", propertyValue="1"),
-        @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1")
+        @ActivationConfigProperty(propertyName="DLQMaxResent", propertyValue="1"),
+        @ActivationConfigProperty(propertyName="transactionTimeout", propertyValue="1")
         })
- at TransactionTimeout(1)
-// Not allowed on a MDB
-//@TransactionAttribute(TransactionAttributeType.REQUIRES_NEW) // if we specify a tx timeout, we must start the tx
+ at TransactionAttribute(TransactionAttributeType.REQUIRED) 
 @Pool(value="StrictMaxPool", maxSize=1, timeout=10000)
 public class TransactionQueueTestMDB implements MessageListener
 {
@@ -54,8 +55,7 @@
       
       try
       {
-    	  //Thread.sleep(1000 * 60 * 6);
-         Thread.sleep(1000 * 10);
+         Thread.sleep(1000 * 3);
       } 
       catch (InterruptedException e)
       {

Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2008-02-24 23:28:02 UTC (rev 70051)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2008-02-25 01:05:39 UTC (rev 70052)
@@ -26,6 +26,7 @@
 
 import javax.jms.DeliveryMode;
 import javax.jms.MessageProducer;
+import javax.jms.MessageConsumer;
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 import javax.jms.QueueConnection;
@@ -382,7 +383,7 @@
       
       sender.send(message, DeliveryMode.NON_PERSISTENT, 4, 1);
 
-      Thread.sleep(2000);
+      Thread.sleep(1000 * 5);
 
       assertSize(session, queue, 0);
       
@@ -417,6 +418,7 @@
       QueueConnectionFactory factory = getQueueConnectionFactory();
       connection = factory.createQueueConnection();
       connection.start();
+      
       session = connection.createQueueSession(false,
             QueueSession.AUTO_ACKNOWLEDGE);
 
@@ -426,6 +428,7 @@
       Queue dlq = (Queue) getInitialContext().lookup("queue/DLQ");
 
       removeAllMessagesFromDLQ();
+      assertSize(session, dlq, 0);
 
       TextMessage message = session.createTextMessage();
       message.setStringProperty("foo", "bar");
@@ -435,13 +438,13 @@
 
       sender.send(message);
 
-      Thread.sleep(1000);
+      Thread.sleep(1000 * 10);
 
       assertSize(session, queue, 0);
       assertSize(session, dlq, 1);
 
-      QueueReceiver receiver = session.createReceiver(dlq);
-      message = (TextMessage) receiver.receiveNoWait();
+      MessageConsumer receiver = session.createConsumer(dlq);
+      message = (TextMessage) receiver.receive(1000); //.receiveNoWait();
       assertNotNull(message);
       // AS 4.x
 //      assertEquals("QUEUE.dlqtest", message
@@ -537,11 +540,11 @@
 
       assertSize(session, queue, 0);
       
-      /* TODO: await implementation of JBMESSAGING-126
+      /* TODO: await implementation of JBMESSAGING-126 
       assertSize(session, dlq, 1);
 
       QueueReceiver receiver = session.createReceiver(dlq);
-      message = (TextMessage) receiver.receiveNoWait();
+      TextMessage message = (TextMessage) receiver.receiveNoWait();
       assertNotNull(message);
       assertEquals("QUEUE.expirytest", message
             .getStringProperty("JBOSS_ORIG_DESTINATION"));
@@ -551,8 +554,8 @@
       assertEquals("bar", message.getStringProperty("foo"));
       assertNull(message.getStringProperty("null"));
       
-      receiver.close();
-       */
+      receiver.close();*/
+       
       sender.close();
       
       session.close();
@@ -560,6 +563,7 @@
       
       // the second message should never have arrived, so the bean ran once
       assertEquals(1, status.expirationQueueRan());
+    
    }
 
    public void testCMTTxNotSupported() throws Exception
@@ -585,6 +589,7 @@
 
       Thread.sleep(2000);
       assertEquals(1, status.queueFired());
+      
    }
    
    public void testTransactionTimeout() throws Exception
@@ -608,17 +613,17 @@
       
       sender.send(msg);
       session.commit();
-
-      Thread.sleep(1000 * 60 * 7);
-      assertEquals(1, status.transactionQueueRan());
       
+      Thread.sleep(1000 * 20);
+      assertEquals(2, status.transactionQueueRan());
+        
       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(4, status.transactionQueueRan());
+       
       session.close();
       cnn.close();
    }
@@ -631,7 +636,7 @@
       List messages = CollectionsUtil.list(e);
 
       browser.close();
-
+      
       return messages;
    }