[jboss-cvs] JBossAS SVN: r66913 - in branches/JBPAPP_4_2/ejb3/src: test/org/jboss/ejb3/test/dd/mdb and 1 other directories.

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

Author: wolfc
Date: 2007-11-09 08:38:24 -0500 (Fri, 09 Nov 2007)
New Revision: 66913

Modified:
   branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/META-INF/ejb-jar.xml
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/QueueBean.java
   branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
Log:
JBPAPP-347: Fixed dd/mdb test

Modified: branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/META-INF/ejb-jar.xml
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/META-INF/ejb-jar.xml	2007-11-09 11:47:02 UTC (rev 66912)
+++ branches/JBPAPP_4_2/ejb3/src/resources/test/dd/mdb/META-INF/ejb-jar.xml	2007-11-09 13:38:24 UTC (rev 66913)
@@ -125,10 +125,10 @@
           	<activation-config-property-name>subscriptionName</activation-config-property-name>
           	<activation-config-property-value>DurableTopicTest</activation-config-property-value>
           </activation-config-property>
-          <!--activation-config-property>
+          <activation-config-property>
           	<activation-config-property-name>clientId</activation-config-property-name>
           	<activation-config-property-value>DurableTopicTest</activation-config-property-value>
-          </activation-config-property-->
+          </activation-config-property>
         </activation-config>
       </message-driven>
 

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/QueueBean.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/QueueBean.java	2007-11-09 11:47:02 UTC (rev 66912)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/QueueBean.java	2007-11-09 13:38:24 UTC (rev 66913)
@@ -21,6 +21,8 @@
  */
 package org.jboss.ejb3.test.dd.mdb;
 
+import java.sql.Connection;
+
 import javax.annotation.Resource;
 import javax.ejb.MessageDrivenBean;
 import javax.ejb.MessageDrivenContext;
@@ -101,7 +103,8 @@
    {
       stateless.test();
       statelessLocal.testLocal();
-      testDatasource.getConnection();
+      Connection conn = testDatasource.getConnection();
+      conn.close();
       
       Context initCtx = new InitialContext();
       Context myEnv = (Context) initCtx.lookup(Container.ENC_CTX_NAME + "/env");

Modified: branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2007-11-09 11:47:02 UTC (rev 66912)
+++ branches/JBPAPP_4_2/ejb3/src/test/org/jboss/ejb3/test/dd/mdb/unit/MDBUnitTestCase.java	2007-11-09 13:38:24 UTC (rev 66913)
@@ -121,7 +121,11 @@
       // provider specific queue and topic names!!
    }
 
-
+   private boolean isMQ()
+   {
+      return System.getProperty("jboss.jms.provider", "mq").equals("mq");
+   }
+   
    protected void tearDown() throws Exception {
       if (topicConnection != null) {
          topicConnection.close();
@@ -180,10 +184,12 @@
 
       sender.close();
       
-      Thread.currentThread().sleep(10000);
+      Thread.sleep(10000);
       
       ArrayList destinations = status.getDestinations();
-      int size = (dest.equals("queue/ex")) ? 110 : 10;
+      // Wolf: MQ delivers 110 messages (don't ask)
+      int expected = isMQ() ? 110 : 100;
+      int size = (dest.equals("queue/ex")) ? expected : 10;
 
       assertEquals(size, destinations.size());
       String destinationName = (String)jndiToDestName.get(dest);
@@ -216,7 +222,7 @@
 
       pub.close();
 
-      Thread.currentThread().sleep(10000);
+      Thread.sleep(20000);
 
       ArrayList destinations = status.getDestinations();