1 files changed, 13 insertions, 35 deletions
diff --git a/guava-tests/test/com/google/common/collect/HashMultisetTest.java b/guava-tests/test/com/google/common/collect/HashMultisetTest.java
index 9e68156..6e20b07 100644
--- a/guava-tests/test/com/google/common/collect/HashMultisetTest.java
+++ b/guava-tests/test/com/google/common/collect/HashMultisetTest.java
@@ -16,19 +16,10 @@
 
 package com.google.common.collect;
 
-import static java.util.Arrays.asList;
-
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
-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 com.google.common.testing.SerializableTester;
 
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
 import java.io.Serializable;
 import java.util.Arrays;
 
@@ -40,29 +31,6 @@ import java.util.Arrays;
  */
 @GwtCompatible(emulated = true)
 public class HashMultisetTest extends AbstractMultisetTest {
-
-  @GwtIncompatible("suite")
-  public static Test suite() {
-    TestSuite suite = new TestSuite();
-    suite.addTest(MultisetTestSuiteBuilder.using(hashMultisetGenerator())
-        .withFeatures(CollectionSize.ANY,
-            CollectionFeature.ALLOWS_NULL_VALUES,
-            CollectionFeature.SERIALIZABLE,
-            CollectionFeature.GENERAL_PURPOSE)
-        .named("HashMultiset")
-        .createTestSuite());
-    suite.addTestSuite(HashMultisetTest.class);
-    return suite;
-  }
-
-  private static TestStringMultisetGenerator hashMultisetGenerator() {
-    return new TestStringMultisetGenerator() {
-      @Override protected Multiset<String> create(String[] elements) {
-        return HashMultiset.create(asList(elements));
-      }
-    };
-  }
-
   @Override protected <E> Multiset<E> create() {
     return HashMultiset.create();
   }
@@ -124,20 +92,30 @@ public class HashMultisetTest extends AbstractMultisetTest {
    * iteration order.
    */
 
+  /**
+   * This test fails with Java 6, preventing us from running
+   * NullPointerTester on multisets.
+  public void testAnnotations() throws Exception {
+    Method method = HashMultiset.class.getDeclaredMethod(
+        "add", Object.class, int.class);
+    assertTrue(method.getParameterAnnotations()[0].length > 0);
+  }
+  */
+  
   @Override
   @GwtIncompatible(
       "http://code.google.com/p/google-web-toolkit/issues/detail?id=3421")
   public void testEntryAfterRemove() {
     super.testEntryAfterRemove();
   }
-
+  
   @Override
   @GwtIncompatible(
       "http://code.google.com/p/google-web-toolkit/issues/detail?id=3421")
   public void testEntryAfterClear() {
     super.testEntryAfterClear();
   }
-
+  
   @Override
   @GwtIncompatible(
       "http://code.google.com/p/google-web-toolkit/issues/detail?id=3421")
@@ -151,7 +129,7 @@ public class HashMultisetTest extends AbstractMultisetTest {
   public void testEntryAfterEntrySetIteratorRemove() {
     super.testEntryAfterEntrySetIteratorRemove();
   }
-
+  
   @Override
   @GwtIncompatible(
       "http://code.google.com/p/google-web-toolkit/issues/detail?id=3421")