1 files changed, 19 insertions, 16 deletions

diff --git a/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java b/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java
index 7d8e662..28aa5f8 100644
--- a/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java
+++ b/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java
@@ -17,9 +17,11 @@ package com.google.common.cache;
 import static com.google.common.cache.CacheTesting.checkEmpty;
 import static com.google.common.cache.CacheTesting.checkValidState;
 import static com.google.common.cache.TestingCacheLoaders.identityLoader;
+import static java.util.Arrays.asList;
 import static java.util.concurrent.TimeUnit.DAYS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.truth0.Truth.ASSERT;
+import static org.junit.contrib.truth.Truth.ASSERT;
 
 import com.google.common.base.Function;
 import com.google.common.cache.CacheBuilderFactory.DurationSpec;
@@ -45,7 +47,6 @@ import java.util.Set;
  *
  * @author mike nonemacher
  */
-
 public class PopulatedCachesTest extends TestCase {
   // we use integers as keys; make sure the range covers some values that ARE cached by
   // Integer.valueOf(int), and some that are not cached. (127 is the highest cached value.)
@@ -194,10 +195,11 @@ public class PopulatedCachesTest extends TestCase {
       Set<Object> keys = cache.asMap().keySet();
       List<Entry<Object, Object>> warmed = warmUp(cache);
 
-      Set<Object> expected = Maps.newHashMap(cache.asMap()).keySet();
-      ASSERT.that(keys).has().allFrom(expected);
-      ASSERT.that(keys.toArray()).has().allFrom(expected);
-      ASSERT.that(keys.toArray(new Object[0])).has().allFrom(expected);
+      Object[] expectedArray = Maps.newHashMap(cache.asMap()).keySet().toArray(new Object[0]);
+      ASSERT.that(keys).hasContentsAnyOrder(expectedArray);
+      ASSERT.that(asList(keys.toArray())).hasContentsAnyOrder(expectedArray);
+      ASSERT.that(asList(keys.toArray(new Object[(int) cache.size()])))
+          .hasContentsAnyOrder(expectedArray);
 
       new EqualsTester()
           .addEqualityGroup(cache.asMap().keySet(), keys)
@@ -221,10 +223,11 @@ public class PopulatedCachesTest extends TestCase {
       Collection<Object> values = cache.asMap().values();
       List<Entry<Object, Object>> warmed = warmUp(cache);
 
-      Collection<Object> expected = Maps.newHashMap(cache.asMap()).values();
-      ASSERT.that(values).has().allFrom(expected);
-      ASSERT.that(values.toArray()).has().allFrom(expected);
-      ASSERT.that(values.toArray(new Object[0])).has().allFrom(expected);
+      Object[] expectedArray = Maps.newHashMap(cache.asMap()).values().toArray(new Object[0]);
+      ASSERT.that(values).hasContentsAnyOrder(expectedArray);
+      ASSERT.that(asList(values.toArray())).hasContentsAnyOrder(expectedArray);
+      ASSERT.that(asList(values.toArray(new Object[(int) cache.size()])))
+          .hasContentsAnyOrder(expectedArray);
 
       assertEquals(WARMUP_SIZE, values.size());
       for (int i = WARMUP_MIN; i < WARMUP_MAX; i++) {
@@ -240,16 +243,16 @@ public class PopulatedCachesTest extends TestCase {
   }
 
   @SuppressWarnings("unchecked") // generic array creation
-
   public void testEntrySet_populated() {
     for (LoadingCache<Object, Object> cache : caches()) {
       Set<Entry<Object, Object>> entries = cache.asMap().entrySet();
       List<Entry<Object, Object>> warmed = warmUp(cache, WARMUP_MIN, WARMUP_MAX);
 
-      Set<?> expected = Maps.newHashMap(cache.asMap()).entrySet();
-      ASSERT.that(entries).has().allFrom((Collection<Entry<Object, Object>>)expected);
-      ASSERT.that(entries.toArray()).has().allFrom((Collection<Object>)expected);
-      ASSERT.that(entries.toArray(new Entry[0])).has().allFrom((Collection<Entry>)expected);
+      Set<Entry<Object, Object>> entrySet = Maps.newHashMap(cache.asMap()).entrySet();
+      ASSERT.that(entries).is(entrySet);
+      ASSERT.that(entries.toArray()).hasContentsAnyOrder(entrySet.toArray());
+      ASSERT.that(entries.toArray(new Entry[0]))
+          .hasContentsAnyOrder(entrySet.toArray(new Entry[0]));
 
       new EqualsTester()
           .addEqualityGroup(cache.asMap().entrySet(), entries)
@@ -298,7 +301,7 @@ public class PopulatedCachesTest extends TestCase {
         new Function<CacheBuilder<Object, Object>, LoadingCache<Object, Object>>() {
           @Override public LoadingCache<Object, Object> apply(
               CacheBuilder<Object, Object> builder) {
-            return builder.recordStats().build(identityLoader());
+            return builder.build(identityLoader());
           }
         });
   }