diff options
Diffstat (limited to 'guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java')
-rw-r--r-- | guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java | 45 |
1 files changed, 13 insertions, 32 deletions
diff --git a/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java b/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java index dba499c..8a96b62 100644 --- a/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java +++ b/guava-tests/test/com/google/common/collect/ConcurrentHashMultisetTest.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import static com.google.common.collect.MapMakerInternalMap.Strength.SOFT; import static com.google.common.collect.MapMakerInternalMap.Strength.STRONG; import static com.google.common.collect.MapMakerInternalMap.Strength.WEAK; import static com.google.common.collect.testing.IteratorFeature.SUPPORTS_REMOVE; @@ -25,19 +26,13 @@ import static org.easymock.EasyMock.eq; import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; -import com.google.common.base.Equivalence; +import com.google.common.base.Equivalences; import com.google.common.collect.MapMaker.RemovalListener; import com.google.common.collect.MapMaker.RemovalNotification; import com.google.common.collect.Multiset.Entry; import com.google.common.collect.testing.IteratorTester; -import com.google.common.collect.testing.features.CollectionFeature; -import com.google.common.collect.testing.features.CollectionSize; -import com.google.common.collect.testing.google.MultisetTestSuiteBuilder; -import com.google.common.collect.testing.google.TestStringMultisetGenerator; -import junit.framework.Test; import junit.framework.TestCase; -import junit.framework.TestSuite; import org.easymock.EasyMock; @@ -54,28 +49,6 @@ import java.util.concurrent.atomic.AtomicInteger; * @author mike nonemacher */ public class ConcurrentHashMultisetTest extends TestCase { - - public static Test suite() { - TestSuite suite = new TestSuite(); - suite.addTest(MultisetTestSuiteBuilder.using(concurrentMultisetGenerator()) - .withFeatures(CollectionSize.ANY, - CollectionFeature.GENERAL_PURPOSE, - CollectionFeature.SERIALIZABLE, - CollectionFeature.ALLOWS_NULL_QUERIES) - .named("ConcurrentHashMultiset") - .createTestSuite()); - suite.addTestSuite(ConcurrentHashMultisetTest.class); - return suite; - } - - private static TestStringMultisetGenerator concurrentMultisetGenerator() { - return new TestStringMultisetGenerator() { - @Override protected Multiset<String> create(String[] elements) { - return ConcurrentHashMultiset.create(asList(elements)); - } - }; - } - private static final String KEY = "puppies"; ConcurrentMap<String, AtomicInteger> backingMap; @@ -370,6 +343,10 @@ public class ConcurrentHashMultisetTest extends TestCase { public void testIdentityKeyEquality_strongKeys() { testIdentityKeyEquality(STRONG); } + + public void testIdentityKeyEquality_softKeys() { + testIdentityKeyEquality(SOFT); + } public void testIdentityKeyEquality_weakKeys() { testIdentityKeyEquality(WEAK); @@ -380,7 +357,7 @@ public class ConcurrentHashMultisetTest extends TestCase { MapMaker mapMaker = new MapMaker() .setKeyStrength(keyStrength) - .keyEquivalence(Equivalence.identity()); + .keyEquivalence(Equivalences.identity()); ConcurrentHashMultiset<String> multiset = ConcurrentHashMultiset.create(mapMaker); @@ -410,6 +387,10 @@ public class ConcurrentHashMultisetTest extends TestCase { testLogicalKeyEquality(STRONG); } + public void testLogicalKeyEquality_softKeys() { + testLogicalKeyEquality(SOFT); + } + public void testLogicalKeyEquality_weakKeys() { testLogicalKeyEquality(WEAK); } @@ -419,7 +400,7 @@ public class ConcurrentHashMultisetTest extends TestCase { MapMaker mapMaker = new MapMaker() .setKeyStrength(keyStrength) - .keyEquivalence(Equivalence.equals()); + .keyEquivalence(Equivalences.equals()); ConcurrentHashMultiset<String> multiset = ConcurrentHashMultiset.create(mapMaker); @@ -465,7 +446,7 @@ public class ConcurrentHashMultisetTest extends TestCase { public void testSerializationWithMapMaker_preservesIdentityKeyEquivalence() { MapMaker mapMaker = new MapMaker() - .keyEquivalence(Equivalence.identity()); + .keyEquivalence(Equivalences.identity()); ConcurrentHashMultiset<String> multiset = ConcurrentHashMultiset.create(mapMaker); |