diff options
author | Paul Duffin <paulduffin@google.com> | 2015-01-15 16:22:36 +0000 |
---|---|---|
committer | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:15:57 +0000 |
commit | dbd967a6e5c96cc1a97c5521f88dc1564ba2f81b (patch) | |
tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava-testlib/src/com/google/common/collect/testing/TestsForListsInJavaUtil.java | |
parent | 2d0fc0880966a0cd782d1c09f3b883f209bb3111 (diff) | |
download | android_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/TestsForListsInJavaUtil.java')
-rw-r--r-- | guava-testlib/src/com/google/common/collect/testing/TestsForListsInJavaUtil.java | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/TestsForListsInJavaUtil.java b/guava-testlib/src/com/google/common/collect/testing/TestsForListsInJavaUtil.java index 8191d70..c9961f3 100644 --- a/guava-testlib/src/com/google/common/collect/testing/TestsForListsInJavaUtil.java +++ b/guava-testlib/src/com/google/common/collect/testing/TestsForListsInJavaUtil.java @@ -102,7 +102,7 @@ public class TestsForListsInJavaUtil { }) .named("emptyList") .withFeatures( - CollectionFeature.SERIALIZABLE, + CollectionFeature.NONE, CollectionSize.ZERO) .suppressing(suppressForEmptyList()) .createTestSuite(); @@ -117,7 +117,7 @@ public class TestsForListsInJavaUtil { }) .named("singletonList") .withFeatures( - CollectionFeature.SERIALIZABLE, + CollectionFeature.NONE, CollectionFeature.ALLOWS_NULL_VALUES, CollectionSize.ONE) .suppressing(suppressForSingletonList()) @@ -134,7 +134,6 @@ public class TestsForListsInJavaUtil { .named("Arrays.asList") .withFeatures( ListFeature.SUPPORTS_SET, - CollectionFeature.SERIALIZABLE, CollectionFeature.ALLOWS_NULL_VALUES, CollectionSize.ANY) .suppressing(suppressForArraysAsList()) @@ -151,9 +150,7 @@ public class TestsForListsInJavaUtil { .named("ArrayList") .withFeatures( ListFeature.GENERAL_PURPOSE, - CollectionFeature.SERIALIZABLE, CollectionFeature.ALLOWS_NULL_VALUES, - CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION, CollectionSize.ANY) .suppressing(suppressForArrayList()) .createTestSuite(); @@ -169,9 +166,7 @@ public class TestsForListsInJavaUtil { .named("LinkedList") .withFeatures( ListFeature.GENERAL_PURPOSE, - CollectionFeature.SERIALIZABLE, CollectionFeature.ALLOWS_NULL_VALUES, - CollectionFeature.FAILS_FAST_ON_CONCURRENT_MODIFICATION, CollectionSize.ANY) .suppressing(suppressForLinkedList()) .createTestSuite(); @@ -188,7 +183,6 @@ public class TestsForListsInJavaUtil { .named("CopyOnWriteArrayList") .withFeatures( ListFeature.GENERAL_PURPOSE, - CollectionFeature.SERIALIZABLE, CollectionFeature.ALLOWS_NULL_VALUES, CollectionSize.ANY) .suppressing(suppressForCopyOnWriteArrayList()) @@ -206,7 +200,7 @@ public class TestsForListsInJavaUtil { }) .named("unmodifiableList/ArrayList") .withFeatures( - CollectionFeature.SERIALIZABLE, + CollectionFeature.NONE, CollectionFeature.ALLOWS_NULL_VALUES, CollectionSize.ANY) .suppressing(suppressForUnmodifiableList()) @@ -225,7 +219,6 @@ public class TestsForListsInJavaUtil { .named("checkedList/ArrayList") .withFeatures( ListFeature.GENERAL_PURPOSE, - CollectionFeature.SERIALIZABLE, CollectionFeature.RESTRICTS_ELEMENTS, CollectionFeature.ALLOWS_NULL_VALUES, CollectionSize.ANY) |