hchar 2005/02/01 02:36:26
Modified: sandbox/yajcache/test/org/apache/jcs/yajcache/core
SafeCacheManagerTest.java
sandbox/yajcache/test/org/apache/jcs/yajcache/soft
SoftRefCacheTest.java SoftRefFileCacheSafeTest.java
Log:
signature change
Revision Changes Path
1.4 +32 -25
jakarta-turbine-jcs/sandbox/yajcache/test/org/apache/jcs/yajcache/core/SafeCacheManagerTest.java
Index: SafeCacheManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/sandbox/yajcache/test/org/apache/jcs/yajcache/core/SafeCacheManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SafeCacheManagerTest.java 29 Jan 2005 12:37:00 -0000 1.3
+++ SafeCacheManagerTest.java 1 Feb 2005 10:36:26 -0000 1.4
@@ -34,36 +34,37 @@
public void testGetCache() {
log.debug("Test getCache and get");
- ICacheSafe<String> c =
SafeCacheManager.inst.getCache(CacheType.SOFT_REFERENCE_SAFE, "myCache",
String.class);
+ ICacheSafe<String> c = CacheManager.inst.getSafeCache(
+ "myCache", String.class, CacheType.SOFT_REFERENCE_SAFE);
assertTrue(null == c.get("bla"));
log.debug("Test getCache and put");
- c = SafeCacheManager.inst.getCache("myCache", String.class);
+ c = CacheManager.inst.getSafeCache("myCache", String.class);
c.put("bla", "First Put");
assertTrue("First Put" == c.get("bla"));
assertEquals(c.size(), 1);
log.debug("Test getCache and remove");
- c = SafeCacheManager.inst.getCache("myCache", String.class);
+ c = CacheManager.inst.getSafeCache("myCache", String.class);
c.remove("bla");
assertTrue(null == c.get("bla"));
log.debug("Test getCache and two put's");
- c = SafeCacheManager.inst.getCache("myCache", String.class);
+ c = CacheManager.inst.getSafeCache("myCache", String.class);
c.put("1", "First Put");
c.put("2", "Second Put");
assertEquals(c.size(), 2);
assertTrue("Second Put" == c.get("2"));
assertTrue("First Put" == c.get("1"));
log.debug("Test getCache and clear");
- c = SafeCacheManager.inst.getCache("myCache", String.class);
+ c = CacheManager.inst.getSafeCache("myCache", String.class);
c.clear();
assertEquals(c.size(), 0);
assertTrue(null == c.get("2"));
assertTrue(null == c.get("1"));
log.debug("Test getCache and getValueType");
- ICacheSafe c1 = SafeCacheManager.inst.getCache("myCache");
+ ICacheSafe c1 = CacheManager.inst.getSafeCache("myCache");
assertTrue(c1.getValueType() == String.class);
log.debug("Test checking of cache value type");
try {
- ICacheSafe<Integer> c2 =
SafeCacheManager.inst.getCache("myCache", Integer.class);
+ ICacheSafe<Integer> c2 =
CacheManager.inst.getSafeCache("myCache", Integer.class);
assert false : "Bug: Cache for string cannot be used for
Integer.";
} catch(ClassCastException ex) {
// should go here.
@@ -72,12 +73,15 @@
public void testGetCacheRaceCondition() {
log.debug("Test simulation of race condition in creating cache");
- ICacheSafe intCache =
SafeCacheManager.inst.testCreateCacheRaceCondition("race", Integer.class);
- ICacheSafe intCache1 =
SafeCacheManager.inst.testCreateCacheRaceCondition("race", Integer.class);
+ ICache intCache = CacheManager.inst.testCreateCacheRaceCondition(
+ "race", Integer.class, CacheType.SOFT_REFERENCE_SAFE);
+ ICache intCache1 = CacheManager.inst.testCreateCacheRaceCondition(
+ "race", Integer.class, CacheType.SOFT_REFERENCE_SAFE);
log.debug("Test simulation of the worst case scenario: "
+ "race condition in creating cache AND class cast
exception");
try {
- ICacheSafe<Double> doubleCache =
SafeCacheManager.inst.testCreateCacheRaceCondition("race", Double.class);
+ ICache doubleCache =
CacheManager.inst.testCreateCacheRaceCondition(
+ "race", Double.class, CacheType.SOFT_REFERENCE_SAFE);
assert false : "Bug: Cache for Integer cannot be used for
Double.";
} catch(ClassCastException ex) {
// should go here.
@@ -87,15 +91,17 @@
public void testRemoveCache() {
log.debug("Test remove cache");
- ICacheSafe<Integer> intCache =
SafeCacheManager.inst.getCache("race", Integer.class);
+ ICacheSafe<Integer> intCache =
CacheManager.inst.getSafeCache("race", Integer.class);
intCache.put("1", 1);
assertEquals(intCache.size(), 1);
- assertEquals(intCache, SafeCacheManager.inst.removeCache("race"));
+ assertEquals(intCache, CacheManager.inst.removeCache("race"));
assertEquals(intCache.size(), 0);
- ICacheSafe intCache1 = SafeCacheManager.inst.getCache("race",
Integer.class);
+ ICacheSafe intCache1 = CacheManager.inst.getSafeCache("race",
Integer.class);
assertFalse(intCache == intCache1);
- SafeCacheManager.inst.removeCache("race");
- ICacheSafe<Double> doubleCache =
SafeCacheManager.inst.testCreateCacheRaceCondition("race", Double.class);
+ CacheManager.inst.removeCache("race");
+ ICache<Double> doubleCache =
+ CacheManager.inst.testCreateCacheRaceCondition(
+ "race", Double.class, CacheType.SOFT_REFERENCE_SAFE);
doubleCache.put("double", 1.234);
assertEquals(1.234, doubleCache.get("double"));
}
@@ -103,23 +109,23 @@
public void testGetSafeCache() {
log.debug("Test getCache and getCopy");
{
- ICacheSafe<String> c = SafeCacheManager.inst.getCache(
- CacheType.SOFT_REFERENCE_SAFE, "myCache", String.class);
+ ICacheSafe<String> c = CacheManager.inst.getSafeCache(
+ "myCache", String.class, CacheType.SOFT_REFERENCE_SAFE);
assertTrue(null == c.getCopy("bla"));
log.debug("Test getCache and putCopy");
- c = SafeCacheManager.inst.getCache("myCache", String.class);
+ c = CacheManager.inst.getSafeCache("myCache", String.class);
c.putCopy("bla", "First Put");
assertTrue("First Put" == c.getBeanClone("bla"));
assertEquals(c.size(), 1);
log.debug("Test getCache and remove");
- c = SafeCacheManager.inst.getCache("myCache", String.class);
+ c = CacheManager.inst.getSafeCache("myCache", String.class);
c.remove("bla");
assertTrue(null == c.getCopy("bla"));
log.debug("Test getCache and two putCopy's");
}
- SafeCacheManager.inst.removeCache("myCache");
- ICacheSafe<TestSerializable> c = SafeCacheManager.inst.getCache(
- CacheType.SOFT_REFERENCE_SAFE, "myCache",
TestSerializable.class);
+ CacheManager.inst.removeCache("myCache");
+ ICacheSafe<TestSerializable> c = CacheManager.inst.getSafeCache(
+ "myCache", TestSerializable.class,
CacheType.SOFT_REFERENCE_SAFE);
TestSerializable[] ta = {
new TestSerializable("First Put"),
new TestSerializable("Second Put"),
@@ -152,17 +158,18 @@
assertEquals(ta[2], c.getBeanCopy("3"));
assertEquals(ta[2], c.getCopy("3"));
log.debug("Test getCache and clear");
- c = SafeCacheManager.inst.getCache("myCache",
TestSerializable.class);
+ c = CacheManager.inst.getSafeCache(
+ "myCache", TestSerializable.class,
CacheType.SOFT_REFERENCE_SAFE);
c.clear();
assertEquals(c.size(), 0);
assertTrue(null == c.getCopy("2"));
assertTrue(null == c.getCopy("1"));
log.debug("Test getCache and getValueType");
- ICacheSafe c1 = SafeCacheManager.inst.getCache("myCache");
+ ICacheSafe c1 = CacheManager.inst.getSafeCache("myCache");
assertTrue(c1.getValueType() == TestSerializable.class);
log.debug("Test checking of cache value type");
try {
- ICacheSafe<Integer> c2 =
SafeCacheManager.inst.getCache("myCache", Integer.class);
+ ICacheSafe<Integer> c2 =
CacheManager.inst.getSafeCache("myCache", Integer.class);
assert false : "Bug: Cache for string cannot be used for
Integer.";
} catch(ClassCastException ex) {
// should go here.
1.5 +1 -1
jakarta-turbine-jcs/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefCacheTest.java
Index: SoftRefCacheTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefCacheTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SoftRefCacheTest.java 29 Jan 2005 12:37:01 -0000 1.4
+++ SoftRefCacheTest.java 1 Feb 2005 10:36:26 -0000 1.5
@@ -36,7 +36,7 @@
public void testSoftRefCache() throws Exception {
ICache<byte[]> c = CacheManager.inst.getCache(
- CacheType.SOFT_REFERENCE, "bytesCache", byte[].class);
+ "bytesCache", byte[].class, CacheType.SOFT_REFERENCE);
for (int h=0; h < 10; h++) {
for (int i=h*10, max=i+10; i < max; i++) {
log.debug("put i="+i);
1.3 +3 -3
jakarta-turbine-jcs/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java
Index: SoftRefFileCacheSafeTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/sandbox/yajcache/test/org/apache/jcs/yajcache/soft/SoftRefFileCacheSafeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SoftRefFileCacheSafeTest.java 29 Jan 2005 12:37:01 -0000 1.2
+++ SoftRefFileCacheSafeTest.java 1 Feb 2005 10:36:26 -0000 1.3
@@ -18,10 +18,10 @@
import junit.framework.*;
import org.apache.jcs.yajcache.core.ICacheSafe;
-import org.apache.jcs.yajcache.core.SafeCacheManager;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.yajcache.core.CacheManager;
import org.apache.jcs.yajcache.core.CacheType;
import org.apache.jcs.yajcache.lang.annotation.*;
@@ -35,8 +35,8 @@
private Log log = LogFactory.getLog(this.getClass());
public void testSoftRefCache() throws Exception {
- ICacheSafe<byte[]> c = SafeCacheManager.inst.getCache(
- CacheType.SOFT_REFERENCE_FILE_SAFE, "bytesCache",
byte[].class);
+ ICacheSafe<byte[]> c = CacheManager.inst.getSafeCache(
+ "bytesCache", byte[].class,
CacheType.SOFT_REFERENCE_FILE_SAFE);
for (int h=0; h < 10; h++) {
for (int i=h*10, max=i+10; i < max; i++) {
log.debug("put i="+i);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
