X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fcache%2FCachedObjectTest.java;h=70d1b7af9733a6cc52769404d04b525f28f4131c;hb=0d8d8f24656e585ee75558cfd6a4c661f8f14985;hp=da6e1be6575a98cfb1652b933382126136bc505e;hpb=da48a523c81e59fe0eac34e43d12937396161f25;p=utils

diff --git a/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java b/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java
index da6e1be6..70d1b7af 100644
--- a/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java
+++ b/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java
@@ -38,8 +38,8 @@ public class CachedObjectTest extends TestCase {
 
     private static final int OBJECT_KEY = 10; 
     
-    private CachedObject.Computation<Integer,Integer> _computation;
-    private int _ncomputations; 
+    private CachedObject.Computation<Integer,Integer> computation;
+    private int ncomputations; 
     
     /* (non-Javadoc)
      * @see junit.framework.TestCase#setUp()
@@ -47,13 +47,13 @@ public class CachedObjectTest extends TestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        _computation = new CachedObject.Computation<Integer,Integer>() { 
+        computation = new CachedObject.Computation<Integer,Integer>() { 
             public Integer getObject(Integer aObjectKey) {
-                _ncomputations++;
+                ncomputations++;
                 return compute(aObjectKey);
             };
         };
-        _ncomputations = 0; 
+        ncomputations = 0; 
     }
     
     private int compute(int aValue) { 
@@ -61,7 +61,7 @@ public class CachedObjectTest extends TestCase {
     }
     
     private CachedObject<Integer, Integer> createCached(Cache<Integer,Integer> aCache) { 
-        return new CachedObject<Integer, Integer>(aCache, OBJECT_KEY, _computation);
+        return new CachedObject<Integer, Integer>(aCache, OBJECT_KEY, computation);
     }
 
     /**
@@ -73,18 +73,18 @@ public class CachedObjectTest extends TestCase {
         CachedObject<Integer, Integer> cached = createCached(new ZeroCache<Integer,Integer>());
         int value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations); 
+        assertEquals(1, ncomputations); 
     }
     
     public void testInvalidateCache() { 
         CachedObject<Integer, Integer> cached = createCached(new ForeverCache<Integer,Integer>());
         int value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations);
+        assertEquals(1, ncomputations);
         cached.invalidate(); 
         value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(2, _ncomputations);
+        assertEquals(2, ncomputations);
     }
     
     public void testBehaviorEhCache() throws CacheException, IOException {
@@ -94,28 +94,28 @@ public class CachedObjectTest extends TestCase {
         assertTrue( cache == cached.getCache());
         int value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations);
+        assertEquals(1, ncomputations);
         // The value must still be cached. 
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations);
+        assertEquals(1, ncomputations);
         
         // Cache expiry. 
         TimingUtils.sleep(6000); 
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(2, _ncomputations);
+        assertEquals(2, ncomputations);
         
         // Should still be cached now.
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(2, _ncomputations);
+        assertEquals(2, ncomputations);
         
         // explicit invalidation.
         cached.invalidate(); 
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(3, _ncomputations);
+        assertEquals(3, ncomputations);
         
     }
     
@@ -126,22 +126,22 @@ public class CachedObjectTest extends TestCase {
         assertTrue( cache == cached.getCache());
         int value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations);
+        assertEquals(1, ncomputations);
         // The value must still be cached. 
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations);
+        assertEquals(1, ncomputations);
         
         // Cache expiry. 
         TimingUtils.sleep(6000); 
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(2, _ncomputations);
+        assertEquals(2, ncomputations);
         
         // Should still be cached now.
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(2, _ncomputations);
+        assertEquals(2, ncomputations);
         
     }
     
@@ -150,11 +150,11 @@ public class CachedObjectTest extends TestCase {
         CachedObject<Integer, Integer> cached = createCached(new ForeverCache<Integer,Integer>());
         int value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations); 
+        assertEquals(1, ncomputations); 
         for (int ncomp = 2; ncomp <= 100; ncomp++) { 
             value = cached.get(); 
             assertEquals(compute(OBJECT_KEY), value);
-            assertEquals(1, _ncomputations);
+            assertEquals(1, ncomputations);
         }
     }
     
@@ -162,15 +162,15 @@ public class CachedObjectTest extends TestCase {
         CachedObject<Integer, Integer> cached = createCached(new ZeroCache<Integer,Integer>());
         int value = cached.get();
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(1, _ncomputations); 
+        assertEquals(1, ncomputations); 
         for (int ncomp = 2; ncomp <= 100; ncomp++) { 
             value = cached.get(); 
             assertEquals(compute(OBJECT_KEY), value);
-            assertEquals(ncomp, _ncomputations);
+            assertEquals(ncomp, ncomputations);
         }
         cached.invalidate(); 
         value = cached.get(); 
         assertEquals(compute(OBJECT_KEY), value);
-        assertEquals(101, _ncomputations);
+        assertEquals(101, ncomputations);
     }
 }