1 files changed, 23 insertions, 30 deletions
diff --git a/guava-tests/test/com/google/common/cache/NullCacheTest.java b/guava-tests/test/com/google/common/cache/NullCacheTest.java
index e418f6ccd..f46651fee 100644
--- a/guava-tests/test/com/google/common/cache/NullCacheTest.java
+++ b/guava-tests/test/com/google/common/cache/NullCacheTest.java
@@ -18,12 +18,12 @@ import static com.google.common.cache.CacheTesting.checkEmpty;
 import static com.google.common.cache.TestingCacheLoaders.constantLoader;
 import static com.google.common.cache.TestingCacheLoaders.exceptionLoader;
 import static com.google.common.cache.TestingRemovalListeners.queuingRemovalListener;
-import static com.google.common.truth.Truth.assertThat;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import com.google.common.cache.CacheLoader.InvalidCacheLoadException;
 import com.google.common.cache.TestingRemovalListeners.QueuingRemovalListener;
 import com.google.common.util.concurrent.UncheckedExecutionException;
+
 import junit.framework.TestCase;
 
 /**
@@ -41,11 +41,10 @@ public class NullCacheTest extends TestCase {
 
   public void testGet() {
     Object computed = new Object();
-    LoadingCache<Object, Object> cache =
-        CacheBuilder.newBuilder()
-            .maximumSize(0)
-            .removalListener(listener)
-            .build(constantLoader(computed));
+    LoadingCache<Object, Object> cache = CacheBuilder.newBuilder()
+        .maximumSize(0)
+        .removalListener(listener)
+        .build(constantLoader(computed));
 
     Object key = new Object();
     assertSame(computed, cache.getUnchecked(key));
@@ -59,11 +58,10 @@ public class NullCacheTest extends TestCase {
 
   public void testGet_expireAfterWrite() {
     Object computed = new Object();
-    LoadingCache<Object, Object> cache =
-        CacheBuilder.newBuilder()
-            .expireAfterWrite(0, SECONDS)
-            .removalListener(listener)
-            .build(constantLoader(computed));
+    LoadingCache<Object, Object> cache = CacheBuilder.newBuilder()
+        .expireAfterWrite(0, SECONDS)
+        .removalListener(listener)
+        .build(constantLoader(computed));
 
     Object key = new Object();
     assertSame(computed, cache.getUnchecked(key));
@@ -77,11 +75,10 @@ public class NullCacheTest extends TestCase {
 
   public void testGet_expireAfterAccess() {
     Object computed = new Object();
-    LoadingCache<Object, Object> cache =
-        CacheBuilder.newBuilder()
-            .expireAfterAccess(0, SECONDS)
-            .removalListener(listener)
-            .build(constantLoader(computed));
+    LoadingCache<Object, Object> cache = CacheBuilder.newBuilder()
+        .expireAfterAccess(0, SECONDS)
+        .removalListener(listener)
+        .build(constantLoader(computed));
 
     Object key = new Object();
     assertSame(computed, cache.getUnchecked(key));
@@ -94,18 +91,15 @@ public class NullCacheTest extends TestCase {
   }
 
   public void testGet_computeNull() {
-    LoadingCache<Object, Object> cache =
-        CacheBuilder.newBuilder()
-            .maximumSize(0)
-            .removalListener(listener)
-            .build(constantLoader(null));
+    LoadingCache<Object, Object> cache = CacheBuilder.newBuilder()
+        .maximumSize(0)
+        .removalListener(listener)
+        .build(constantLoader(null));
 
     try {
       cache.getUnchecked(new Object());
       fail();
-    } catch (InvalidCacheLoadException e) {
-      /* expected */
-    }
+    } catch (InvalidCacheLoadException e) { /* expected */}
 
     assertTrue(listener.isEmpty());
     checkEmpty(cache);
@@ -113,17 +107,16 @@ public class NullCacheTest extends TestCase {
 
   public void testGet_runtimeException() {
     final RuntimeException e = new RuntimeException();
-    LoadingCache<Object, Object> map =
-        CacheBuilder.newBuilder()
-            .maximumSize(0)
-            .removalListener(listener)
-            .build(exceptionLoader(e));
+    LoadingCache<Object, Object> map = CacheBuilder.newBuilder()
+        .maximumSize(0)
+        .removalListener(listener)
+        .build(exceptionLoader(e));
 
     try {
       map.getUnchecked(new Object());
       fail();
     } catch (UncheckedExecutionException uee) {
-      assertThat(uee).hasCauseThat().isSameAs(e);
+      assertSame(e, uee.getCause());
     }
     assertTrue(listener.isEmpty());
     checkEmpty(map);