1 files changed, 31 insertions, 34 deletions
diff --git a/guava-tests/test/com/google/common/collect/ConstraintsTest.java b/guava-tests/test/com/google/common/collect/ConstraintsTest.java
index b7b6dbb..64dbc8a 100644
--- a/guava-tests/test/com/google/common/collect/ConstraintsTest.java
+++ b/guava-tests/test/com/google/common/collect/ConstraintsTest.java
@@ -17,7 +17,7 @@
 package com.google.common.collect;
 
 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;
@@ -80,9 +80,8 @@ public class ConstraintsTest extends TestCase {
     constrained.add("qux");
     constrained.addAll(asList("cat", "dog"));
     /* equals and hashCode aren't defined for Collection */
-    ASSERT.that(collection).has().allOf("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog").inOrder();
-    ASSERT.that(constrained).has()
-        .allOf("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog").inOrder();
+    ASSERT.that(collection).hasContentsInOrder("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog");
+    ASSERT.that(constrained).hasContentsInOrder("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog");
   }
 
   public void testConstrainedCollectionIllegal() {
@@ -97,8 +96,8 @@ public class ConstraintsTest extends TestCase {
       constrained.addAll(asList("baz", TEST_ELEMENT));
       fail("TestElementException expected");
     } catch (TestElementException expected) {}
-    ASSERT.that(constrained).has().allOf("foo", "bar").inOrder();
-    ASSERT.that(collection).has().allOf("foo", "bar").inOrder();
+    ASSERT.that(constrained).hasContentsInOrder("foo", "bar");
+    ASSERT.that(collection).hasContentsInOrder("foo", "bar");
   }
 
   public void testConstrainedSetLegal() {
@@ -111,9 +110,8 @@ public class ConstraintsTest extends TestCase {
     assertTrue(constrained.equals(set));
     assertEquals(set.toString(), constrained.toString());
     assertEquals(set.hashCode(), constrained.hashCode());
-    ASSERT.that(set).has().allOf("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog").inOrder();
-    ASSERT.that(constrained).has()
-        .allOf("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog").inOrder();
+    ASSERT.that(set).hasContentsInOrder("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog");
+    ASSERT.that(constrained).hasContentsInOrder("foo", "bar", TEST_ELEMENT, "qux", "cat", "dog");
   }
 
   public void testConstrainedSetIllegal() {
@@ -127,8 +125,8 @@ public class ConstraintsTest extends TestCase {
       constrained.addAll(asList("baz", TEST_ELEMENT));
       fail("TestElementException expected");
     } catch (TestElementException expected) {}
-    ASSERT.that(constrained).has().allOf("foo", "bar").inOrder();
-    ASSERT.that(set).has().allOf("foo", "bar").inOrder();
+    ASSERT.that(constrained).hasContentsInOrder("foo", "bar");
+    ASSERT.that(set).hasContentsInOrder("foo", "bar");
   }
 
   public void testConstrainedSortedSetLegal() {
@@ -142,9 +140,8 @@ public class ConstraintsTest extends TestCase {
     assertTrue(constrained.equals(sortedSet));
     assertEquals(sortedSet.toString(), constrained.toString());
     assertEquals(sortedSet.hashCode(), constrained.hashCode());
-    ASSERT.that(sortedSet).has().allOf("bar", "cat", "dog", "foo", "qux", TEST_ELEMENT).inOrder();
-    ASSERT.that(constrained).has()
-        .allOf("bar", "cat", "dog", "foo", "qux", TEST_ELEMENT).inOrder();
+    ASSERT.that(sortedSet).hasContentsInOrder("bar", "cat", "dog", "foo", "qux", TEST_ELEMENT);
+    ASSERT.that(constrained).hasContentsInOrder("bar", "cat", "dog", "foo", "qux", TEST_ELEMENT);
     assertNull(constrained.comparator());
     assertEquals("bar", constrained.first());
     assertEquals(TEST_ELEMENT, constrained.last());
@@ -174,8 +171,8 @@ public class ConstraintsTest extends TestCase {
       constrained.addAll(asList("baz", TEST_ELEMENT));
       fail("TestElementException expected");
     } catch (TestElementException expected) {}
-    ASSERT.that(constrained).has().allOf("bar", "foo").inOrder();
-    ASSERT.that(sortedSet).has().allOf("bar", "foo").inOrder();
+    ASSERT.that(constrained).hasContentsInOrder("bar", "foo");
+    ASSERT.that(sortedSet).hasContentsInOrder("bar", "foo");
   }
 
   public void testConstrainedListLegal() {
@@ -192,18 +189,18 @@ public class ConstraintsTest extends TestCase {
     assertTrue(constrained.equals(list));
     assertEquals(list.toString(), constrained.toString());
     assertEquals(list.hashCode(), constrained.hashCode());
-    ASSERT.that(list).has().allOf(
-        "foo", "cow", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog").inOrder();
-    ASSERT.that(constrained).has().allOf(
-        "foo", "cow", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog").inOrder();
+    ASSERT.that(list).hasContentsInOrder(
+        "foo", "cow", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog");
+    ASSERT.that(constrained).hasContentsInOrder(
+        "foo", "cow", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog");
     ListIterator<String> iterator = constrained.listIterator();
     iterator.next();
     iterator.set("sun");
     constrained.listIterator(2).add("sky");
-    ASSERT.that(list).has().allOf(
-        "sun", "cow", "sky", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog").inOrder();
-    ASSERT.that(constrained).has().allOf(
-        "sun", "cow", "sky", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog").inOrder();
+    ASSERT.that(list).hasContentsInOrder(
+        "sun", "cow", "sky", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog");
+    ASSERT.that(constrained).hasContentsInOrder(
+        "sun", "cow", "sky", "baz", TEST_ELEMENT, "box", "fan", "qux", "cat", "dog");
     assertTrue(constrained instanceof RandomAccess);
   }
 
@@ -260,8 +257,8 @@ public class ConstraintsTest extends TestCase {
       constrained.addAll(1, asList("baz", TEST_ELEMENT));
       fail("TestElementException expected");
     } catch (TestElementException expected) {}
-    ASSERT.that(constrained).has().allOf("foo", "bar").inOrder();
-    ASSERT.that(list).has().allOf("foo", "bar").inOrder();
+    ASSERT.that(constrained).hasContentsInOrder("foo", "bar");
+    ASSERT.that(list).hasContentsInOrder("foo", "bar");
   }
 
   public void testConstrainedMultisetLegal() {
@@ -276,15 +273,15 @@ public class ConstraintsTest extends TestCase {
     assertTrue(constrained.equals(multiset));
     assertEquals(multiset.toString(), constrained.toString());
     assertEquals(multiset.hashCode(), constrained.hashCode());
-    ASSERT.that(multiset).has().allOf(
+    ASSERT.that(multiset).hasContentsAnyOrder(
         "foo", "bar", TEST_ELEMENT, "qux", "cat", "dog", "cow", "cow");
-    ASSERT.that(constrained).has().allOf(
+    ASSERT.that(constrained).hasContentsAnyOrder(
         "foo", "bar", TEST_ELEMENT, "qux", "cat", "dog", "cow", "cow");
     assertEquals(1, constrained.count("foo"));
     assertEquals(1, constrained.remove("foo", 3));
     assertEquals(2, constrained.setCount("cow", 0));
-    ASSERT.that(multiset).has().allOf("bar", TEST_ELEMENT, "qux", "cat", "dog");
-    ASSERT.that(constrained).has().allOf("bar", TEST_ELEMENT, "qux", "cat", "dog");
+    ASSERT.that(multiset).hasContentsAnyOrder("bar", TEST_ELEMENT, "qux", "cat", "dog");
+    ASSERT.that(constrained).hasContentsAnyOrder("bar", TEST_ELEMENT, "qux", "cat", "dog");
   }
 
   public void testConstrainedMultisetIllegal() {
@@ -303,8 +300,8 @@ public class ConstraintsTest extends TestCase {
       constrained.addAll(asList("baz", TEST_ELEMENT));
       fail("TestElementException expected");
     } catch (TestElementException expected) {}
-    ASSERT.that(constrained).has().allOf("foo", "bar");
-    ASSERT.that(multiset).has().allOf("foo", "bar");
+    ASSERT.that(constrained).hasContentsAnyOrder("foo", "bar");
+    ASSERT.that(multiset).hasContentsAnyOrder("foo", "bar");
   }
 
   public void testNefariousAddAll() {
@@ -313,8 +310,8 @@ public class ConstraintsTest extends TestCase {
         list, TEST_CONSTRAINT);
     Collection<String> onceIterable = onceIterableCollection("baz");
     constrained.addAll(onceIterable);
-    ASSERT.that(constrained).has().allOf("foo", "bar", "baz").inOrder();
-    ASSERT.that(list).has().allOf("foo", "bar", "baz").inOrder();
+    ASSERT.that(constrained).hasContentsInOrder("foo", "bar", "baz");
+    ASSERT.that(list).hasContentsInOrder("foo", "bar", "baz");
   }
 
   /**