From jbosscache-commits at lists.jboss.org Mon Oct  8 10:16:26 2007
Content-Type: multipart/mixed; boundary="===============4042935359329409788=="
MIME-Version: 1.0
From: jbosscache-commits at lists.jboss.org
To: jbosscache-commits at lists.jboss.org
Subject: [jbosscache-commits] JBoss Cache SVN: r4562 -
 core/trunk/src/test/java/org/jboss/cache/loader.
Date: Mon, 08 Oct 2007 10:16:26 -0400
Message-ID: <E1IetPG-0007Dp-DW@committer01.frg.pub.inap.atl.jboss.com>

--===============4042935359329409788==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: manik.surtani(a)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/ChainingCacheLoaderBasic=
Test.java
Log:
Patched to deal with ChCL quirks

Modified: core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsB=
ase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.ja=
va	2007-10-08 14:02:02 UTC (rev 4561)
+++ core/trunk/src/test/java/org/jboss/cache/loader/CacheLoaderTestsBase.ja=
va	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/ChainingCacheLoad=
erBasicTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasi=
cTest.java	2007-10-08 14:02:02 UTC (rev 4561)
+++ core/trunk/src/test/java/org/jboss/cache/loader/ChainingCacheLoaderBasi=
cTest.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 l=
oaders
  *
  * @author <a href=3D"mailto:manik(a)jboss.org">Manik Surtani (manik(a)jbo=
ss.org)</a>
  */
+(a)Test(groups =3D {"functional"})
 public class ChainingCacheLoaderBasicTest extends CacheLoaderTestsBase
 {
    private String loc1 =3D System.getProperty("java.io.tmpdir", ".") + Fil=
e.separator + "JBossCache-ChainingCacheLoaderBasicTest-1";


--===============4042935359329409788==--