1 files changed, 5 insertions, 52 deletions
diff --git a/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java b/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java
index c6148c8..dee3760 100644
--- a/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java
+++ b/guava-tests/test/com/google/common/collect/LinkedHashMultisetTest.java
@@ -18,24 +18,15 @@ package com.google.common.collect;
 
 import static com.google.common.collect.Lists.newArrayList;
 import static com.google.common.collect.testing.IteratorFeature.MODIFIABLE;
-import static java.util.Arrays.asList;
-import static org.truth0.Truth.ASSERT;
+import static org.junit.contrib.truth.Truth.ASSERT;
 
 import com.google.common.annotations.GwtCompatible;
 import com.google.common.annotations.GwtIncompatible;
 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.TestSuite;
 
 import java.util.Arrays;
 import java.util.ConcurrentModificationException;
 import java.util.Iterator;
-import java.util.List;
 
 /**
  * Unit test for {@link LinkedHashMultiset}.
@@ -44,44 +35,6 @@ import java.util.List;
  */
 @GwtCompatible(emulated = true)
 public class LinkedHashMultisetTest extends AbstractMultisetTest {
-
-  @GwtIncompatible("suite")
-  public static Test suite() {
-    TestSuite suite = new TestSuite();
-    suite.addTest(MultisetTestSuiteBuilder.using(linkedHashMultisetGenerator())
-        .named("LinkedHashMultiset")
-        .withFeatures(CollectionSize.ANY,
-            CollectionFeature.KNOWN_ORDER,
-            CollectionFeature.ALLOWS_NULL_VALUES,
-            CollectionFeature.SERIALIZABLE,
-            CollectionFeature.GENERAL_PURPOSE)
-        .createTestSuite());
-    suite.addTestSuite(LinkedHashMultisetTest.class);
-    return suite;
-  }
-
-  private static TestStringMultisetGenerator linkedHashMultisetGenerator() {
-    return new TestStringMultisetGenerator() {
-      @Override protected Multiset<String> create(String[] elements) {
-        return LinkedHashMultiset.create(asList(elements));
-      }
-
-      @Override
-      public List<String> order(List<String> insertionOrder) {
-        List<String> order = Lists.newArrayList();
-        for (String s : insertionOrder) {
-          int index = order.indexOf(s);
-          if (index == -1) {
-            order.add(s);
-          } else {
-            order.add(index, s);
-          }
-        }
-        return order;
-      }
-    };
-  }
-
   @Override protected <E> Multiset<E> create() {
     return LinkedHashMultiset.create();
   }
@@ -153,14 +106,14 @@ public class LinkedHashMultisetTest extends AbstractMultisetTest {
     ms.add("a");
     ms.add("b", 2);
     ms.add("c");
-    ASSERT.that(ms.elementSet()).has().allOf("a", "b", "c").inOrder();
+    ASSERT.that(ms.elementSet()).hasContentsInOrder("a", "b", "c");
     ms.remove("b");
-    ASSERT.that(ms.elementSet()).has().allOf("a", "b", "c").inOrder();
+    ASSERT.that(ms.elementSet()).hasContentsInOrder("a", "b", "c");
     ms.add("b");
-    ASSERT.that(ms.elementSet()).has().allOf("a", "b", "c").inOrder();
+    ASSERT.that(ms.elementSet()).hasContentsInOrder("a", "b", "c");
     ms.remove("b", 2);
     ms.add("b");
-    ASSERT.that(ms.elementSet()).has().allOf("a", "c", "b").inOrder();
+    ASSERT.that(ms.elementSet()).hasContentsInOrder("a", "c", "b");
   }
 
   public void testIteratorRemoveConcurrentModification() {