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

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2007-10-08 10:16:26 -0400 (Mon, 08 Oct 2007)
New Revision: 4562

Modified:
   core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java
   core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java
Log:
Patched to deal with ChCL quirks

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-08 14:02:02 UTC (rev 4561)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.java	2007-10-08 14:16:26 UTC (rev 4562)
@@ -2114,9 +2114,14 @@
       postConfigure();
 
 
-      // test that the cache loader is wrapped by a read-only delegate
-      assert loader instanceof ReadOnlyDelegatingCacheLoader;
+      // CCL uses it's own mechanisms to ensure read-only behaviour
+      if (!(loader instanceof ChainingCacheLoader))
+      {
+         // test that the cache loader is wrapped by a read-only delegate
+         assert loader instanceof ReadOnlyDelegatingCacheLoader;
+      }
 
+
       // old state should be persisted.
       assert "v".equals(loader.get(fqn).get("k"));
       assert "v".equals(cache.get(fqn, "k"));      

Modified: core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java	2007-10-08 14:02:02 UTC (rev 4561)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasicTest.java	2007-10-08 14:16:26 UTC (rev 4562)
@@ -6,19 +6,21 @@
  */
 package org.jboss.cache.loader;
 
-import java.io.File;
-
 import org.jboss.cache.config.CacheLoaderConfig;
 import org.jboss.cache.factories.XmlConfigurationParser;
 import org.jboss.cache.misc.TestingUtil;
 import org.jboss.cache.xml.XmlHelper;
+import org.testng.annotations.Test;
 import org.w3c.dom.Element;
 
+import java.io.File;
+
 /**
  * Tests basic functionality of a chaining cache loader with 2 different loaders
  *
  * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
  */
+ at Test(groups = {"functional"})
 public class ChainingCacheLoaderBasicTest extends CacheLoaderTestsBase
 {
    private String loc1 = System.getProperty("java.io.tmpdir", ".") + File.separator + "JBossCache-ChainingCacheLoaderBasicTest-1";