svn commit: r897532 - in /ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache: SoftCacheTest.java WeakCacheTest.java

[cbegin]

Author: cbegin
Date: Sat Jan  9 20:11:11 2010
New Revision: 897532

URL: http://svn.apache.org/viewvc?rev=897532&view=rev
Log:
implemented test enhancement suggested on dev mailing list with subject 
SoftCacheTest is Failing Dec 23 2009

Modified:
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
    
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java?rev=897532&r1=897531&r2=897532&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/SoftCacheTest.java
 Sat Jan  9 20:11:11 2010
@@ -10,17 +10,22 @@
 
   @Test
   public void shouldDemonstrateObjectsBeingCollectedAsNeeded() throws 
Exception {
-    final int N = 300000;
+    final int N = 3000000;
     SoftCache cache = new SoftCache(new PerpetualCache("default"));
     for (int i = 0; i < N; i++) {
       byte[] array = new byte[5001]; //waste a bunch of memory
       array[5000] = 1;
       cache.putObject(i, array);
       Object value = cache.getObject(i);
+      if (cache.getSize() < i + 1) {
+        System.out.println("Cache exceeded with " + (i + 1) + " entries.");
+        break;
+      }
     }
     assertTrue(cache.getSize() < N);
   }
 
+
   @Test
   public void shouldDemonstrateCopiesAreEqual() {
     Cache cache = new SoftCache(new PerpetualCache("default"));

Modified: 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
URL: 
http://svn.apache.org/viewvc/ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java?rev=897532&r1=897531&r2=897532&view=diff
==============================================================================
--- 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
 (original)
+++ 
ibatis/java/ibatis-3/trunk/ibatis-3-core/src/test/java/org/apache/ibatis/cache/WeakCacheTest.java
 Sat Jan  9 20:11:11 2010
@@ -10,16 +10,20 @@
 public class WeakCacheTest {
 
   @Test
-  @Ignore
   public void shouldDemonstrateObjectsBeingCollectedAsNeeded() {
-    final int N = 300000;
+    final int N = 3000000;
     WeakCache cache = new WeakCache(new PerpetualCache("default"));
     for (int i = 0; i < N; i++) {
       cache.putObject(i, i);
+      if (cache.getSize() < i + 1) {
+        System.out.println("Cache exceeded with " + (i + 1) + " entries.");
+        break;
+      }
     }
     assertTrue(cache.getSize() < N);
   }
 
+
   @Test
   public void shouldDemonstrateCopiesAreEqual() {
     Cache cache = new WeakCache(new PerpetualCache("default"));