am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""

* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
  Revert "Upgraded Guava to unmodified v14.0.1"

1 files changed, 4 insertions, 23 deletions

diff --git a/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java b/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java
index cef2c0e..ca475da 100644
--- a/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java
+++ b/guava-tests/test/com/google/common/collect/AbstractImmutableSetTest.java
@@ -18,7 +18,7 @@ package com.google.common.collect;
 
 import static com.google.common.collect.testing.IteratorFeature.UNMODIFIABLE;
 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;
@@ -295,17 +295,8 @@ public abstract class AbstractImmutableSetTest extends TestCase {
         .add("d", "e", "f")
         .add("g", "h", "i", "j")
         .build();
-    ASSERT.that(set).has().allOf(
-        "a", "b", "c", "d", "e", "f", "g", "h", "i", "j").inOrder();
-  }
-
-  public void testReuseBuilderWithNonDuplicateElements() {
-    ImmutableSet.Builder<String> builder = this.<String>builder()
-        .add("a")
-        .add("b");
-    ASSERT.that(builder.build()).has().allOf("a", "b").inOrder();
-    builder.add("c", "d");
-    ASSERT.that(builder.build()).has().allOf("a", "b", "c", "d").inOrder();
+    ASSERT.that(set).hasContentsInOrder(
+        "a", "b", "c", "d", "e", "f", "g", "h", "i", "j");
   }
 
   public void testBuilderWithDuplicateElements() {
@@ -320,16 +311,6 @@ public abstract class AbstractImmutableSetTest extends TestCase {
     assertEquals(1, set.size());
   }
 
-  public void testReuseBuilderWithDuplicateElements() {
-    ImmutableSet.Builder<String> builder = this.<String>builder()
-        .add("a")
-        .add("a", "a")
-        .add("b");
-    ASSERT.that(builder.build()).has().allOf("a", "b").inOrder();
-    builder.add("a", "b", "c", "c");
-    ASSERT.that(builder.build()).has().allOf("a", "b", "c").inOrder();
-  }
-
   public void testBuilderAddAll() {
     List<String> a = asList("a", "b", "c");
     List<String> b = asList("c", "d", "e");
@@ -337,7 +318,7 @@ public abstract class AbstractImmutableSetTest extends TestCase {
         .addAll(a)
         .addAll(b)
         .build();
-    ASSERT.that(set).has().allOf("a", "b", "c", "d", "e").inOrder();
+    ASSERT.that(set).hasContentsInOrder("a", "b", "c", "d", "e");
   }
 
   static final int LAST_COLOR_ADDED = 0x00BFFF;