1 files changed, 17 insertions, 18 deletions

diff --git a/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java b/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java
index 3269397..bc9b68f 100644
--- a/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java
+++ b/guava-tests/test/com/google/common/collect/TreeMultimapExplicitTest.java
@@ -16,7 +16,7 @@
 
 package com.google.common.collect;
 
-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;
@@ -96,13 +96,13 @@ public class TreeMultimapExplicitTest extends AbstractSetMultimapTest {
     tree.put("google", 6);
     tree.put("tree", 0);
     tree.put("tree", 3);
-    ASSERT.that(tree.keySet()).has().allOf("tree", "google").inOrder();
-    ASSERT.that(tree.get("google")).has().allOf(6, 2).inOrder();
+    ASSERT.that(tree.keySet()).hasContentsInOrder("tree", "google");
+    ASSERT.that(tree.get("google")).hasContentsInOrder(6, 2);
 
     TreeMultimap<String, Integer> copy = TreeMultimap.create(tree);
     assertEquals(tree, copy);
-    ASSERT.that(copy.keySet()).has().allOf("google", "tree").inOrder();
-    ASSERT.that(copy.get("google")).has().allOf(2, 6).inOrder();
+    ASSERT.that(copy.keySet()).hasContentsInOrder("google", "tree");
+    ASSERT.that(copy.get("google")).hasContentsInOrder(2, 6);
     assertEquals(Ordering.natural(), copy.keyComparator());
     assertEquals(Ordering.natural(), copy.valueComparator());
     assertEquals(Ordering.natural(), copy.get("google").comparator());
@@ -121,14 +121,14 @@ public class TreeMultimapExplicitTest extends AbstractSetMultimapTest {
 
   public void testOrderedGet() {
     TreeMultimap<String, Integer> multimap = createPopulate();
-    ASSERT.that(multimap.get(null)).has().allOf(7, 3, 1).inOrder();
-    ASSERT.that(multimap.get("google")).has().allOf(6, 2).inOrder();
-    ASSERT.that(multimap.get("tree")).has().allOf(null, 0).inOrder();
+    ASSERT.that(multimap.get(null)).hasContentsInOrder(7, 3, 1);
+    ASSERT.that(multimap.get("google")).hasContentsInOrder(6, 2);
+    ASSERT.that(multimap.get("tree")).hasContentsInOrder(null, 0);
   }
 
   public void testOrderedKeySet() {
     TreeMultimap<String, Integer> multimap = createPopulate();
-    ASSERT.that(multimap.keySet()).has().allOf(null, "tree", "google").inOrder();
+    ASSERT.that(multimap.keySet()).hasContentsInOrder(null, "tree", "google");
   }
 
   public void testOrderedAsMapEntries() {
@@ -137,30 +137,29 @@ public class TreeMultimapExplicitTest extends AbstractSetMultimapTest {
         multimap.asMap().entrySet().iterator();
     Map.Entry<String, Collection<Integer>> entry = iterator.next();
     assertEquals(null, entry.getKey());
-    ASSERT.that(entry.getValue()).has().allOf(7, 3, 1);
+    ASSERT.that(entry.getValue()).hasContentsAnyOrder(7, 3, 1);
     entry = iterator.next();
     assertEquals("tree", entry.getKey());
-    ASSERT.that(entry.getValue()).has().allOf(null, 0);
+    ASSERT.that(entry.getValue()).hasContentsAnyOrder(null, 0);
     entry = iterator.next();
     assertEquals("google", entry.getKey());
-    ASSERT.that(entry.getValue()).has().allOf(6, 2);
+    ASSERT.that(entry.getValue()).hasContentsAnyOrder(6, 2);
   }
 
   public void testOrderedEntries() {
     TreeMultimap<String, Integer> multimap = createPopulate();
-    ASSERT.that(multimap.entries()).has().allOf(
+    ASSERT.that(multimap.entries()).hasContentsInOrder(
         Maps.immutableEntry((String) null, 7),
         Maps.immutableEntry((String) null, 3),
         Maps.immutableEntry((String) null, 1),
         Maps.immutableEntry("tree", (Integer) null),
         Maps.immutableEntry("tree", 0),
-        Maps.immutableEntry("google", 6), 
-        Maps.immutableEntry("google", 2)).inOrder();
+        Maps.immutableEntry("google", 6), Maps.immutableEntry("google", 2));
   }
 
   public void testOrderedValues() {
     TreeMultimap<String, Integer> multimap = createPopulate();
-    ASSERT.that(multimap.values()).has().allOf(7, 3, 1, null, 0, 6, 2).inOrder();
+    ASSERT.that(multimap.values()).hasContentsInOrder(7, 3, 1, null, 0, 6, 2);
   }
 
   public void testComparator() {
@@ -197,8 +196,8 @@ public class TreeMultimapExplicitTest extends AbstractSetMultimapTest {
     TreeMultimap<String, Integer> multimap = createPopulate();
     TreeMultimap<String, Integer> copy
         = SerializableTester.reserializeAndAssert(multimap);
-    ASSERT.that(copy.values()).has().allOf(7, 3, 1, null, 0, 6, 2).inOrder();
-    ASSERT.that(copy.keySet()).has().allOf(null, "tree", "google").inOrder();
+    ASSERT.that(copy.values()).hasContentsInOrder(7, 3, 1, null, 0, 6, 2);
+    ASSERT.that(copy.keySet()).hasContentsInOrder(null, "tree", "google");
     assertEquals(multimap.keyComparator(), copy.keyComparator());
     assertEquals(multimap.valueComparator(), copy.valueComparator());
   }