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

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

Author: bdecoste
Date: 2007-11-07 17:50:39 -0500 (Wed, 07 Nov 2007)
New Revision: 66839

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3Mdb.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/TestServerSession.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java
Log:
[ASPATCH-240] merged changes from EAP branch for TIBCO EMS session recycle simulation and fix

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3Mdb.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3Mdb.java	2007-11-07 22:03:14 UTC (rev 66838)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3Mdb.java	2007-11-07 22:50:39 UTC (rev 66839)
@@ -41,8 +41,8 @@
 @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"),
 @ActivationConfigProperty(propertyName="destination", propertyValue="queue/ejb3mdbsessionpoolclearQueue"),
 @ActivationConfigProperty(propertyName="forceClearOnShutdown", propertyValue="true"),
- at ActivationConfigProperty(propertyName="forceClearOnShutdownInterval", propertyValue="500"),
- at ActivationConfigProperty(propertyName="forceClearAttempts", propertyValue="5"),
+ at ActivationConfigProperty(propertyName="forceClearOnShutdownInterval", propertyValue="600"),
+ at ActivationConfigProperty(propertyName="forceClearAttempts", propertyValue="6"),
 @ActivationConfigProperty(propertyName="maxSession", propertyValue="1")
 })
 @ResourceAdapter("test-jms-ra.rar")

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/TestServerSession.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/TestServerSession.java	2007-11-07 22:03:14 UTC (rev 66838)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/TestServerSession.java	2007-11-07 22:50:39 UTC (rev 66839)
@@ -53,7 +53,7 @@
    }
    
    public void run()
-   {
+   {  
       boolean trace = log.isTraceEnabled();
       if (trace)
          log.trace("running...");

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java	2007-11-07 22:03:14 UTC (rev 66838)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdbsessionpoolclear/unit/MDBUnitTestCase.java	2007-11-07 22:50:39 UTC (rev 66839)
@@ -96,8 +96,9 @@
       assertEquals(1, mbeans.size());
       ObjectInstance jmsContainerInvokerInstance = (ObjectInstance)mbeans.iterator().next();
       ObjectName jmsContainerInvoker = jmsContainerInvokerInstance.getObjectName();
+      System.out.println("jmsContainerInvoker " + jmsContainerInvoker);
       int numActiveSessions = (Integer)server.getAttribute(jmsContainerInvoker, "NumActiveSessions");
-      assertEquals(0, numActiveSessions);
+      assertEquals(1, numActiveSessions);
       boolean forceClear = (Boolean)server.getAttribute(jmsContainerInvoker, "ForceClearOnShutdown");
       assertTrue(forceClear);
       int forceClearAttempts = (Integer)server.getAttribute(jmsContainerInvoker, "ForceClearAttempts");