diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:46:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 12:46:40 +0000 |
| commit | aab56800fcb95e9b1a2d653588b14158080cc6b4 (patch) | |
| tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java | |
| parent | 6fa98dbaae182b511fbeb331e08f5fb827715ea8 (diff) | |
| parent | 84fb43aa6a1e752487f2624055ff26b1b6b7c043 (diff) | |
| download | android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.gz android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.bz2 android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.zip | |
am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""
* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
Revert "Upgraded Guava to unmodified v14.0.1"
Diffstat (limited to 'guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java')
| -rw-r--r-- | guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java index 638d6ef..0dac713 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/SetAddAllTester.java @@ -16,10 +16,9 @@ package com.google.common.collect.testing.testers; -import static com.google.common.collect.testing.features.CollectionFeature.SUPPORTS_ADD; +import static com.google.common.collect.testing.features.CollectionFeature.SUPPORTS_ADD_ALL; import static com.google.common.collect.testing.features.CollectionSize.ZERO; -import com.google.common.annotations.GwtCompatible; import com.google.common.collect.testing.MinimalCollection; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.collect.testing.features.CollectionSize; @@ -34,9 +33,8 @@ import com.google.common.collect.testing.features.CollectionSize; * @author Kevin Bourrillion */ @SuppressWarnings("unchecked") // too many "unchecked generic array creations" -@GwtCompatible public class SetAddAllTester<E> extends AbstractSetTester<E> { - @CollectionFeature.Require(SUPPORTS_ADD) + @CollectionFeature.Require(SUPPORTS_ADD_ALL) @CollectionSize.Require(absent = ZERO) public void testAddAll_supportedSomePresent() { assertTrue("add(somePresent) should return true", @@ -44,7 +42,7 @@ public class SetAddAllTester<E> extends AbstractSetTester<E> { expectAdded(samples.e3); } - @CollectionFeature.Require(SUPPORTS_ADD) + @CollectionFeature.Require(SUPPORTS_ADD_ALL) public void testAddAll_withDuplicates() { MinimalCollection<E> elementsToAdd = MinimalCollection.of(samples.e3, samples.e4, samples.e3, samples.e4); @@ -53,7 +51,7 @@ public class SetAddAllTester<E> extends AbstractSetTester<E> { expectAdded(samples.e3, samples.e4); } - @CollectionFeature.Require(SUPPORTS_ADD) + @CollectionFeature.Require(SUPPORTS_ADD_ALL) @CollectionSize.Require(absent = ZERO) public void testAddAll_supportedAllPresent() { assertFalse("add(allPresent) should return false", |