[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/eviction ...

[Elias Ross]

  User: genman  
  Date: 06/11/27 14:59:10

  Modified:    tests/functional/org/jboss/cache/eviction 
                        ExpirationPolicyTest.java
  Log:
  JBCACHE-880 - Fix update of expiration, better debug messages
  
  Revision  Changes    Path
  1.2       +127 -115  JBossCache/tests/functional/org/jboss/cache/eviction/ExpirationPolicyTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExpirationPolicyTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/eviction/ExpirationPolicyTest.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- ExpirationPolicyTest.java	27 Nov 2006 04:51:24 -0000	1.1
  +++ ExpirationPolicyTest.java	27 Nov 2006 19:59:10 -0000	1.2
  @@ -23,25 +23,34 @@
    * Unit tests for {@link ExpirationPolicy}.
    *
    * @author Elias Ross
  - * @version $Revision: 1.1 $
  + * @version $Revision: 1.2 $
    */
   public class ExpirationPolicyTest extends TestCase
   {
      private static final Log log = LogFactory.getLog(ExpirationPolicyTest.class);
      
      TreeCache cache;
  +
      int wakeupIntervalMillis = 0;
  +
      final String ROOT_STR = "/test";
  +
      Throwable t1_ex, t2_ex;
  +
      final long DURATION = 10000;
  +
      boolean isTrue;
   
      Fqn fqn1 = Fqn.fromString("/node/1");
  +
      Fqn fqn2 = Fqn.fromString("/node/2");
  +
      Fqn fqn3 = Fqn.fromString("/node/3");
  +
      Fqn fqn4 = Fqn.fromString("/node/4");
      
      Long future;
  +
      Long past;
      
      public void setUp() throws Exception
  @@ -55,7 +64,7 @@
         cache.setConfiguration(conf);
         cache.start();
         
  -      future = Long.valueOf(System.currentTimeMillis() + 3000);
  +      future = Long.valueOf(System.currentTimeMillis() + 4000);
         past = Long.valueOf(System.currentTimeMillis() - 2000);         
      }
   
  @@ -78,28 +87,31 @@
         assertNotNull(cache.get(fqn4));
         
         log.info("should remove 1 and 3 now");
  -      TestingUtil.sleepThread(2000);
  +      TestingUtil.sleepThread(3000);
         assertNull(cache.get(fqn1));
         assertNull(cache.get(fqn3));
      }
      
  -   public void testUpdate() throws Exception {
  +   public void testUpdate() throws Exception
  +   {
         log.info("update 1 from future to past");
         cache.put(fqn1, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future);
         assertNotNull(cache.get(fqn1));
  +      TestingUtil.sleepThread(1500);
         cache.put(fqn1, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, past);
  -      TestingUtil.sleepThread(2000);
  +      TestingUtil.sleepThread(1500);
         assertNull(cache.get(fqn1));
         cache.remove(Fqn.ROOT);
         
      }
      
  -   public void testMaxNodes() throws Exception {
  +   public void testMaxNodes() throws Exception
  +   {
         log.info("set max nodes to 2, expire soonest to expire first");
         EvictionPolicyConfig epc = cache.getRegionManager().getAllEvictionRegions().get(0).getEvictionPolicyConfig();
  -      ExpirationConfiguration ec = (ExpirationConfiguration)epc;
  +      ExpirationConfiguration ec = (ExpirationConfiguration) epc;
         ec.setMaxNodes(2);
  -      Long future2 = Long.valueOf(System.currentTimeMillis() + 2100);
  +      Long future2 = Long.valueOf(future.longValue() + 500);
         cache.put(fqn1, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future2);
         cache.put(fqn2, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future2);
         cache.put(fqn3, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future);