aboutsummaryrefslogtreecommitdiffstats
path: root/guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2015-01-15 16:22:36 +0000
committerPaul Duffin <paulduffin@google.com>2015-01-19 12:15:57 +0000
commitdbd967a6e5c96cc1a97c5521f88dc1564ba2f81b (patch)
tree7365392c3ea77742021cf187acfd465f9bb774ab /guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java
parent2d0fc0880966a0cd782d1c09f3b883f209bb3111 (diff)
downloadandroid_external_guava-dbd967a6e5c96cc1a97c5521f88dc1564ba2f81b.tar.gz
android_external_guava-dbd967a6e5c96cc1a97c5521f88dc1564ba2f81b.tar.bz2
android_external_guava-dbd967a6e5c96cc1a97c5521f88dc1564ba2f81b.zip
Revert "Upgraded Guava to unmodified v14.0.1"
This reverts commit 3c77433663281544363151bf284b0240dfd22a42. Change-Id: I25630eb4eef9a993c94f273796d3d9f04811e74d
Diffstat (limited to 'guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java')
-rw-r--r--guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java19
1 files changed, 0 insertions, 19 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java
index 3818fd9..2d051bc 100644
--- a/guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java
+++ b/guava-testlib/src/com/google/common/collect/testing/testers/CollectionRemoveTester.java
@@ -18,18 +18,14 @@ package com.google.common.collect.testing.testers;
import static com.google.common.collect.testing.features.CollectionFeature.ALLOWS_NULL_QUERIES;
import static com.google.common.collect.testing.features.CollectionFeature.ALLOWS_NULL_VALUES;
-import static com.google.common.collect.testing.features.CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION;
import static com.google.common.collect.testing.features.CollectionFeature.SUPPORTS_REMOVE;
-import static com.google.common.collect.testing.features.CollectionSize.SEVERAL;
import static com.google.common.collect.testing.features.CollectionSize.ZERO;
-import com.google.common.annotations.GwtCompatible;
import com.google.common.collect.testing.AbstractCollectionTester;
import com.google.common.collect.testing.WrongType;
import com.google.common.collect.testing.features.CollectionFeature;
import com.google.common.collect.testing.features.CollectionSize;
-import java.util.ConcurrentModificationException;
import java.util.Iterator;
/**
@@ -42,7 +38,6 @@ import java.util.Iterator;
* @author George van den Driessche
*/
@SuppressWarnings("unchecked") // too many "unchecked generic array creations"
-@GwtCompatible
public class CollectionRemoveTester<E> extends AbstractCollectionTester<E> {
@CollectionFeature.Require(SUPPORTS_REMOVE)
@CollectionSize.Require(absent = ZERO)
@@ -55,20 +50,6 @@ public class CollectionRemoveTester<E> extends AbstractCollectionTester<E> {
expectMissing(samples.e0);
}
- @CollectionFeature.Require({SUPPORTS_REMOVE,
- FAILS_FAST_ON_CONCURRENT_MODIFICATION})
- @CollectionSize.Require(SEVERAL)
- public void testRemovePresentConcurrentWithIteration() {
- try {
- Iterator<E> iterator = collection.iterator();
- assertTrue(collection.remove(samples.e0));
- iterator.next();
- fail("Expected ConcurrentModificationException");
- } catch (ConcurrentModificationException expected) {
- // success
- }
- }
-
@CollectionFeature.Require(SUPPORTS_REMOVE)
public void testRemove_notPresent() {
assertFalse("remove(notPresent) should return false",