1 files changed, 2 insertions, 68 deletions
diff --git a/guava-tests/test/com/google/common/collect/EnumMultisetTest.java b/guava-tests/test/com/google/common/collect/EnumMultisetTest.java
index b8cceb6..e22fe5e 100644
--- a/guava-tests/test/com/google/common/collect/EnumMultisetTest.java
+++ b/guava-tests/test/com/google/common/collect/EnumMultisetTest.java
@@ -20,18 +20,9 @@ import static java.util.Arrays.asList;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
-import com.google.common.collect.testing.AnEnum;
-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.TestEnumMultisetGenerator;
-import com.google.common.testing.ClassSanityTester;
-import com.google.common.testing.NullPointerTester;
 import com.google.common.testing.SerializableTester;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
 
 import java.util.Collection;
 import java.util.EnumSet;
@@ -44,31 +35,6 @@ import java.util.Set;
  */
 @GwtCompatible(emulated = true)
 public class EnumMultisetTest extends TestCase {
-
-  @GwtIncompatible("suite")
-  public static Test suite() {
-    TestSuite suite = new TestSuite();
-    suite.addTest(MultisetTestSuiteBuilder.using(enumMultisetGenerator())
-        .withFeatures(CollectionSize.ANY,
-            CollectionFeature.KNOWN_ORDER,
-            CollectionFeature.GENERAL_PURPOSE,
-            CollectionFeature.ALLOWS_NULL_QUERIES)
-        .named("EnumMultiset")
-        .createTestSuite());
-    suite.addTestSuite(EnumMultisetTest.class);
-    return suite;
-  }
-
-  private static TestEnumMultisetGenerator enumMultisetGenerator() {
-    return new TestEnumMultisetGenerator() {
-      @Override protected Multiset<AnEnum> create(AnEnum[] elements) {
-        return (elements.length == 0)
-            ? EnumMultiset.create(AnEnum.class)
-            : EnumMultiset.create(asList(elements));
-      }
-    };
-  }
-
   private static enum Color {
     BLUE, RED, YELLOW, GREEN, WHITE
   }
@@ -98,19 +64,6 @@ public class EnumMultisetTest extends TestCase {
       fail();
     } catch (IllegalArgumentException expected) {}
   }
-  
-  public void testCreateEmptyWithClass() {
-    Multiset<Color> ms = EnumMultiset.create(ImmutableList.<Color>of(), Color.class);
-    ms.add(Color.RED);
-  }
-  
-  public void testCreateEmptyWithoutClassFails() {
-    try {
-      Multiset<Color> ms = EnumMultiset.create(ImmutableList.<Color> of());
-      fail("Expected IllegalArgumentException");
-    } catch (IllegalArgumentException expected) {
-    }
-  }
 
   public void testToString() {
     Multiset<Color> ms = EnumMultiset.create(Color.class);
@@ -126,34 +79,15 @@ public class EnumMultisetTest extends TestCase {
         asList(Color.RED, Color.YELLOW, Color.RED));
     assertEquals(ms, SerializableTester.reserialize(ms));
   }
-
+  
   public void testEntrySet() {
     Multiset<Color> ms = EnumMultiset.create(Color.class);
     ms.add(Color.BLUE, 3);
     ms.add(Color.YELLOW, 1);
     ms.add(Color.RED, 2);
-
+    
     Set<Object> uniqueEntries = Sets.newIdentityHashSet();
     uniqueEntries.addAll(ms.entrySet());
     assertEquals(3, uniqueEntries.size());
   }
-
-  @GwtIncompatible("reflection")
-  public void testEquals() throws Exception {
-    new ClassSanityTester()
-        .setSampleInstances(Class.class, ImmutableList.of(Color.class))
-        .setSampleInstances(Enum.class, ImmutableList.copyOf(Color.values()))
-        .setSampleInstances(Iterable.class,
-            ImmutableList.of(ImmutableList.of(Color.RED), ImmutableList.of(Color.GREEN)))
-        .forAllPublicStaticMethods(EnumMultiset.class)
-        .testEquals();
-  }
-
-  @GwtIncompatible("reflection")
-  public void testNulls() throws Exception {
-    new NullPointerTester()
-        .setDefault(Class.class, Color.class)
-        .setDefault(Iterable.class, ImmutableList.copyOf(Color.values()))
-        .testAllPublicStaticMethods(EnumMultiset.class);
-  }
 }