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

[Elias Ross]

  User: genman  
  Date: 07/01/09 19:11:31

  Modified:    tests/functional/org/jboss/cache/eviction 
                        ExpirationPolicyTest.java
  Log:
  JBCACHE-880 - make this more robust
  
  Revision  Changes    Path
  1.6       +11 -11    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.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- ExpirationPolicyTest.java	30 Dec 2006 19:48:45 -0000	1.5
  +++ ExpirationPolicyTest.java	10 Jan 2007 00:11:31 -0000	1.6
  @@ -19,7 +19,7 @@
    * Unit tests for {@link ExpirationPolicy}.
    *
    * @author Elias Ross
  - * @version $Revision: 1.5 $
  + * @version $Revision: 1.6 $
    */
   public class ExpirationPolicyTest extends TestCase
   {
  @@ -58,9 +58,9 @@
   
      public void testEviction() throws Exception
      {
  -      cache.put(fqn1, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future);
  -      cache.put(fqn2, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, past);
  -      cache.put(fqn3, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future);
  +      cache.put(fqn1, ExpirationConfiguration.EXPIRATION_KEY, future);
  +      cache.put(fqn2, ExpirationConfiguration.EXPIRATION_KEY, past);
  +      cache.put(fqn3, ExpirationConfiguration.EXPIRATION_KEY, future);
         cache.put(fqn4, "foo", "bar");
         TestingUtil.sleepThread(2000);
         assertNotNull(cache.get(fqn1));
  @@ -77,10 +77,10 @@
      public void testUpdate() throws Exception
      {
         log.info("update 1 from future to past");
  -      cache.put(fqn1, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, future);
  +      cache.put(fqn1, ExpirationConfiguration.EXPIRATION_KEY, future);
         assertNotNull(cache.get(fqn1));
         TestingUtil.sleepThread(1500);
  -      cache.put(fqn1, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, past);
  +      cache.put(fqn1, ExpirationConfiguration.EXPIRATION_KEY, past);
         TestingUtil.sleepThread(1500);
         assertNull(cache.get(fqn1));
         cache.remove(Fqn.ROOT);
  @@ -94,12 +94,12 @@
         ExpirationConfiguration ec = (ExpirationConfiguration) epc;
         ec.setMaxNodes(2);
         Long future2 = future + 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);
  -      cache.put(fqn4, ExpirationConfiguration.DEFAULT_EXPIRATION_KEY, past);
  +      cache.put(fqn1, ExpirationConfiguration.EXPIRATION_KEY, future2);
  +      cache.put(fqn2, ExpirationConfiguration.EXPIRATION_KEY, future2);
  +      cache.put(fqn3, ExpirationConfiguration.EXPIRATION_KEY, future);
  +      cache.put(fqn4, ExpirationConfiguration.EXPIRATION_KEY, past);
         assertEquals(5, cache.getNumberOfNodes());
  -      Thread.sleep(1000);
  +      Thread.sleep(2000);
         assertNotNull(cache.get(fqn1));
         assertNotNull(cache.get(fqn2));
         assertNull(cache.get(fqn3));