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

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2007-10-05 05:19:41 -0400 (Fri, 05 Oct 2007)
New Revision: 4548

Modified:
   core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
   core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java
   core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
Log:
Fixed failing tests

Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java	2007-10-05 08:30:54 UTC (rev 4547)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java	2007-10-05 09:19:41 UTC (rev 4548)
@@ -74,8 +74,14 @@
       configureCache();
       cache.start();
       loader = cache.getCacheLoaderManager().getCacheLoader();
+      postConfigure();
    }
 
+   protected void postConfigure()
+   {
+      // no op.  Subclass if you need any further cfg after the cache starts.
+   }
+
    abstract protected void configureCache() throws Exception;
 
    @AfterMethod(alwaysRun = true)
@@ -2103,7 +2109,9 @@
       cache.getConfiguration().getCacheLoaderConfig().getIndividualCacheLoaderConfigs().get(0).setIgnoreModifications(true);
       cache.start();
       loader = cache.getCacheLoader();
+      postConfigure();
 
+
       // test that the cache loader is wrapped by a read-only delegate
       assert loader instanceof ReadOnlyDelegatingCacheLoader;
 

Modified: core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java	2007-10-05 08:30:54 UTC (rev 4547)
+++ core/trunk/src/test/java/org/jboss/cache/loader/LocalDelegatingCacheLoaderTest.java	2007-10-05 09:19:41 UTC (rev 4548)
@@ -32,6 +32,34 @@
       cache.setCacheLoader(cacheLoader);
    }
 
+   protected void postConfigure()
+   {
+      CacheLoader ldr = loader;
+      LocalDelegatingCacheLoader ldcl = null;
+      do
+      {
+         if (ldr instanceof LocalDelegatingCacheLoader)
+         {
+            ldcl = (LocalDelegatingCacheLoader) ldr;
+         }
+         else
+         {
+            if (ldr instanceof AbstractDelegatingCacheLoader)
+            {
+               // look deeper in the delegate chain
+               ldr = ((AbstractDelegatingCacheLoader) ldr).getCacheLoader();
+            }
+            else
+            {
+               // can't dig any deeper!
+               break;
+            }
+         }
+      } while (ldcl == null);
+
+      ldcl.setDelegateCache(delegating_cache);
+   }
+
    @AfterMethod(alwaysRun = true)
    public void tearDown() throws Exception
    {

Modified: core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java	2007-10-05 08:30:54 UTC (rev 4547)
+++ core/trunk/src/test/java/org/jboss/cache/loader/SingletonStoreCacheLoaderTest.java	2007-10-05 09:19:41 UTC (rev 4548)
@@ -6,20 +6,6 @@
  */
 package org.jboss.cache.loader;
 
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertFalse;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.fail;
-
-import java.util.concurrent.Callable;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.cache.CacheImpl;
@@ -31,14 +17,26 @@
 import org.jboss.cache.factories.UnitTestCacheConfigurationFactory;
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.xml.XmlHelper;
+import static org.testng.AssertJUnit.*;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Test;
 import org.w3c.dom.Element;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 /**
  * Unit test class for SingletonStoreCacheLoader
  *
  * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  */
+ at Test(groups = {"functional"})
 public class SingletonStoreCacheLoaderTest extends AbstractCacheLoaderTestBase
 {
    private static final Log log = LogFactory.getLog(SingletonStoreCacheLoaderTest.class);