X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=support%2Fgeneral%2Fsrc%2Ftest%2Fjava%2Forg%2Fwamblee%2Fcache%2FCachedObjectTest.java;h=da7d8d47bcf6e4b9301475400f07d2e4e52fe147;hb=4a575582a5c2999bd816b197d9cf274b4b3ddcd7;hp=02d151cbd9126c75708d1c3c33d8583d6ac3970a;hpb=7d3754ca3d757ef89241cdbd679f82941e64cfc6;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 02d151cb..da7d8d47 100644
--- a/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java
+++ b/support/general/src/test/java/org/wamblee/cache/CachedObjectTest.java
@@ -58,10 +58,10 @@ public class CachedObjectTest extends TestCase {
         computation = mock(CachedObject.Computation.class);
         when(computation.getObject(anyInt())).thenAnswer(new Answer<Integer>() {
             public Integer answer(
-                org.mockito.invocation.InvocationOnMock invocation)
+                org.mockito.invocation.InvocationOnMock aInvocation)
                 throws Throwable {
                 ncomputations++;
-                return compute((Integer) invocation.getArguments()[0]);
+                return compute((Integer) aInvocation.getArguments()[0]);
             }
         });
         ncomputations = 0;
@@ -192,8 +192,8 @@ public class CachedObjectTest extends TestCase {
         assertEquals(101, getComputationCount());
     }
 
-    public void testPreviousValueWhileComputationBeingDone() throws Exception { 
-        final CachedObject<Integer,Integer> cached = createCached(new ZeroCache<Integer, Integer>());
+    public void testPreviousValueWhileComputationBeingDone() throws Exception {
+        final CachedObject<Integer, Integer> cached = createCached(new ZeroCache<Integer, Integer>());
         reset(computation);
         when(computation.getObject(anyInt())).thenReturn(1).thenAnswer(
             new Answer<Integer>() {
@@ -203,40 +203,43 @@ public class CachedObjectTest extends TestCase {
                     TimingUtils.sleep(1000);
                     return 2;
                 }
-            }
-            ).thenReturn(3);
-        
+            }).thenReturn(3);
+
         assertEquals(1, cached.get().intValue());
         Thread recompute = new Thread(new Runnable() {
-            
+
             @Override
             public void run() {
-                // will sleep for 1 second. 
+                // will sleep for 1 second.
                 assertEquals(2, cached.get().intValue());
             }
         });
         recompute.start();
-        // Now asking the value should not recompute but should return the old value.
+        // Now asking the value should not recompute but should return the old
+        // value.
         TimingUtils.sleep(500);
         assertEquals(1, cached.get().intValue());
         recompute.join();
     }
-    
-    public void testNullValueWhenComputationReturnsNull() throws Exception { 
-        final CachedObject<Integer,Integer> cached = createCached(new ZeroCache<Integer, Integer>());
+
+    public void testNullValueWhenComputationReturnsNull() throws Exception {
+        final CachedObject<Integer, Integer> cached = createCached(new ZeroCache<Integer, Integer>());
         reset(computation);
-        when(computation.getObject(anyInt())).thenReturn(1).thenReturn(null).thenReturn(2);
-        
+        when(computation.getObject(anyInt())).thenReturn(1).thenReturn(null)
+            .thenReturn(2);
+
         assertEquals(1, cached.get().intValue());
         assertNull(cached.get());
         assertEquals(2, cached.get().intValue());
     }
-    
-    public void testPreviousValueWhenComputationThrowsException() throws Exception { 
-        final CachedObject<Integer,Integer> cached = createCached(new ZeroCache<Integer, Integer>());
+
+    public void testPreviousValueWhenComputationThrowsException()
+        throws Exception {
+        final CachedObject<Integer, Integer> cached = createCached(new ZeroCache<Integer, Integer>());
         reset(computation);
-        when(computation.getObject(anyInt())).thenReturn(1).thenThrow(new RuntimeException()).thenReturn(2);
-        
+        when(computation.getObject(anyInt())).thenReturn(1).thenThrow(
+            new RuntimeException()).thenReturn(2);
+
         assertEquals(1, cached.get().intValue());
         assertEquals(1, cached.get().intValue());
         assertEquals(2, cached.get().intValue());