1 files changed, 48 insertions, 50 deletions

diff --git a/extensions/java8/src/test/java/com/google/common/truth/LongStreamSubjectTest.java b/extensions/java8/src/test/java/com/google/common/truth/LongStreamSubjectTest.java
index 9908b354..52c36ea0 100644
--- a/extensions/java8/src/test/java/com/google/common/truth/LongStreamSubjectTest.java
+++ b/extensions/java8/src/test/java/com/google/common/truth/LongStreamSubjectTest.java
@@ -203,17 +203,16 @@ public final class LongStreamSubjectTest {
 
   @Test
   public void testContainsAtLeast_inOrder_fails() throws Exception {
-    try {
-      assertThat(LongStream.of(42, 43)).containsAtLeast(43, 42).inOrder();
-      fail();
-    } catch (AssertionError expected) {
-      assertFailureKeys(
-          expected,
-          "required elements were all found, but order was wrong",
-          "expected order for required elements",
-          "but was");
-      assertFailureValue(expected, "expected order for required elements", "[43, 42]");
-    }
+    AssertionError expected =
+        expectFailure(
+            whenTesting ->
+                whenTesting.that(LongStream.of(42, 43)).containsAtLeast(43, 42).inOrder());
+    assertFailureKeys(
+        expected,
+        "required elements were all found, but order was wrong",
+        "expected order for required elements",
+        "but was");
+    assertFailureValue(expected, "expected order for required elements", "[43, 42]");
   }
 
   @Test
@@ -248,17 +247,19 @@ public final class LongStreamSubjectTest {
 
   @Test
   public void testContainsAtLeastElementsIn_inOrder_fails() throws Exception {
-    try {
-      assertThat(LongStream.of(42, 43)).containsAtLeastElementsIn(asList(43L, 42L)).inOrder();
-      fail();
-    } catch (AssertionError expected) {
-      assertFailureKeys(
-          expected,
-          "required elements were all found, but order was wrong",
-          "expected order for required elements",
-          "but was");
-      assertFailureValue(expected, "expected order for required elements", "[43, 42]");
-    }
+    AssertionError expected =
+        expectFailure(
+            whenTesting ->
+                whenTesting
+                    .that(LongStream.of(42, 43))
+                    .containsAtLeastElementsIn(asList(43L, 42L))
+                    .inOrder());
+    assertFailureKeys(
+        expected,
+        "required elements were all found, but order was wrong",
+        "expected order for required elements",
+        "but was");
+    assertFailureValue(expected, "expected order for required elements", "[43, 42]");
   }
 
   @Test
@@ -279,13 +280,10 @@ public final class LongStreamSubjectTest {
 
   @Test
   public void testContainsExactly_fails() throws Exception {
-    try {
-      assertThat(LongStream.of(42, 43)).containsExactly(42);
-      fail();
-    } catch (AssertionError expected) {
-      assertFailureKeys(expected, "unexpected (1)", "---", "expected", "but was");
-      assertFailureValue(expected, "expected", "[42]");
-    }
+    AssertionError expected =
+        expectFailure(whenTesting -> whenTesting.that(LongStream.of(42, 43)).containsExactly(42));
+    assertFailureKeys(expected, "unexpected (1)", "---", "expected", "but was");
+    assertFailureValue(expected, "expected", "[42]");
   }
 
   @Test
@@ -295,13 +293,12 @@ public final class LongStreamSubjectTest {
 
   @Test
   public void testContainsExactly_inOrder_fails() throws Exception {
-    try {
-      assertThat(LongStream.of(42, 43)).containsExactly(43, 42).inOrder();
-      fail();
-    } catch (AssertionError expected) {
-      assertFailureKeys(expected, "contents match, but order was wrong", "expected", "but was");
-      assertFailureValue(expected, "expected", "[43, 42]");
-    }
+    AssertionError expected =
+        expectFailure(
+            whenTesting ->
+                whenTesting.that(LongStream.of(42, 43)).containsExactly(43, 42).inOrder());
+    assertFailureKeys(expected, "contents match, but order was wrong", "expected", "but was");
+    assertFailureValue(expected, "expected", "[43, 42]");
   }
 
   @Test
@@ -312,13 +309,12 @@ public final class LongStreamSubjectTest {
 
   @Test
   public void testContainsExactlyElementsIn_fails() throws Exception {
-    try {
-      assertThat(LongStream.of(42, 43)).containsExactlyElementsIn(asList(42L));
-      fail();
-    } catch (AssertionError expected) {
-      assertFailureKeys(expected, "unexpected (1)", "---", "expected", "but was");
-      assertFailureValue(expected, "expected", "[42]");
-    }
+    AssertionError expected =
+        expectFailure(
+            whenTesting ->
+                whenTesting.that(LongStream.of(42, 43)).containsExactlyElementsIn(asList(42L)));
+    assertFailureKeys(expected, "unexpected (1)", "---", "expected", "but was");
+    assertFailureValue(expected, "expected", "[42]");
   }
 
   @Test
@@ -336,13 +332,15 @@ public final class LongStreamSubjectTest {
 
   @Test
   public void testContainsExactlyElementsIn_inOrder_fails() throws Exception {
-    try {
-      assertThat(LongStream.of(42, 43)).containsExactlyElementsIn(asList(43L, 42L)).inOrder();
-      fail();
-    } catch (AssertionError expected) {
-      assertFailureKeys(expected, "contents match, but order was wrong", "expected", "but was");
-      assertFailureValue(expected, "expected", "[43, 42]");
-    }
+    AssertionError expected =
+        expectFailure(
+            whenTesting ->
+                whenTesting
+                    .that(LongStream.of(42, 43))
+                    .containsExactlyElementsIn(asList(43L, 42L))
+                    .inOrder());
+    assertFailureKeys(expected, "contents match, but order was wrong", "expected", "but was");
+    assertFailureValue(expected, "expected", "[43, 42]");
   }
 
   @Test