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

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

Author: wolfc
Date: 2007-02-22 03:33:54 -0500 (Thu, 22 Feb 2007)
New Revision: 60789

Modified:
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java
   branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
Log:
EJBTHREE-890: modified unit test

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java	2007-02-22 06:21:47 UTC (rev 60788)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/ExpirationTestMDB.java	2007-02-22 08:33:54 UTC (rev 60789)
@@ -44,7 +44,7 @@
 {
    public void onMessage(Message message)
    {
-      System.out.println("*** ExpirationTestMDB onMessage " + TestStatusBean.expirationQueueRan);
+      System.out.println("*** ExpirationTestMDB onMessage " + TestStatusBean.expirationQueueRan + " in " + this);
       
       try
       {
@@ -53,6 +53,7 @@
       catch(InterruptedException e)
       {
          // ignore
+         System.out.println("*** ExpirationTestMDB interrupted!");
       }
       
       TestStatusBean.expirationQueueRan++;

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java	2007-02-22 06:21:47 UTC (rev 60788)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/TestStatusBean.java	2007-02-22 08:33:54 UTC (rev 60789)
@@ -72,6 +72,7 @@
       interceptedQueue = false;
       postConstruct = false;
       preDestroy = false;
+      expirationQueueRan = 0;
    }
 
    public int queueFired()

Modified: branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java
===================================================================
--- branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2007-02-22 06:21:47 UTC (rev 60788)
+++ branches/Branch_4_2/ejb3/src/test/org/jboss/ejb3/test/mdb/unit/MDBUnitTestCase.java	2007-02-22 08:33:54 UTC (rev 60789)
@@ -532,7 +532,7 @@
       connection.close();
       
       // the second message should never have arrived, so the bean ran once
-      assertEquals(1, status.expirationQueueRan());
+      assertEquals("The second message should never have arrived (EJBTHREE-890)", 1, status.expirationQueueRan());
    }
 
    public void testCMTTxNotSupported() throws Exception
@@ -667,6 +667,7 @@
       assertEquals(0, status.overrideQueueFired());
       assertEquals(0, status.queueFired());
       assertEquals(0, status.topicFired());
+      assertEquals(0, status.expirationQueueRan());
       assertFalse(status.interceptedQueue());
       assertFalse(status.interceptedTopic());
       assertFalse(status.postConstruct());