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/ListTestSuiteBuilder.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/ListTestSuiteBuilder.java')
-rw-r--r-- | guava-testlib/src/com/google/common/collect/testing/ListTestSuiteBuilder.java | 70 |
1 files changed, 5 insertions, 65 deletions
diff --git a/guava-testlib/src/com/google/common/collect/testing/ListTestSuiteBuilder.java b/guava-testlib/src/com/google/common/collect/testing/ListTestSuiteBuilder.java index 03f16cf..e8bdf78 100644 --- a/guava-testlib/src/com/google/common/collect/testing/ListTestSuiteBuilder.java +++ b/guava-testlib/src/com/google/common/collect/testing/ListTestSuiteBuilder.java @@ -18,7 +18,6 @@ package com.google.common.collect.testing; import com.google.common.collect.testing.features.CollectionFeature; import com.google.common.collect.testing.features.Feature; -import com.google.common.collect.testing.testers.CollectionSerializationEqualTester; import com.google.common.collect.testing.testers.ListAddAllAtIndexTester; import com.google.common.collect.testing.testers.ListAddAllTester; import com.google.common.collect.testing.testers.ListAddAtIndexTester; @@ -37,15 +36,10 @@ import com.google.common.collect.testing.testers.ListRetainAllTester; import com.google.common.collect.testing.testers.ListSetTester; import com.google.common.collect.testing.testers.ListSubListTester; import com.google.common.collect.testing.testers.ListToArrayTester; -import com.google.common.testing.SerializableTester; import junit.framework.TestSuite; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; import java.util.List; -import java.util.Set; /** * Creates, based on your criteria, a JUnit test suite that exhaustively tests @@ -64,7 +58,6 @@ public final class ListTestSuiteBuilder<E> extends List<Class<? extends AbstractTester>> testers = Helpers.copyToList(super.getTesters()); - testers.add(CollectionSerializationEqualTester.class); testers.add(ListAddAllAtIndexTester.class); testers.add(ListAddAllTester.class); testers.add(ListAddAtIndexTester.class); @@ -91,64 +84,11 @@ public final class ListTestSuiteBuilder<E> extends * lists have an iteration ordering corresponding to the insertion order. */ @Override public TestSuite createTestSuite() { - withFeatures(CollectionFeature.KNOWN_ORDER); - return super.createTestSuite(); - } - - @Override - protected - List<TestSuite> - createDerivedSuites( - FeatureSpecificTestSuiteBuilder< - ?, ? extends OneSizeTestContainerGenerator<Collection<E>, E>> parentBuilder) { - List<TestSuite> derivedSuites = new ArrayList<TestSuite>( - super.createDerivedSuites(parentBuilder)); - - if (parentBuilder.getFeatures().contains(CollectionFeature.SERIALIZABLE)) { - derivedSuites.add(ListTestSuiteBuilder - .using(new ReserializedListGenerator<E>(parentBuilder.getSubjectGenerator())) - .named(getName() + " reserialized") - .withFeatures(computeReserializedCollectionFeatures(parentBuilder.getFeatures())) - .suppressing(parentBuilder.getSuppressedTests()) - .createTestSuite()); - } - return derivedSuites; - } - - static class ReserializedListGenerator<E> implements TestListGenerator<E>{ - final OneSizeTestContainerGenerator<Collection<E>, E> gen; - - private ReserializedListGenerator(OneSizeTestContainerGenerator<Collection<E>, E> gen) { - this.gen = gen; - } - - @Override - public SampleElements<E> samples() { - return gen.samples(); + if (!getFeatures().contains(CollectionFeature.KNOWN_ORDER)) { + List<Feature<?>> features = Helpers.copyToList(getFeatures()); + features.add(CollectionFeature.KNOWN_ORDER); + withFeatures(features); } - - @Override - public List<E> create(Object... elements) { - return (List<E>) SerializableTester.reserialize(gen.create(elements)); - } - - @Override - public E[] createArray(int length) { - return gen.createArray(length); - } - - @Override - public Iterable<E> order(List<E> insertionOrder) { - return gen.order(insertionOrder); - } - } - - private static Set<Feature<?>> computeReserializedCollectionFeatures( - Set<Feature<?>> features) { - Set<Feature<?>> derivedFeatures = new HashSet<Feature<?>>(); - derivedFeatures.addAll(features); - derivedFeatures.remove(CollectionFeature.SERIALIZABLE); - derivedFeatures.remove(CollectionFeature.SERIALIZABLE_INCLUDING_VIEWS); - return derivedFeatures; + return super.createTestSuite(); } } |