[jboss-cvs] JBossAS SVN: r58206 - branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/testbeancluster/test

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

Author: bstansberry at jboss.com
Date: 2006-11-08 14:08:17 -0500 (Wed, 08 Nov 2006)
New Revision: 58206

Modified:
   branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java
Log:
Port fix that removes spurious testsuite failures

Modified: branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java
===================================================================
--- branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java	2006-11-08 18:48:28 UTC (rev 58205)
+++ branches/JBoss_4_0_3_SP1_JBAS-3808/testsuite/src/main/org/jboss/test/testbeancluster/test/BeanUnitTestCase.java	2006-11-08 19:08:17 UTC (rev 58206)
@@ -334,7 +334,14 @@
 
       for(int n = 0; n < beans.length; n ++)
       {
-         beans[n].remove();
+         try
+         {
+            beans[n].remove();
+         }
+         catch (java.rmi.NoSuchObjectException nso)
+         {
+            log.debug("Caught NoSuchObjectException removing bean " + n);
+         }
       }
       
       // Confirm that the bean cache is empty
@@ -343,7 +350,10 @@
       RMIAdaptor[] adaptors = getAdaptors();      
       Long cacheCount = (Long) adaptors[0].getAttribute(oName, "CacheSize");
       assertEquals("CacheSize is zero", 0, cacheCount.longValue());
-      cacheCount = (Long) adaptors[0].getAttribute(oName, "PassivatedCount");
-      assertEquals("PassivatedCount is zero", 0, cacheCount.longValue());
+      // Checking the passivated count is invalid, as it doesn't get reduced
+      // when remove() is called on a bean -- only when the passivation cleanup
+      // thread runs
+      //cacheCount = (Long) adaptors[0].getAttribute(oName, "PassivatedCount");
+      //assertEquals("PassivatedCount is zero", 0, cacheCount.longValue());
    }
 }