Modified: 
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/EHCacheTest.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/EHCacheTest.java?rev=670326&r1=670325&r2=670326&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/EHCacheTest.java 
(original)
+++ 
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/EHCacheTest.java 
Sun Jun 22 02:31:47 2008
@@ -24,9 +24,10 @@
 
 import org.apache.avalon.framework.component.ComponentException;
 import org.apache.fulcrum.testcontainer.BaseUnitTest;
+
 /**
  * EHCacheTest
- *
+ * 
  * @author <a href="[EMAIL PROTECTED]">Eric Pugh</a>
  * @version $Id: CacheTest.java 223198 2004-11-09 08:30:41Z epugh $
  */
@@ -34,14 +35,16 @@
 {
 
     private EHCacheService ehCacheService = null;
+
     private static final String cacheKey = "CacheKey";
-    private static final String cacheKey_2 = "CacheKey_2";
 
+    private static final String cacheKey_2 = "CacheKey_2";
 
     /**
      * Defines the testcase name for JUnit.
-     *
-     * @param name the testcase's name.
+     * 
+     * @param name
+     *            the testcase's name.
      */
     public EHCacheTest(String name)
     {
@@ -53,7 +56,8 @@
         super.setUp();
         try
         {
-            ehCacheService = (EHCacheService) this.lookup(EHCacheService.ROLE);
+            this.ehCacheService = (EHCacheService) this
+                    .lookup(EHCacheService.ROLE);
         }
         catch (ComponentException e)
         {
@@ -61,135 +65,129 @@
             fail(e.getMessage());
         }
     }
+
     /**
      * Simple test that verify an object can be created and deleted.
+     * 
      * @throws Exception
      */
     public void testSimpleAddGetCacheObject() throws Exception
     {
-               Cache ehCache = new Cache("test", 1, true, false, 5, 2);
-               ehCacheService.getCacheManager().addCache(ehCache);
-        String testString = new String("This is a test");
+        Cache ehCache = new Cache("test", 1, true, false, 5, 2);
+        this.ehCacheService.getCacheManager().addCache(ehCache);
+        String testString = "This is a test";
         Object retrievedObject = null;
         Element cacheObject1 = null;
         // Create object
-        cacheObject1 = new Element(cacheKey,testString);
+        cacheObject1 = new Element(cacheKey, testString);
         assertNotNull("Failed to create a cachable object 1", cacheObject1);
         // Add object to cache
         ehCache.put(cacheObject1);
         // Get object from cache
         retrievedObject = ehCache.get(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1", retrievedObject);
-        assertTrue("Did not retrieved a correct, expected cached object 1", 
retrievedObject == cacheObject1);
+        assertNotNull("Did not retrieve a cached object 1", retrievedObject);
+        assertSame("Did not retrieve a correct, expected cached object 1",
+                retrievedObject, cacheObject1);
         // Remove object from cache
         ehCache.remove(cacheKey);
         // Verify object removed from cache
         retrievedObject = null;
         cacheObject1 = null;
-        try
-        {
-            retrievedObject = ehCache.get(cacheKey);
-            assertNull(
+
+        retrievedObject = ehCache.get(cacheKey);
+        assertNull(
                 "Retrieved the deleted cached object 1 and did not get 
expected ObjectExpiredException",
                 retrievedObject);
-        }
 
-        catch (Exception e)
-        {
-            throw e;
-        }
         // Remove object from cache that does NOT exist in the cache
         ehCache.remove(cacheKey);
     }
+
     /**
      * Simple test that adds, retrieves, and deletes 2 object.
-     *
+     * 
      * @throws Exception
      */
     public void test2ObjectAddGetCachedObject() throws Exception
     {
-               Cache ehCache = new Cache("test2", 1, true, false, 5, 2);
-               ehCacheService.getCacheManager().addCache(ehCache);
-        String testString = new String("This is a test");
+        Cache ehCache = new Cache("test2", 1, true, false, 5, 2);
+        this.ehCacheService.getCacheManager().addCache(ehCache);
+        String testString = "This is a test";
         Object retrievedObject = null;
         Element cacheObject1 = null;
         Element cacheObject2 = null;
         // Create and add Object #1
-        cacheObject1 = new Element(cacheKey,testString);
+        cacheObject1 = new Element(cacheKey, testString);
         assertNotNull("Failed to create a cachable object 1", cacheObject1);
         ehCache.put(cacheObject1);
         retrievedObject = ehCache.get(cacheKey);
         assertNotNull("Did not retrieved a cached object 1", retrievedObject);
-        assertEquals("Did not retrieved correct cached object", cacheObject1, 
retrievedObject);
+        assertEquals("Did not retrieved correct cached object", cacheObject1,
+                retrievedObject);
         // Create and add Object #2
-        cacheObject2 = new Element(cacheKey_2,testString);
+        cacheObject2 = new Element(cacheKey_2, testString);
         assertNotNull("Failed to create a cachable object 2", cacheObject2);
         ehCache.put(cacheObject2);
         retrievedObject = ehCache.get(cacheKey_2);
         assertNotNull("Did not retrieved a cached object 2", retrievedObject);
-        assertEquals("Did not retrieved correct cached object 2", 
cacheObject2, retrievedObject);
+        assertEquals("Did not retrieved correct cached object 2", cacheObject2,
+                retrievedObject);
         // Get object #1
         retrievedObject = ehCache.get(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1. Attempt #2", 
retrievedObject);
-        assertEquals("Did not retrieved correct cached object 1. Attempt #2", 
cacheObject1, retrievedObject);
+        assertNotNull("Did not retrieved a cached object 1. Attempt #2",
+                retrievedObject);
+        assertEquals("Did not retrieved correct cached object 1. Attempt #2",
+                cacheObject1, retrievedObject);
         // Get object #1
         retrievedObject = ehCache.get(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1. Attempt #3", 
retrievedObject);
-        assertEquals("Did not retrieved correct cached object 1. Attempt #3", 
cacheObject1, retrievedObject);
+        assertNotNull("Did not retrieved a cached object 1. Attempt #3",
+                retrievedObject);
+        assertEquals("Did not retrieved correct cached object 1. Attempt #3",
+                cacheObject1, retrievedObject);
         // Get object #2
         retrievedObject = ehCache.get(cacheKey_2);
-        assertNotNull("Did not retrieved a cached object 2. Attempt #2", 
retrievedObject);
-        assertEquals("Did not retrieved correct cached object 2 Attempt #2", 
cacheObject2, retrievedObject);
+        assertNotNull("Did not retrieved a cached object 2. Attempt #2",
+                retrievedObject);
+        assertEquals("Did not retrieved correct cached object 2 Attempt #2",
+                cacheObject2, retrievedObject);
         // Remove objects
         ehCache.remove(cacheKey);
         ehCache.remove(cacheKey_2);
     }
 
     /**
-     * Verify that an object expiration
-     * when it now longer exists in cache.
-     *
+     * Verify that an object expiration when it now longer exists in cache.
+     * 
      * @throws Exception
      */
     public void testObjectExpiration() throws Exception
     {
-               Cache ehCache = new Cache("expire", 1, true, false, 2, 2);
-               ehCacheService.getCacheManager().addCache(ehCache);
-        String testString = new String("This is a test");
+        Cache ehCache = new Cache("expire", 1, true, false, 2, 2);
+        this.ehCacheService.getCacheManager().addCache(ehCache);
+        String testString = "This is a test";
         Object retrievedObject = null;
         Element cacheObject = null;
         // Create and add Object that expires in 1000 millis (1 second)
-        cacheObject = new Element(cacheKey,testString);
+        cacheObject = new Element(cacheKey, testString);
         assertNotNull("Failed to create a cachable object", cacheObject);
         ehCache.put(cacheObject);
+
         // Try to get un-expired object
-        try
-        {
-            retrievedObject = null;
-            retrievedObject = ehCache.get(cacheKey);
-            assertNotNull("Did not retrieved a cached object", 
retrievedObject);
-            assertEquals("Did not retrieved correct cached object", 
cacheObject, retrievedObject);
-        }
+        retrievedObject = ehCache.get(cacheKey);
+        assertNotNull("Did not retrieved a cached object", retrievedObject);
+        assertEquals("Did not retrieved correct cached object", cacheObject,
+                retrievedObject);
 
-        catch (Exception e)
-        {
-            throw e;
-        }
         // Sleep 3000 Millis (3 seconds)
         Thread.sleep(3000);
         // Try to get expired object
-        try
-        {
-            retrievedObject = null;
-            retrievedObject = ehCache.get(cacheKey);
-            assertNull(
+
+        retrievedObject = null;
+        retrievedObject = ehCache.get(cacheKey);
+        assertNull(
                 "Retrieved the expired cached object  and did not get expected 
ObjectExpiredException",
                 retrievedObject);
-        }
-        catch (Exception e)
-        {
-            throw e;
-        }
+
         // Remove objects
         ehCache.remove(cacheKey);
     }

Modified: 
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/JCSCacheTest.java
URL: 
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/JCSCacheTest.java?rev=670326&r1=670325&r2=670326&view=diff
==============================================================================
--- 
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/JCSCacheTest.java 
(original)
+++ 
turbine/fulcrum/trunk/cache/src/test/org/apache/fulcrum/cache/JCSCacheTest.java 
Sun Jun 22 02:31:47 2008
@@ -20,7 +20,6 @@
  */
 
 // Cactus and Junit imports
-
 import java.util.ConcurrentModificationException;
 import java.util.Date;
 import java.util.Iterator;
@@ -33,22 +32,27 @@
 
 /**
  * JCSCacheTest
- *
+ * 
  * @author <a href="[EMAIL PROTECTED]">Thomas Vandahl</a>
  * @version $Id:$
  */
 public class JCSCacheTest extends BaseUnitTest
 {
     private GlobalCacheService globalCache = null;
+
     private static final String cacheKey = "CacheKey";
+
     private static final String cacheKey_2 = "CacheKey_2";
+
     public static final String SKIP_TESTS_KEY = 
"fulcrum.cache.skip.long.tests";
+
     private static final Log LOG = LogFactory.getLog(JCSCacheTest.class);
 
     /**
      * Defines the testcase name for JUnit.
-     *
-     * @param name the testcase's name.
+     * 
+     * @param name
+     *            the testcase's name.
      */
     public JCSCacheTest(String name)
     {
@@ -60,7 +64,8 @@
         super.setUp();
         try
         {
-            globalCache = (GlobalCacheService) 
this.lookup(GlobalCacheService.ROLE + "_JCS");
+            this.globalCache = (GlobalCacheService) this
+                    .lookup(GlobalCacheService.ROLE + "_JCS");
         }
         catch (ComponentException e)
         {
@@ -71,123 +76,128 @@
 
     /**
      * Simple test that verify an object can be created and deleted.
-     *
+     * 
      * @throws Exception
      */
     public void testSimpleAddGetCacheObject() throws Exception
     {
-        String testString = new String("This is a test");
+        String testString = "This is a test";
         Object retrievedObject = null;
         CachedObject cacheObject1 = null;
         // Create object
         cacheObject1 = new CachedObject(testString);
         assertNotNull("Failed to create a cachable object 1", cacheObject1);
         // Add object to cache
-        globalCache.addObject(cacheKey, cacheObject1);
+        this.globalCache.addObject(cacheKey, cacheObject1);
         // Get object from cache
-        retrievedObject = globalCache.getObject(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1", retrievedObject);
-        assertTrue("Did not retrieved a correct, expected cached object 1", 
retrievedObject == cacheObject1);
+        retrievedObject = this.globalCache.getObject(cacheKey);
+        assertNotNull("Did not retrieve a cached object 1", retrievedObject);
+        assertSame("Did not retrieve a correct, expected cached object 1",
+                retrievedObject, cacheObject1);
         // Remove object from cache
-        globalCache.removeObject(cacheKey);
+        this.globalCache.removeObject(cacheKey);
         // Verify object removed from cache
         retrievedObject = null;
         cacheObject1 = null;
         try
         {
-            retrievedObject = globalCache.getObject(cacheKey);
+            retrievedObject = this.globalCache.getObject(cacheKey);
             assertNull(
-                "Retrieved the deleted cached object 1 and did not get 
expected ObjectExpiredException",
-                retrievedObject);
-            assertNotNull("Did not get expected ObjectExpiredException 
retrieving a deleted object", retrievedObject);
+                    "Retrieved the deleted cached object 1 and did not get 
expected ObjectExpiredException",
+                    retrievedObject);
+            assertNotNull(
+                    "Did not get expected ObjectExpiredException retrieving a 
deleted object",
+                    retrievedObject);
         }
         catch (ObjectExpiredException e)
         {
             assertNull(
-                "Retrieved the deleted cached object 1, but caught expected 
ObjectExpiredException exception",
-                retrievedObject);
-        }
-        catch (Exception e)
-        {
-            throw e;
+                    "Retrieved the deleted cached object 1, but caught 
expected ObjectExpiredException exception",
+                    retrievedObject);
         }
         // Remove object from cache that does NOT exist in the cache
-        globalCache.removeObject(cacheKey);
+        this.globalCache.removeObject(cacheKey);
     }
 
     /**
      * Simple test that adds, retrieves, and deletes 2 object.
-     *
+     * 
      * @throws Exception
      */
     public void test2ObjectAddGetCachedObject() throws Exception
     {
-        String testString = new String("This is a test");
+        String testString = "This is a test";
         Object retrievedObject = null;
         CachedObject cacheObject1 = null;
         CachedObject cacheObject2 = null;
         // Create and add Object #1
         cacheObject1 = new CachedObject(testString);
         assertNotNull("Failed to create a cachable object 1", cacheObject1);
-        globalCache.addObject(cacheKey, cacheObject1);
-        retrievedObject = globalCache.getObject(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1", retrievedObject);
-        assertEquals("Did not retrieved correct cached object", cacheObject1, 
retrievedObject);
+        this.globalCache.addObject(cacheKey, cacheObject1);
+        retrievedObject = this.globalCache.getObject(cacheKey);
+        assertNotNull("Did not retrieve a cached object 1", retrievedObject);
+        assertEquals("Did not retrieve correct cached object", cacheObject1,
+                retrievedObject);
         // Create and add Object #2
         cacheObject2 = new CachedObject(testString);
         assertNotNull("Failed to create a cachable object 2", cacheObject2);
-        globalCache.addObject(cacheKey_2, cacheObject2);
-        retrievedObject = globalCache.getObject(cacheKey_2);
-        assertNotNull("Did not retrieved a cached object 2", retrievedObject);
-        assertEquals("Did not retrieved correct cached object 2", 
cacheObject2, retrievedObject);
+        this.globalCache.addObject(cacheKey_2, cacheObject2);
+        retrievedObject = this.globalCache.getObject(cacheKey_2);
+        assertNotNull("Did not retrieve a cached object 2", retrievedObject);
+        assertEquals("Did not retrieve correct cached object 2", cacheObject2,
+                retrievedObject);
         // Get object #1
-        retrievedObject = globalCache.getObject(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1. Attempt #2", 
retrievedObject);
-        assertEquals("Did not retrieved correct cached object 1. Attempt #2", 
cacheObject1, retrievedObject);
+        retrievedObject = this.globalCache.getObject(cacheKey);
+        assertNotNull("Did not retrieve a cached object 1. Attempt #2",
+                retrievedObject);
+        assertEquals("Did not retrieve correct cached object 1. Attempt #2",
+                cacheObject1, retrievedObject);
         // Get object #1
-        retrievedObject = globalCache.getObject(cacheKey);
-        assertNotNull("Did not retrieved a cached object 1. Attempt #3", 
retrievedObject);
-        assertEquals("Did not retrieved correct cached object 1. Attempt #3", 
cacheObject1, retrievedObject);
+        retrievedObject = this.globalCache.getObject(cacheKey);
+        assertNotNull("Did not retrieve a cached object 1. Attempt #3",
+                retrievedObject);
+        assertEquals("Did not retrieve correct cached object 1. Attempt #3",
+                cacheObject1, retrievedObject);
         // Get object #2
-        retrievedObject = globalCache.getObject(cacheKey_2);
-        assertNotNull("Did not retrieved a cached object 2. Attempt #2", 
retrievedObject);
-        assertEquals("Did not retrieved correct cached object 2 Attempt #2", 
cacheObject2, retrievedObject);
+        retrievedObject = this.globalCache.getObject(cacheKey_2);
+        assertNotNull("Did not retrieve a cached object 2. Attempt #2",
+                retrievedObject);
+        assertEquals("Did not retrieve correct cached object 2 Attempt #2",
+                cacheObject2, retrievedObject);
         // Remove objects
-        globalCache.removeObject(cacheKey);
-        globalCache.removeObject(cacheKey_2);
+        this.globalCache.removeObject(cacheKey);
+        this.globalCache.removeObject(cacheKey_2);
     }
 
     /**
-     * Verify that an object will throw the ObjectExpiredException
-     * when it now longer exists in cache.
-     *
+     * Verify that an object will throw the ObjectExpiredException when it now
+     * longer exists in cache.
+     * 
      * @throws Exception
      */
     public void testObjectExpiration() throws Exception
     {
-        String testString = new String("This is a test");
+        String testString = "This is a test";
         Object retrievedObject = null;
         CachedObject cacheObject = null;
         // Create and add Object that expires in 1000 millis (1 second)
         cacheObject = new CachedObject(testString, 1000);
         assertNotNull("Failed to create a cachable object", cacheObject);
         long addTime = System.currentTimeMillis();
-        globalCache.addObject(cacheKey, cacheObject);
+        this.globalCache.addObject(cacheKey, cacheObject);
         // Try to get un-expired object
         try
         {
-            retrievedObject = null;
-            retrievedObject = globalCache.getObject(cacheKey);
+            retrievedObject = this.globalCache.getObject(cacheKey);
             assertNotNull("Did not retrieved a cached object", 
retrievedObject);
-            assertEquals("Did not retrieved correct cached object", 
cacheObject, retrievedObject);
+            assertEquals("Did not retrieved correct cached object",
+                    cacheObject, retrievedObject);
         }
         catch (ObjectExpiredException e)
         {
-            assertTrue("Object expired early ( " + (System.currentTimeMillis() 
- addTime) + " millis)", false);
-        }
-        catch (Exception e)
-        {
-            throw e;
+            assertTrue("Object expired early ( "
+                    + (System.currentTimeMillis() - addTime) + " millis)",
+                    false);
         }
         // Sleep 1500 Millis (1.5 seconds)
         Thread.sleep(1500);
@@ -195,83 +205,85 @@
         try
         {
             retrievedObject = null;
-            retrievedObject = globalCache.getObject(cacheKey);
+            retrievedObject = this.globalCache.getObject(cacheKey);
             assertNull(
-                "Retrieved the expired cached object  and did not get expected 
ObjectExpiredException",
-                retrievedObject);
-            assertNotNull("Did not get expected ObjectExpiredException 
retrieving an expired object", retrievedObject);
+                    "Retrieved the expired cached object  and did not get 
expected ObjectExpiredException",
+                    retrievedObject);
+            assertNotNull(
+                    "Did not get expected ObjectExpiredException retrieving an 
expired object",
+                    retrievedObject);
         }
         catch (ObjectExpiredException e)
         {
             assertNull(
-                "Retrieved the expired cached object, but caught expected 
ObjectExpiredException exception",
-                retrievedObject);
-        }
-        catch (Exception e)
-        {
-            throw e;
+                    "Retrieved the expired cached object, but caught expected 
ObjectExpiredException exception",
+                    retrievedObject);
         }
         // Remove objects
-        globalCache.removeObject(cacheKey);
+        this.globalCache.removeObject(cacheKey);
     }
 
     /**
      * Verify the all object will be flushed from the cache.
-     *
+     * 
      * This test can take server minutes.
-     *
+     * 
      * @throws Exception
      */
     public void testCacheFlush() throws Exception
     {
-        String testString = new String("This is a test");
+        String testString = "This is a test";
         CachedObject cacheObject = null;
         // Create and add Object that expires in 1 turbine Refresh + 1 millis
         cacheObject = new CachedObject(testString, (getCacheRefresh() * 5) + 
1);
         assertNotNull("Failed to create a cachable object", cacheObject);
-        globalCache.addObject(cacheKey, cacheObject);
+        this.globalCache.addObject(cacheKey, cacheObject);
         // 1 Refresh
         Thread.sleep(getCacheRefresh() + 1);
-        assertTrue("No object in cache before flush", (0 < 
globalCache.getNumberOfObjects()));
+        assertTrue("No object in cache before flush", (0 < this.globalCache
+                .getNumberOfObjects()));
         // Flush Cache
-        globalCache.flushCache();
+        this.globalCache.flushCache();
         // Wait 15 seconds, 3 Refresh
         Thread.sleep((getCacheRefresh() * 2) + 1);
-        assertEquals("After refresh", 0, globalCache.getNumberOfObjects());
+        assertEquals("After refresh", 0, 
this.globalCache.getNumberOfObjects());
         // Remove objects
-        globalCache.removeObject(cacheKey);
+        this.globalCache.removeObject(cacheKey);
     }
 
     /**
      * Verify the Cache count is correct.
-     *
+     * 
      * @throws Exception
      */
     public void testObjectCount() throws Exception
     {
-        assertNotNull("Could not retrive cache service.", globalCache);
+        assertNotNull("Could not retrive cache service.", this.globalCache);
         // Create and add Object that expires in 1.5 turbine Refresh
         long expireTime = getCacheRefresh() + getCacheRefresh() / 2;
-        CachedObject cacheObject = new CachedObject("This is a test", 
expireTime);
+        CachedObject cacheObject = new CachedObject("This is a test",
+                expireTime);
         assertNotNull("Failed to create a cachable object", cacheObject);
-        globalCache.addObject("testObjectCount", cacheObject);
-        assertEquals("After adding 1 Object", 1, 
globalCache.getNumberOfObjects());
+        this.globalCache.addObject("testObjectCount", cacheObject);
+        assertEquals("After adding 1 Object", 1, this.globalCache
+                .getNumberOfObjects());
         // Wait until we're passed 1 refresh, but not half way.
         Thread.sleep(getCacheRefresh() + getCacheRefresh() / 3);
-        assertEquals("After one refresh", 1, globalCache.getNumberOfObjects());
+        assertEquals("After one refresh", 1, this.globalCache
+                .getNumberOfObjects());
         // Wait until we're passed 2 more refreshes
         Thread.sleep((getCacheRefresh() * 2) + getCacheRefresh() / 3);
-        assertEquals("After three refreshes", 0, 
globalCache.getNumberOfObjects());
+        assertEquals("After three refreshes", 0, this.globalCache
+                .getNumberOfObjects());
     }
 
     /**
-     * Verfy a refreshable object will refreshed in the following cases:
-     * - The object is retrieved via getObject an it is stale.
-     * - The object is determied to be stale during a cache
-     *   refresh
-     *
+     * Verfy a refreshable object will refreshed in the following cases: - The
+     * object is retrieved via getObject an it is stale. - The object is
+     * determied to be stale during a cache refresh
+     * 
      * This test can take serveral minutes.
-     *
+     * 
      * @throws Exception
      */
     public void testRefreshableObject() throws Exception
@@ -279,25 +291,24 @@
         Object retrievedObject = null;
         RefreshableCachedObject cacheObject = null;
         // Create and add Object that expires in TEST_EXPIRETIME millis.
-        cacheObject = new RefreshableCachedObject(new RefreshableObject(), 
getTestExpireTime());
+        cacheObject = new RefreshableCachedObject(new RefreshableObject(),
+                getTestExpireTime());
         assertNotNull("Failed to create a cachable object", cacheObject);
         long addTime = System.currentTimeMillis();
-        globalCache.addObject("refreshableObject", cacheObject);
+        this.globalCache.addObject("refreshableObject", cacheObject);
         // Try to get un-expired object
         try
         {
-            retrievedObject = null;
-            retrievedObject = globalCache.getObject("refreshableObject");
+            retrievedObject = this.globalCache.getObject("refreshableObject");
             assertNotNull("Did not retrieved a cached object", 
retrievedObject);
-            assertEquals("Did not retrieved correct cached object", 
cacheObject, retrievedObject);
+            assertEquals("Did not retrieved correct cached object",
+                    cacheObject, retrievedObject);
         }
         catch (ObjectExpiredException e)
         {
-            assertTrue("Object expired early ( " + (System.currentTimeMillis() 
- addTime) + " millis)", false);
-        }
-        catch (Exception e)
-        {
-            throw e;
+            assertTrue("Object expired early ( "
+                    + (System.currentTimeMillis() - addTime) + " millis)",
+                    false);
         }
         // Wait 1 Turbine cache refresh + 1 second.
         Thread.sleep(getTestExpireTime() + 1000);
@@ -305,30 +316,26 @@
         try
         {
             retrievedObject = null;
-            retrievedObject = globalCache.getObject("refreshableObject");
-            assertNotNull("Did not retrieved a cached object, after sleep", 
retrievedObject);
-            assertNotNull(
-                "Cached object has no contents, after sleep.",
-                ((RefreshableCachedObject) retrievedObject).getContents());
+            retrievedObject = this.globalCache.getObject("refreshableObject");
+            assertNotNull("Did not retrieved a cached object, after sleep",
+                    retrievedObject);
+            assertNotNull("Cached object has no contents, after sleep.",
+                    ((RefreshableCachedObject) retrievedObject).getContents());
             assertTrue(
-                "Object did not refresh.",
-                (((RefreshableObject) ((RefreshableCachedObject) 
retrievedObject).getContents()).getRefreshCount()
-                    > 0));
+                    "Object did not refresh.",
+                    (((RefreshableObject) ((RefreshableCachedObject) 
retrievedObject)
+                            .getContents()).getRefreshCount() > 0));
         }
         catch (ObjectExpiredException e)
         {
-            assertTrue(
-                "Received unexpected ObjectExpiredException exception "
+            assertTrue("Received unexpected ObjectExpiredException exception "
                     + "when retrieving refreshable object after ( "
-                    + (System.currentTimeMillis() - addTime)
-                    + " millis)",
-                false);
-        }
-        catch (Exception e)
-        {
-            throw e;
+                    + (System.currentTimeMillis() - addTime) + " millis)",
+                    false);
         }
-        // See if object will expires (testing every second for 100 seconds.  
It should not!
+
+        // See if object will expires (testing every second for 100 seconds. It
+        // should not!
         for (int i = 0; i < 100; i++)
         {
             Thread.sleep(1000); // Sleep 0.5 seconds
@@ -336,114 +343,108 @@
             try
             {
                 retrievedObject = null;
-                retrievedObject = globalCache.getObject("refreshableObject");
-                assertNotNull("Did not retrieved a cached object, after 
sleep", retrievedObject);
-                assertNotNull(
-                    "Cached object has no contents, after sleep.",
-                    ((RefreshableCachedObject) retrievedObject).getContents());
+                retrievedObject = this.globalCache
+                        .getObject("refreshableObject");
+                assertNotNull("Did not retrieved a cached object, after sleep",
+                        retrievedObject);
+                assertNotNull("Cached object has no contents, after sleep.",
+                        ((RefreshableCachedObject) retrievedObject)
+                                .getContents());
                 assertTrue(
-                    "Object did not refresh.",
-                    (((RefreshableObject) ((RefreshableCachedObject) 
retrievedObject).getContents()).getRefreshCount()
-                        > 0));
+                        "Object did not refresh.",
+                        (((RefreshableObject) ((RefreshableCachedObject) 
retrievedObject)
+                                .getContents()).getRefreshCount() > 0));
             }
             catch (ObjectExpiredException e)
             {
                 assertTrue(
-                    "Received unexpected ObjectExpiredException exception "
-                        + "when retrieving refreshable object after ( "
-                        + (System.currentTimeMillis() - addTime)
-                        + " millis)",
-                    false);
-            }
-            catch (Exception e)
-            {
-                throw e;
+                        "Received unexpected ObjectExpiredException exception "
+                                + "when retrieving refreshable object after ( "
+                                + (System.currentTimeMillis() - addTime)
+                                + " millis)", false);
             }
         }
         // Remove objects
-        globalCache.removeObject(cacheKey);
+        this.globalCache.removeObject(cacheKey);
     }
 
     /**
-     * Verify a cached object will be delete after it has been
-     * untouched beyond it's TimeToLive.
-     *
+     * Verify a cached object will be delete after it has been untouched beyond
+     * it's TimeToLive.
+     * 
      * This test can take serveral minutes.
-     *
+     * 
      * @throws Exception
      */
     public void testRefreshableTimeToLive() throws Exception
     {
-        String skipTestsProperty = System.getProperty(SKIP_TESTS_KEY,"false");
-        LOG.info("What is the value of the skipTestsProperty:" + 
skipTestsProperty);
-        if(Boolean.valueOf(skipTestsProperty).booleanValue()){
-            LOG.warn("Skipping testRefreshableTimeToLive test due to property 
" + SKIP_TESTS_KEY + " being true.");
+        String skipTestsProperty = System.getProperty(SKIP_TESTS_KEY, "false");
+        LOG.info("What is the value of the skipTestsProperty:"
+                + skipTestsProperty);
+        if (Boolean.valueOf(skipTestsProperty).booleanValue())
+        {
+            LOG.warn("Skipping testRefreshableTimeToLive test due to property "
+                    + SKIP_TESTS_KEY + " being true.");
             return;
         }
-        else {
-            LOG.warn("Running testRefreshableTimeToLive test due to property " 
+ SKIP_TESTS_KEY + " being false.");
+        else
+        {
+            LOG.warn("Running testRefreshableTimeToLive test due to property "
+                    + SKIP_TESTS_KEY + " being false.");
         }
 
         Object retrievedObject = null;
         RefreshableCachedObject cacheObject = null;
         // Create and add Object that expires in TEST_EXPIRETIME millis.
-        cacheObject = new RefreshableCachedObject(new RefreshableObject(), 
getTestExpireTime());
+        cacheObject = new RefreshableCachedObject(new RefreshableObject(),
+                getTestExpireTime());
         assertNotNull("Failed to create a cachable object", cacheObject);
         cacheObject.setTTL(getTestExpireTime());
         // Verify TimeToLive was set
-        assertEquals("Returned TimeToLive", getTestExpireTime(), 
cacheObject.getTTL());
+        assertEquals("Returned TimeToLive", getTestExpireTime(), cacheObject
+                .getTTL());
         // Add object to Cache
         long addTime = System.currentTimeMillis();
-        globalCache.addObject(cacheKey, cacheObject);
+        this.globalCache.addObject(cacheKey, cacheObject);
         // Try to get un-expired object
         try
         {
-            retrievedObject = null;
-            retrievedObject = globalCache.getObject(cacheKey);
+            retrievedObject = this.globalCache.getObject(cacheKey);
             assertNotNull("Did not retrieved a cached object", 
retrievedObject);
-            assertEquals("Did not retrieved correct cached object", 
cacheObject, retrievedObject);
+            assertEquals("Did not retrieved correct cached object",
+                    cacheObject, retrievedObject);
         }
         catch (ObjectExpiredException e)
         {
-            fail("Object expired early ( " + (System.currentTimeMillis() - 
addTime) + " millis)");
-        }
-        catch (Exception e)
-        {
-            throw e;
+            fail("Object expired early ( "
+                    + (System.currentTimeMillis() - addTime) + " millis)");
         }
         // Wait long enough to allow object to expire, but do not exceed TTL
-        long timeout = getTestExpireTime() - 0000;
+        long timeout = getTestExpireTime() - 0;
         Thread.sleep(timeout);
         // Try to get expired object
         try
         {
             retrievedObject = null;
-            retrievedObject = globalCache.getObject(cacheKey);
-            assertNotNull("Did not retrieve a cached object, after sleep", 
retrievedObject);
-            assertNotNull(
-                "Cached object has no contents, after sleep.",
-                ((RefreshableCachedObject) retrievedObject).getContents());
-                /*
-                 * @todo this is not working for some reason
-                 *
-                 *            assertTrue(
-                 *                "Object did not refresh.",
-                 *                (((RefreshableObject) 
((RefreshableCachedObject) retrievedObject).getContents()).getRefreshCount()
-                 *                    > 0));
-                 */
+            retrievedObject = this.globalCache.getObject(cacheKey);
+            assertNotNull("Did not retrieve a cached object, after sleep",
+                    retrievedObject);
+            assertNotNull("Cached object has no contents, after sleep.",
+                    ((RefreshableCachedObject) retrievedObject).getContents());
+            /*
+             * @todo this is not working for some reason
+             * 
+             * assertTrue( "Object did not refresh.", (((RefreshableObject)
+             * ((RefreshableCachedObject)
+             * retrievedObject).getContents()).getRefreshCount() > 0));
+             */
         }
         catch (ObjectExpiredException e)
         {
-            assertTrue(
-                "Received unexpected ObjectExpiredException exception "
+            assertTrue("Received unexpected ObjectExpiredException exception "
                     + "when retrieving refreshable object after ( "
-                    + (System.currentTimeMillis() - addTime)
-                    + " millis)",
-                false);
-        }
-        catch (Exception e)
-        {
-            throw e;
+                    + (System.currentTimeMillis() - addTime) + " millis)",
+                    false);
         }
         // Wait long enough to allow object to expire and exceed TTL
         Thread.sleep(getTestExpireTime() + 5000);
@@ -451,34 +452,35 @@
         try
         {
             retrievedObject = null;
-            retrievedObject = globalCache.getObject(cacheKey);
-            assertNull("Retrieved a cached object, after exceeding 
TimeToLive", retrievedObject);
+            retrievedObject = this.globalCache.getObject(cacheKey);
+            assertNull("Retrieved a cached object, after exceeding TimeToLive",
+                    retrievedObject);
         }
         catch (ObjectExpiredException e)
         {
             assertNull(
-                "Retrieved the expired cached object, but caught expected 
ObjectExpiredException exception",
-                retrievedObject);
-        }
-        catch (Exception e)
-        {
-            throw e;
+                    "Retrieved the expired cached object, but caught expected 
ObjectExpiredException exception",
+                    retrievedObject);
         }
     }
 
     /**
      * Test that we can get a list of the keys in the cache
      */
-    public void testCacheGetKeyList() {
-        globalCache.flushCache();
-        globalCache.addObject("date1", new CachedObject(new Date()));
-        globalCache.addObject("date2", new CachedObject(new Date()));
-        globalCache.addObject("date3", new CachedObject(new Date()));
-        assertTrue("Did not get key list back.", (globalCache.getKeys() != 
null));
-        List keys = globalCache.getKeys();
-        for (Iterator itr = keys.iterator(); itr.hasNext();) {
+    public void testCacheGetKeyList()
+    {
+        this.globalCache.flushCache();
+        this.globalCache.addObject("date1", new CachedObject(new Date()));
+        this.globalCache.addObject("date2", new CachedObject(new Date()));
+        this.globalCache.addObject("date3", new CachedObject(new Date()));
+        assertTrue("Did not get key list back.",
+                (this.globalCache.getKeys() != null));
+        List keys = this.globalCache.getKeys();
+        for (Iterator itr = keys.iterator(); itr.hasNext();)
+        {
             Object key = itr.next();
-            assertTrue("Key was not an instance of String.", (key instanceof 
String));
+            assertTrue("Key was not an instance of String.",
+                    (key instanceof String));
         }
 
     }
@@ -486,48 +488,62 @@
     /**
      * Test that we can get a list of the keys in the cache
      */
-    public void testCacheGetCachedObjects() {
-        globalCache.flushCache();
-        globalCache.addObject("date1", new CachedObject(new Date()));
-        globalCache.addObject("date2", new CachedObject(new Date()));
-        globalCache.addObject("date3", new CachedObject(new Date()));
-        assertTrue("Did not get object list back.", 
(globalCache.getCachedObjects() != null));
-        List objects = globalCache.getCachedObjects();
-        for (Iterator itr = objects.iterator(); itr.hasNext();) {
+    public void testCacheGetCachedObjects()
+    {
+        this.globalCache.flushCache();
+        this.globalCache.addObject("date1", new CachedObject(new Date()));
+        this.globalCache.addObject("date2", new CachedObject(new Date()));
+        this.globalCache.addObject("date3", new CachedObject(new Date()));
+        assertTrue("Did not get object list back.", (this.globalCache
+                .getCachedObjects() != null));
+        List objects = this.globalCache.getCachedObjects();
+        for (Iterator itr = objects.iterator(); itr.hasNext();)
+        {
             Object obj = itr.next();
             assertNotNull("Object was null.", obj);
-            assertTrue("Object was not an instance of CachedObject", (obj 
instanceof CachedObject));
+            assertTrue("Object was not an instance of CachedObject",
+                    (obj instanceof CachedObject));
         }
     }
 
     /**
      * Test that the retrieved list is safe from
-     * ConcurrentModificationException's being thrown if the cache
-     * is updated while we are iterating over the List.
+     * ConcurrentModificationException's being thrown if the cache is updated
+     * while we are iterating over the List.
      */
-    public void testCacheModification() {
-        globalCache.flushCache();
-        globalCache.addObject("date1", new CachedObject(new Date()));
-        globalCache.addObject("date2", new CachedObject(new Date()));
-        globalCache.addObject("date3", new CachedObject(new Date()));
-        assertTrue("Did not get key list back.", (globalCache.getKeys() != 
null));
-        List keys = globalCache.getKeys();
-        try {
-            for (Iterator itr = keys.iterator(); itr.hasNext();) {
+    public void testCacheModification()
+    {
+        this.globalCache.flushCache();
+        this.globalCache.addObject("date1", new CachedObject(new Date()));
+        this.globalCache.addObject("date2", new CachedObject(new Date()));
+        this.globalCache.addObject("date3", new CachedObject(new Date()));
+        assertTrue("Did not get key list back.",
+                (this.globalCache.getKeys() != null));
+        List keys = this.globalCache.getKeys();
+        try
+        {
+            for (Iterator itr = keys.iterator(); itr.hasNext();)
+            {
                 Object key = itr.next();
-                globalCache.addObject("date4", new CachedObject(new Date()));
+                this.globalCache.addObject("date4",
+                        new CachedObject(new Date()));
             }
-        } catch (ConcurrentModificationException cme)
+        }
+        catch (ConcurrentModificationException cme)
         {
             fail("Caught ConcurrentModificationException adding to cache.");
         }
-        List objects = globalCache.getCachedObjects();
-        try {
-            for (Iterator itr = objects.iterator(); itr.hasNext();) {
+        List objects = this.globalCache.getCachedObjects();
+        try
+        {
+            for (Iterator itr = objects.iterator(); itr.hasNext();)
+            {
                 Object obj = itr.next();
-                globalCache.addObject("date4", new CachedObject(new Date()));
+                this.globalCache.addObject("date4",
+                        new CachedObject(new Date()));
             }
-        } catch (ConcurrentModificationException cme)
+        }
+        catch (ConcurrentModificationException cme)
         {
             fail("Caught ConcurrentModificationException adding to cache.");
         }
@@ -536,17 +552,17 @@
     /**
      * Down cast the interface to the concreate object in order to grab the
      * cache check frequency.
-     *
+     * 
      * @return the refresh requency in milliseconds
      */
     private long getCacheRefresh()
     {
-        return 5*1000;
+        return 5 * 1000;
     }
 
     /**
      * How long until it expires
-     *
+     * 
      * @return the cache refresh plus 1000.
      */
     private long getTestExpireTime()
@@ -571,7 +587,7 @@
 
         /**
          * Reutrn the number of time this object has been refreshed
-         *
+         * 
          * @return Number of times refresh() has been called
          */
         public int getRefreshCount()


Reply via email to