diff --git a/android/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java b/android/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java index 06f0d2782e20..1e71b63d65e2 100644 --- a/android/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java +++ b/android/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java @@ -237,21 +237,15 @@ public void testValues_populated() { } } - @SuppressWarnings("unchecked") // generic array creation - public void testEntrySet_populated() { for (LoadingCache cache : caches()) { Set> entries = cache.asMap().entrySet(); List> warmed = warmUp(cache, WARMUP_MIN, WARMUP_MAX); Set expected = Maps.newHashMap(cache.asMap()).entrySet(); - assertThat(entries).containsExactlyElementsIn((Collection>) expected); - assertThat(entries.toArray()) - .asList() - .containsExactlyElementsIn((Collection) expected); - assertThat(entries.toArray(new Entry[0])) - .asList() - .containsExactlyElementsIn((Collection) expected); + assertThat(entries).containsExactlyElementsIn(expected); + assertThat(entries.toArray()).asList().containsExactlyElementsIn(expected); + assertThat(entries.toArray(new Object[0])).asList().containsExactlyElementsIn(expected); new EqualsTester() .addEqualityGroup(cache.asMap().entrySet(), entries) diff --git a/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java b/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java index 06f0d2782e20..1e71b63d65e2 100644 --- a/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java +++ b/guava-tests/test/com/google/common/cache/PopulatedCachesTest.java @@ -237,21 +237,15 @@ public void testValues_populated() { } } - @SuppressWarnings("unchecked") // generic array creation - public void testEntrySet_populated() { for (LoadingCache cache : caches()) { Set> entries = cache.asMap().entrySet(); List> warmed = warmUp(cache, WARMUP_MIN, WARMUP_MAX); Set expected = Maps.newHashMap(cache.asMap()).entrySet(); - assertThat(entries).containsExactlyElementsIn((Collection>) expected); - assertThat(entries.toArray()) - .asList() - .containsExactlyElementsIn((Collection) expected); - assertThat(entries.toArray(new Entry[0])) - .asList() - .containsExactlyElementsIn((Collection) expected); + assertThat(entries).containsExactlyElementsIn(expected); + assertThat(entries.toArray()).asList().containsExactlyElementsIn(expected); + assertThat(entries.toArray(new Object[0])).asList().containsExactlyElementsIn(expected); new EqualsTester() .addEqualityGroup(cache.asMap().entrySet(), entries)