commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r1591925 [2/2] - in /commons/proper/jcs/trunk/commons-jcs-core/src: main/java/org/apache/commons/jcs/auxiliary/disk/ main/java/org/apache/commons/jcs/auxiliary/lateral/ main/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/ main/jav...
Date Fri, 02 May 2014 14:17:39 GMT
Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java?rev=1591925&r1=1591924&r2=1591925&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/fifo/FIFOMemoryCacheUnitTest.java
Fri May  2 14:17:38 2014
@@ -46,12 +46,12 @@ public class FIFOMemoryCacheUnitTest
         String cacheName = "testExpirationPolicy_oneExtra";
 
         ICompositeCacheAttributes attributes = new CompositeCacheAttributes();
+        attributes.setCacheName(cacheName);
         attributes.setMaxObjects( maxObjects );
         attributes.setSpoolChunkSize( 1 );
 
         FIFOMemoryCache<String, String> cache = new FIFOMemoryCache<String, String>();
-        cache.initialize( new CompositeCache<String, String>( cacheName, attributes,
-                                              new ElementAttributes() ) );
+        cache.initialize( new CompositeCache<String, String>( attributes, new ElementAttributes()
) );
 
         for ( int i = 0; i <= maxObjects; i++ )
         {
@@ -86,12 +86,12 @@ public class FIFOMemoryCacheUnitTest
         String cacheName = "testExpirationPolicy_oneExtra";
 
         ICompositeCacheAttributes attributes = new CompositeCacheAttributes();
+        attributes.setCacheName(cacheName);
         attributes.setMaxObjects( maxObjects );
         attributes.setSpoolChunkSize( 1 );
 
         FIFOMemoryCache<String, String> cache = new FIFOMemoryCache<String, String>();
-        cache.initialize( new CompositeCache<String, String>( cacheName, attributes,
-                                              new ElementAttributes() ) );
+        cache.initialize( new CompositeCache<String, String>( attributes, new ElementAttributes()
) );
 
         // DO WORK
         for ( int i = 0; i <= (maxObjects * 2); i++ )

Modified: commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java?rev=1591925&r1=1591924&r2=1591925&view=diff
==============================================================================
--- commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java
(original)
+++ commons/proper/jcs/trunk/commons-jcs-core/src/test/java/org/apache/commons/jcs/engine/memory/shrinking/ShrinkerThreadUnitTest.java
Fri May  2 14:17:38 2014
@@ -28,7 +28,9 @@ import org.apache.commons.jcs.engine.Com
 import org.apache.commons.jcs.engine.ElementAttributes;
 import org.apache.commons.jcs.engine.ElementAttributesUtils;
 import org.apache.commons.jcs.engine.behavior.ICacheElement;
+import org.apache.commons.jcs.engine.control.CompositeCache;
 import org.apache.commons.jcs.engine.control.event.ElementEventHandlerMockImpl;
+import org.apache.commons.jcs.engine.control.event.behavior.ElementEventType;
 import org.apache.commons.jcs.engine.memory.MockMemoryCache;
 
 /**
@@ -45,13 +47,12 @@ public class ShrinkerThreadUnitTest
     public void testCheckForRemoval_Expired() throws IOException
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
         cacheAttr.setMaxSpoolPerRun( 10 );
-        memory.setCacheAttributes( cacheAttr );
 
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
 
         String key = "key";
         String value = "value";
@@ -67,7 +68,9 @@ public class ShrinkerThreadUnitTest
         now += 2000;
 
         // DO WORK
-        boolean result = shrinker.checkForRemoval( element, now );
+        boolean result = cache.isExpired( element, now,
+                ElementEventType.EXCEEDED_MAXLIFE_BACKGROUND,
+                ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
         assertTrue( "Item should have expired.", result );
@@ -79,13 +82,12 @@ public class ShrinkerThreadUnitTest
     public void testCheckForRemoval_NotExpired() throws IOException
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
         cacheAttr.setMaxSpoolPerRun( 10 );
-        memory.setCacheAttributes( cacheAttr );
 
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
 
         String key = "key";
         String value = "value";
@@ -101,7 +103,9 @@ public class ShrinkerThreadUnitTest
         now -= 2000;
 
         // DO WORK
-        boolean result = shrinker.checkForRemoval( element, now );
+        boolean result = cache.isExpired( element, now,
+                ElementEventType.EXCEEDED_MAXLIFE_BACKGROUND,
+                ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
         assertFalse( "Item should not have expired.", result );
@@ -113,13 +117,12 @@ public class ShrinkerThreadUnitTest
     public void testCheckForRemoval_IdleTooLong() throws IOException
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
         cacheAttr.setMaxSpoolPerRun( 10 );
-        memory.setCacheAttributes( cacheAttr );
 
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
 
         String key = "key";
         String value = "value";
@@ -136,7 +139,9 @@ public class ShrinkerThreadUnitTest
         now += 2000;
 
         // DO WORK
-        boolean result = shrinker.checkForRemoval( element, now );
+        boolean result = cache.isExpired( element, now,
+                ElementEventType.EXCEEDED_MAXLIFE_BACKGROUND,
+                ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
         assertTrue( "Item should have expired.", result );
@@ -148,13 +153,12 @@ public class ShrinkerThreadUnitTest
     public void testCheckForRemoval_NotIdleTooLong() throws IOException
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 10 );
         cacheAttr.setMaxSpoolPerRun( 10 );
-        memory.setCacheAttributes( cacheAttr );
 
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
 
         String key = "key";
         String value = "value";
@@ -171,7 +175,9 @@ public class ShrinkerThreadUnitTest
         now -= 2000;
 
         // DO WORK
-        boolean result = shrinker.checkForRemoval( element, now );
+        boolean result = cache.isExpired( element, now,
+                ElementEventType.EXCEEDED_MAXLIFE_BACKGROUND,
+                ElementEventType.EXCEEDED_IDLETIME_BACKGROUND );
 
         // VERIFY
         assertFalse( "Item should not have expired.", result );
@@ -187,13 +193,14 @@ public class ShrinkerThreadUnitTest
         throws Exception
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
-
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
+        cacheAttr.setMemoryCacheName("org.apache.commons.jcs.engine.memory.MockMemoryCache");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 1 );
         cacheAttr.setMaxSpoolPerRun( 10 );
 
-        memory.setCacheAttributes( cacheAttr );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
+        MockMemoryCache<String, String> memory = (MockMemoryCache<String, String>)cache.getMemoryCache();
 
         String key = "key";
         String value = "value";
@@ -213,9 +220,8 @@ public class ShrinkerThreadUnitTest
         ElementAttributesUtils.setLastAccessTime( elementAttr,  System.currentTimeMillis()
- 2000 );
 
         // DO WORK
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
-        Thread runner = new Thread( shrinker );
-        runner.run();
+        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
cache );
+        shrinker.run();
 
         Thread.sleep( 500 );
 
@@ -234,13 +240,14 @@ public class ShrinkerThreadUnitTest
         throws Exception
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
-
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
+        cacheAttr.setMemoryCacheName("org.apache.commons.jcs.engine.memory.MockMemoryCache");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 1 );
         cacheAttr.setMaxSpoolPerRun( 3 );
 
-        memory.setCacheAttributes( cacheAttr );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
+        MockMemoryCache<String, String> memory = (MockMemoryCache<String, String>)cache.getMemoryCache();
 
         for ( int i = 0; i < 10; i++ )
         {
@@ -263,9 +270,8 @@ public class ShrinkerThreadUnitTest
         }
 
         // DO WORK
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
-        Thread runner = new Thread( shrinker );
-        runner.run();
+        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
cache );
+        shrinker.run();
 
         // VERIFY
         Thread.sleep( 500 );
@@ -284,13 +290,14 @@ public class ShrinkerThreadUnitTest
         throws Exception
     {
         // SETUP
-        MockMemoryCache<String, String> memory = new MockMemoryCache<String, String>();
-
         CompositeCacheAttributes cacheAttr = new CompositeCacheAttributes();
+        cacheAttr.setCacheName("testRegion");
+        cacheAttr.setMemoryCacheName("org.apache.commons.jcs.engine.memory.MockMemoryCache");
         cacheAttr.setMaxMemoryIdleTimeSeconds( 1 );
         cacheAttr.setMaxSpoolPerRun( 3 );
 
-        memory.setCacheAttributes( cacheAttr );
+        CompositeCache<String, String> cache = new CompositeCache<String, String>(cacheAttr,
new ElementAttributes());
+        MockMemoryCache<String, String> memory = (MockMemoryCache<String, String>)cache.getMemoryCache();
 
         ElementEventHandlerMockImpl handler = new ElementEventHandlerMockImpl();
 
@@ -316,9 +323,8 @@ public class ShrinkerThreadUnitTest
         }
 
         // DO WORK
-        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
memory );
-        Thread runner = new Thread( shrinker );
-        runner.run();
+        ShrinkerThread<String, String> shrinker = new ShrinkerThread<String, String>(
cache );
+        shrinker.run();
 
         // VERIFY
         Thread.sleep( 500 );



Mime
View raw message