[jbosscache-commits] JBoss Cache SVN: r7496 - core/trunk/src/test/java/org/jboss/cache/passivation.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2009-01-18 10:59:49 -0500 (Sun, 18 Jan 2009)
New Revision: 7496

Modified:
   core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
Log:
more strict eviction controll

Modified: core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java	2009-01-18 15:31:27 UTC (rev 7495)
+++ core/trunk/src/test/java/org/jboss/cache/passivation/BasicPassivationTest.java	2009-01-18 15:59:49 UTC (rev 7496)
@@ -18,6 +18,7 @@
 import org.jboss.cache.notifications.event.Event;
 import org.jboss.cache.notifications.event.NodeEvent;
 import org.jboss.cache.util.TestingUtil;
+import org.jboss.cache.util.internals.EvictionController;
 import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -27,11 +28,10 @@
  * @author Ben Wang
  * @version $Revision$
  */
- at Test(groups = {"functional"}, sequential = true, testName = "passivation.BasicPassivationTest")
+ at Test(groups = {"functional"}, testName = "passivation.BasicPassivationTest")
 public class BasicPassivationTest
 {
    CacheSPI cache;
-   long wakeupIntervalMillis = 0;
    final String ROOT_STR = "/test";
    Throwable t1_ex, t2_ex;
    final long DURATION = 10000;
@@ -39,33 +39,25 @@
    final String FQNSTR = "/org/jboss/3";
    int activationCount = 0;
    int passivationCount = 0;
+  private EvictionController ec;
 
-   @BeforeMethod(alwaysRun = true)
+  @BeforeMethod(alwaysRun = true)
    public void setUp() throws Exception
    {
-      initCaches();
-      wakeupIntervalMillis = cache.getConfiguration().getEvictionConfig().getWakeupInterval();
-      if (wakeupIntervalMillis < 0)
-      {
-         fail("testEviction(): eviction thread wake up interval is illegal " + wakeupIntervalMillis);
-      }
-
-      t1_ex = t2_ex = null;
+     UnitTestCacheFactory<String, String> instance = new UnitTestCacheFactory<String, String>();
+     cache = (CacheSPI) instance.createCache(new XmlConfigurationParser().parseFile("configs/local-passivation.xml"), false, getClass());
+     cache.getConfiguration().getEvictionConfig().setWakeupInterval(0);
+     cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
+     Object listener = new TestCacheListener();
+     cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
+     cache.start();
+     ec = new EvictionController(cache);
+     cache.getNotifier().addCacheListener(listener);
+     t1_ex = t2_ex = null;
       isTrue = true;
    }
 
-   private void initCaches()
-   {
-      UnitTestCacheFactory<String, String> instance = new UnitTestCacheFactory<String, String>();
-      cache = (CacheSPI) instance.createCache(new XmlConfigurationParser().parseFile("configs/local-passivation.xml"), false, getClass());
-      cache.getConfiguration().setTransactionManagerLookupClass("org.jboss.cache.transaction.DummyTransactionManagerLookup");
-      Object listener = new TestCacheListener();
-      cache.getConfiguration().getCacheLoaderConfig().getFirstCacheLoaderConfig().setClassName(DummyInMemoryCacheLoader.class.getName());
-      cache.start();
-      cache.getNotifier().addCacheListener(listener);
-   }
-
-   @AfterMethod(alwaysRun = true)
+  @AfterMethod(alwaysRun = true)
    public void tearDown() throws Exception
    {
       TestingUtil.killCaches(cache);
@@ -79,7 +71,8 @@
 
       cache.put(FQNSTR, FQNSTR, FQNSTR);
 
-      TestingUtil.sleepThread(2100);
+      TestingUtil.sleepThread(1100);
+      ec.startEviction();
 
       assert !(cache.exists(FQNSTR) && cache.getNode(FQNSTR).getKeys().contains(FQNSTR)) : "Should have been evicted!!";
       Object val = cache.get(FQNSTR, FQNSTR);