[jbosscache-commits] JBoss Cache SVN: r7040 - in core/trunk/src: test/java/org/jboss/cache/eviction and 1 other directory.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2008-10-30 23:44:34 -0400 (Thu, 30 Oct 2008)
New Revision: 7040

Modified:
   core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java
   core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithmConfig.java
   core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java
   core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java
Log:
Fixed broken tests + parched expiration algo

Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java	2008-10-31 02:56:09 UTC (rev 7039)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithm.java	2008-10-31 03:44:34 UTC (rev 7040)
@@ -185,7 +185,7 @@
             i.remove();
             continue;
          }
-         if (ee.getExpiration() < now || (max != 0 && set.size() > max))
+         if (ee.getExpiration() < now || (max != -1 && set.size() > max))
          {
             i.remove();
             evictCacheNode(ee.getFqn());

Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithmConfig.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithmConfig.java	2008-10-31 02:56:09 UTC (rev 7039)
+++ core/trunk/src/main/java/org/jboss/cache/eviction/ExpirationAlgorithmConfig.java	2008-10-31 03:44:34 UTC (rev 7040)
@@ -158,4 +158,16 @@
       warnNoExpirationKey = true;
       timeToLive = -1;
    }
+
+
+   public String toString()
+   {
+      return "ExpirationAlgorithmConfig{" +
+            "expirationKeyName='" + expirationKeyName + '\'' +
+            ", warnNoExpirationKey=" + warnNoExpirationKey +
+            ", timeToLive=" + timeToLive +
+            ", maxNodes=" + maxNodes +
+            ", minTTL=" + minTimeToLive +
+            '}';
+   }
 }
\ No newline at end of file

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java	2008-10-31 02:56:09 UTC (rev 7039)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ElementSizeConfigurationTest.java	2008-10-31 03:44:34 UTC (rev 7040)
@@ -6,10 +6,9 @@
  */
 package org.jboss.cache.eviction;
 
-import org.jboss.cache.config.ConfigurationException;
 import org.jboss.cache.config.parsing.XmlConfigHelper;
 import org.jboss.cache.config.parsing.element.EvictionElementParser;
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
@@ -45,18 +44,9 @@
             "</region>";
 
       Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
-      try
-      {
-         EvictionElementParser.parseEvictionPolicyConfig(element, config);
-         config.validate();
-      }
-      catch (ConfigurationException ce)
-      {
-         assertTrue("Configure exception properly thrown", true);
-         return;
-      }
-
-      fail("Invalid region Element Size configuration did not cause ConfigureException to be thrown with empty maxElementsPerNode attribute");
+      EvictionElementParser.parseEvictionPolicyConfig(element, config);
+      config.validate();
+      assert config.getMaxElementsPerNode() == -1;
    }
 
 
@@ -73,7 +63,7 @@
       config.validate();
 
       assertEquals(100, config.getMaxElementsPerNode());
-      assertEquals(0, config.getMaxNodes());
+      assertEquals(-1, config.getMaxNodes());
    }
 
 }

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java	2008-10-31 02:56:09 UTC (rev 7039)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/ExpirationPolicyTest.java	2008-10-31 03:44:34 UTC (rev 7040)
@@ -11,6 +11,7 @@
 import org.jboss.cache.CacheSPI;
 import org.jboss.cache.Fqn;
 import org.jboss.cache.Region;
+import org.jboss.cache.UnitTestCacheFactory;
 import org.jboss.cache.config.Configuration;
 import org.jboss.cache.config.EvictionConfig;
 import org.jboss.cache.config.EvictionRegionConfig;
@@ -22,7 +23,6 @@
 import org.testng.annotations.Test;
 
 import java.util.concurrent.TimeUnit;
-import org.jboss.cache.UnitTestCacheFactory;
 
 /**
  * Unit tests for {@link org.jboss.cache.eviction.ExpirationAlgorithm}.
@@ -59,6 +59,8 @@
 
       future = System.currentTimeMillis() + 500;
       past = System.currentTimeMillis() - 200;
+
+      System.out.println(eAC);
    }
 
    @AfterMethod(alwaysRun = true)
@@ -91,7 +93,7 @@
       }
    }
 
-   @Test(invocationCount = 10)
+   @Test
    public void testEviction() throws Exception
    {
       cache.put(fqn1, ExpirationAlgorithmConfig.EXPIRATION_KEY, future);

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java	2008-10-31 02:56:09 UTC (rev 7039)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/FIFOConfigurationTest.java	2008-10-31 03:44:34 UTC (rev 7040)
@@ -9,7 +9,8 @@
 import org.jboss.cache.config.ConfigurationException;
 import org.jboss.cache.config.parsing.XmlConfigHelper;
 import org.jboss.cache.config.parsing.element.EvictionElementParser;
-import static org.testng.AssertJUnit.*;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
@@ -46,17 +47,10 @@
 
       Element element = XmlConfigHelper.stringToElementInCoreNS(xml);
 
-      try
-      {
-         EvictionElementParser.parseEvictionPolicyConfig(element, config);
-         config.validate();
-      }
-      catch (ConfigurationException ce)
-      {
-         assertTrue("Configure Exception properly thrown", true);
-         return;
-      }
-      fail("Invalid region FIFO configuration did not cause ConfigureException to be thrown");
+      EvictionElementParser.parseEvictionPolicyConfig(element, config);
+      config.validate();
+      assert config.getMaxNodes() == -1;
+      assert config.getMinTimeToLive() == -1;
    }
 
    public void testXMLParse3() throws Exception

Modified: core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java	2008-10-31 02:56:09 UTC (rev 7039)
+++ core/trunk/src/test/java/org/jboss/cache/eviction/LFUConfigurationTest.java	2008-10-31 03:44:34 UTC (rev 7040)
@@ -53,7 +53,7 @@
       config.validate();
 
       assertEquals(10, config.getMinNodes());
-      assertEquals(0, config.getMaxNodes());
+      assertEquals(-1, config.getMaxNodes());
    }
 
    public void testXMLParsing3() throws Exception