diff options
Diffstat (limited to 'guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java')
-rw-r--r-- | guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java | 64 |
1 files changed, 15 insertions, 49 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java index 41eec75..d36e736 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/MapPutAllTester.java @@ -19,22 +19,15 @@ package com.google.common.collect.testing.testers; import static com.google.common.collect.testing.features.CollectionSize.ZERO; import static com.google.common.collect.testing.features.MapFeature.ALLOWS_NULL_KEYS; import static com.google.common.collect.testing.features.MapFeature.ALLOWS_NULL_VALUES; -import static com.google.common.collect.testing.features.MapFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION; -import static com.google.common.collect.testing.features.MapFeature.SUPPORTS_PUT; +import static com.google.common.collect.testing.features.MapFeature.SUPPORTS_PUT_ALL; import static java.util.Collections.singletonList; -import com.google.common.annotations.GwtCompatible; -import com.google.common.annotations.GwtIncompatible; import com.google.common.collect.testing.AbstractMapTester; -import com.google.common.collect.testing.Helpers; import com.google.common.collect.testing.MinimalCollection; import com.google.common.collect.testing.features.CollectionSize; import com.google.common.collect.testing.features.MapFeature; -import java.lang.reflect.Method; import java.util.Collections; -import java.util.ConcurrentModificationException; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -51,7 +44,6 @@ import java.util.Map.Entry; * @author Kevin Bourrillion */ @SuppressWarnings("unchecked") // too many "unchecked generic array creations" -@GwtCompatible(emulated = true) public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { private List<Entry<K, V>> containsNullKey; private List<Entry<K, V>> containsNullValue; @@ -62,13 +54,13 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { containsNullValue = singletonList(entry(samples.e3.getKey(), null)); } - @MapFeature.Require(SUPPORTS_PUT) + @MapFeature.Require(SUPPORTS_PUT_ALL) public void testPutAll_supportedNothing() { getMap().putAll(emptyMap()); expectUnchanged(); } - @MapFeature.Require(absent = SUPPORTS_PUT) + @MapFeature.Require(absent = SUPPORTS_PUT_ALL) public void testPutAll_unsupportedNothing() { try { getMap().putAll(emptyMap()); @@ -77,13 +69,13 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { expectUnchanged(); } - @MapFeature.Require(SUPPORTS_PUT) + @MapFeature.Require(SUPPORTS_PUT_ALL) public void testPutAll_supportedNonePresent() { putAll(createDisjointCollection()); expectAdded(samples.e3, samples.e4); } - @MapFeature.Require(absent = SUPPORTS_PUT) + @MapFeature.Require(absent = SUPPORTS_PUT_ALL) public void testPutAll_unsupportedNonePresent() { try { putAll(createDisjointCollection()); @@ -94,28 +86,14 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { expectMissing(samples.e3, samples.e4); } - @MapFeature.Require(SUPPORTS_PUT) + @MapFeature.Require(SUPPORTS_PUT_ALL) @CollectionSize.Require(absent = ZERO) public void testPutAll_supportedSomePresent() { putAll(MinimalCollection.of(samples.e3, samples.e0)); expectAdded(samples.e3); } - @MapFeature.Require({ FAILS_FAST_ON_CONCURRENT_MODIFICATION, - SUPPORTS_PUT }) - @CollectionSize.Require(absent = ZERO) - public void testPutAllSomePresentConcurrentWithEntrySetIteration() { - try { - Iterator<Entry<K, V>> iterator = getMap().entrySet().iterator(); - putAll(MinimalCollection.of(samples.e3, samples.e0)); - iterator.next(); - fail("Expected ConcurrentModificationException"); - } catch (ConcurrentModificationException expected) { - // success - } - } - - @MapFeature.Require(absent = SUPPORTS_PUT) + @MapFeature.Require(absent = SUPPORTS_PUT_ALL) @CollectionSize.Require(absent = ZERO) public void testPutAll_unsupportedSomePresent() { try { @@ -126,7 +104,7 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { expectUnchanged(); } - @MapFeature.Require(absent = SUPPORTS_PUT) + @MapFeature.Require(absent = SUPPORTS_PUT_ALL) @CollectionSize.Require(absent = ZERO) public void testPutAll_unsupportedAllPresent() { try { @@ -136,16 +114,16 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { expectUnchanged(); } - @MapFeature.Require({SUPPORTS_PUT, + @MapFeature.Require({SUPPORTS_PUT_ALL, ALLOWS_NULL_KEYS}) public void testPutAll_nullKeySupported() { putAll(containsNullKey); expectAdded(containsNullKey.get(0)); } - @MapFeature.Require(value = SUPPORTS_PUT, + @MapFeature.Require(value = SUPPORTS_PUT_ALL, absent = ALLOWS_NULL_KEYS) - public void testPutAll_nullKeyUnsupported() { + public void testAdd_nullKeyUnsupported() { try { putAll(containsNullKey); fail("putAll(containsNullKey) should throw"); @@ -157,16 +135,16 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { "putAll(containsNullKey)"); } - @MapFeature.Require({SUPPORTS_PUT, + @MapFeature.Require({SUPPORTS_PUT_ALL, ALLOWS_NULL_VALUES}) public void testPutAll_nullValueSupported() { putAll(containsNullValue); expectAdded(containsNullValue.get(0)); } - @MapFeature.Require(value = SUPPORTS_PUT, + @MapFeature.Require(value = SUPPORTS_PUT_ALL, absent = ALLOWS_NULL_VALUES) - public void testPutAll_nullValueUnsupported() { + public void testAdd_nullValueUnsupported() { try { putAll(containsNullValue); fail("putAll(containsNullValue) should throw"); @@ -178,7 +156,7 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { "putAll(containsNullValue)"); } - @MapFeature.Require(SUPPORTS_PUT) + @MapFeature.Require(SUPPORTS_PUT_ALL) public void testPutAll_nullCollectionReference() { try { getMap().putAll(null); @@ -198,16 +176,4 @@ public class MapPutAllTester<K, V> extends AbstractMapTester<K, V> { } getMap().putAll(map); } - - /** - * Returns the {@link Method} instance for {@link - * #testPutAll_nullKeyUnsupported()} so that tests can suppress it with {@code - * FeatureSpecificTestSuiteBuilder.suppressing()} until <a - * href="http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5045147">Sun - * bug 5045147</a> is fixed. - */ - @GwtIncompatible("reflection") - public static Method getPutAllNullKeyUnsupportedMethod() { - return Helpers.getMethod(MapPutAllTester.class, "testPutAll_nullKeyUnsupported"); - } } |