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

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-04-25 09:34:09 -0400 (Fri, 25 Apr 2008)
New Revision: 5693

Modified:
   core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java
Log:
JBCACHE-1222 - fixed eviction test

Modified: core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java	2008-04-25 12:51:05 UTC (rev 5692)
+++ core/trunk/src/test/java/org/jboss/cache/invalidation/TombstoneEvictionTest.java	2008-04-25 13:34:09 UTC (rev 5693)
@@ -12,6 +12,8 @@
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,11 +31,12 @@
    private CacheSPI c1, c2;
    private Fqn fqn = Fqn.fromString("/data/test");
    private Fqn dummy = Fqn.fromString("/data/dummy");
-   private long evictionWaitTime = 2100;
+   private long evictionWaitTime = 4100;
 
    @BeforeMethod
    public void setUp() throws Exception
    {
+      log.trace("**** setup called");
       c1 = (CacheSPI) new DefaultCacheFactory().createCache(false);
 
       // the FIFO policy cfg
@@ -53,7 +56,7 @@
 
 
       EvictionConfig ec = new EvictionConfig();
-      ec.setWakeupIntervalSeconds(1);
+      ec.setWakeupIntervalSeconds(2);
       ec.setEvictionRegionConfigs(evictionRegionConfigs);
 
       c1.getConfiguration().setCacheMode(Configuration.CacheMode.INVALIDATION_SYNC);
@@ -75,15 +78,22 @@
       TestingUtil.killCaches(c1, c2);
    }
 
+   private static final Log log = LogFactory.getLog(TombstoneEvictionTest.class);
+
    public void testControl()
    {
+      log.trace("***** entered testControl()");
       c1.put(fqn, "k", "v");
       c1.put(dummy, "k", "v");
+      log.trace("***** nodes were added testControl()");
 
+
       assert c1.peek(fqn, false, true) != null : "Node should exist";
       assert c1.peek(dummy, false, true) != null : "Node should exist";
+      log.trace("***** testControl() right before sleeping");
 
       TestingUtil.sleepThread(evictionWaitTime);
+      log.trace("***** testControl() right after sleeping");
 
       assert c1.peek(fqn, false, true) == null : "Should have evicted";
       assert c1.peek(dummy, false, true) != null : "Node should exist";
@@ -91,8 +101,10 @@
 
    public void testWithInvalidationMarkers()
    {
+      log.trace(" **** testWithInvalidationMarkers() before put");
       c1.put(fqn, "k", "v");
       c1.put(dummy, "k", "v");
+      log.trace(" **** testWithInvalidationMarkers() after put");
 
       assert c1.peek(fqn, false, true) != null : "Node should exist";
       assert c1.peek(dummy, false, true) != null : "Node should exist";