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/ListAddAllAtIndexTester.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/ListAddAllAtIndexTester.java')
-rw-r--r-- | guava-testlib/src/com/google/common/collect/testing/testers/ListAddAllAtIndexTester.java | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/testers/ListAddAllAtIndexTester.java b/guava-testlib/src/com/google/common/collect/testing/testers/ListAddAllAtIndexTester.java index 1844106..be64b0d 100644 --- a/guava-testlib/src/com/google/common/collect/testing/testers/ListAddAllAtIndexTester.java +++ b/guava-testlib/src/com/google/common/collect/testing/testers/ListAddAllAtIndexTester.java @@ -19,10 +19,10 @@ package com.google.common.collect.testing.testers; import static com.google.common.collect.testing.features.CollectionFeature.ALLOWS_NULL_VALUES; import static com.google.common.collect.testing.features.CollectionSize.ONE; import static com.google.common.collect.testing.features.CollectionSize.ZERO; +import static com.google.common.collect.testing.features.ListFeature.SUPPORTS_ADD_ALL_WITH_INDEX; import static com.google.common.collect.testing.features.ListFeature.SUPPORTS_ADD_WITH_INDEX; import static java.util.Collections.singletonList; -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; @@ -40,9 +40,8 @@ import java.util.List; * @author Chris Povirk */ @SuppressWarnings("unchecked") // too many "unchecked generic array creations" -@GwtCompatible public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionSize.Require(absent = ZERO) public void testAddAllAtIndex_supportedAllPresent() { assertTrue("addAll(n, allPresent) should return true", @@ -50,7 +49,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectAdded(0, samples.e0); } - @ListFeature.Require(absent = SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(absent = SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionSize.Require(absent = ZERO) public void testAddAllAtIndex_unsupportedAllPresent() { try { @@ -61,7 +60,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectUnchanged(); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionSize.Require(absent = ZERO) public void testAddAllAtIndex_supportedSomePresent() { assertTrue("addAll(n, allPresent) should return true", @@ -69,7 +68,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectAdded(0, samples.e0, samples.e3); } - @ListFeature.Require(absent = SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(absent = SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionSize.Require(absent = ZERO) public void testAddAllAtIndex_unsupportedSomePresent() { try { @@ -81,14 +80,14 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectMissing(samples.e3); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) public void testAddAllAtIndex_supportedNothing() { assertFalse("addAll(n, nothing) should return false", getList().addAll(0, emptyCollection())); expectUnchanged(); } - @ListFeature.Require(absent = SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(absent = SUPPORTS_ADD_ALL_WITH_INDEX) public void testAddAllAtIndex_unsupportedNothing() { try { assertFalse("addAll(n, nothing) should return false or throw", @@ -98,7 +97,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectUnchanged(); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) public void testAddAllAtIndex_withDuplicates() { MinimalCollection<E> elementsToAdd = MinimalCollection.of(samples.e0, samples.e1, samples.e0, samples.e1); @@ -107,7 +106,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectAdded(0, samples.e0, samples.e1, samples.e0, samples.e1); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionFeature.Require(ALLOWS_NULL_VALUES) public void testAddAllAtIndex_nullSupported() { List<E> containsNull = singletonList(null); @@ -120,7 +119,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectAdded(0, (E) null); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionFeature.Require(absent = ALLOWS_NULL_VALUES) public void testAddAllAtIndex_nullUnsupported() { List<E> containsNull = singletonList(null); @@ -134,7 +133,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { "Should not contain null after unsupported addAll(n, containsNull)"); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionSize.Require(absent = {ZERO, ONE}) public void testAddAllAtIndex_middle() { assertTrue("addAll(middle, disjoint) should return true", @@ -142,7 +141,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectAdded(getNumElements() / 2, createDisjointCollection()); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) @CollectionSize.Require(absent = ZERO) public void testAddAllAtIndex_end() { assertTrue("addAll(end, disjoint) should return true", @@ -150,7 +149,7 @@ public class ListAddAllAtIndexTester<E> extends AbstractListTester<E> { expectAdded(getNumElements(), createDisjointCollection()); } - @ListFeature.Require(SUPPORTS_ADD_WITH_INDEX) + @ListFeature.Require(SUPPORTS_ADD_ALL_WITH_INDEX) public void testAddAllAtIndex_nullCollectionReference() { try { getList().addAll(0, null); |