Merge java8 tests into core, and finish migrating core off the legacy ExpectFailure API.

Plus, actually run the `java8` tests under Android and J2CL. And tweak `OptionalDoubleSubject` to produce a consistent number format even under J2CL.

RELNOTES=n/a
PiperOrigin-RevId: 733349573

Author: cpovirk

core/src/main/java/com/google/common/truth/OptionalDoubleSubject.java

@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.Fact.fact;
 import static com.google.common.truth.Fact.simpleFact;
+import static com.google.common.truth.Platform.doubleToString;
 
 import java.util.OptionalDouble;
 import org.jspecify.annotations.Nullable;
@@ -57,7 +58,7 @@ public void isEmpty() {
     } else if (actual.isPresent()) {
       failWithoutActual(
           simpleFact("expected to be empty"),
-          fact("but was present with value", actual.getAsDouble()));
+          fact("but was present with value", doubleToString(actual.getAsDouble())));
     }
   }
 
@@ -73,7 +74,8 @@ public void hasValue(double expected) {
     if (actual == null) {
       failWithActual("expected an optional with value", expected);
     } else if (!actual.isPresent()) {
-      failWithoutActual(fact("expected to have value", expected), simpleFact("but was absent"));
+      failWithoutActual(
+          fact("expected to have value", doubleToString(expected)), simpleFact("but was absent"));
     } else {
       checkNoNeedToDisplayBothValues("getAsDouble()")
           .that(actual.getAsDouble())

core/src/test/java/com/google/common/truth/BaseSubjectTestCase.java

@@ -16,6 +16,8 @@
 package com.google.common.truth;
 
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
 import static com.google.common.truth.Truth.assertThat;
 import static java.math.BigDecimal.TEN;
 
@@ -30,7 +32,7 @@
  * @author Kurt Alfred Kluever
  */
 @RunWith(JUnit4.class)
-public class BigDecimalSubjectTest extends BaseSubjectTestCase {
+public class BigDecimalSubjectTest {
   @SuppressWarnings("TruthSelfEquals")
   @Test
   public void isEqualTo() {

core/src/test/java/com/google/common/truth/BigDecimalSubjectTest.java

@@ -16,6 +16,8 @@
 package com.google.common.truth;
 
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
 import static com.google.common.truth.Truth.assertThat;
 
 import org.junit.Test;
@@ -28,7 +30,7 @@
  * @author Christian Gruber ([email protected])
  */
 @RunWith(JUnit4.class)
-public class BooleanSubjectTest extends BaseSubjectTestCase {
+public class BooleanSubjectTest {
 
   @Test
   public void isTrue() {

core/src/test/java/com/google/common/truth/BooleanSubjectTest.java

@@ -26,7 +26,7 @@
 
 /** Tests for chained subjects (produced with {@link Subject#check(String, Object...)}, etc.). */
 @RunWith(JUnit4.class)
-public final class ChainingTest extends BaseSubjectTestCase {
+public final class ChainingTest {
   private static final Throwable throwable = new Throwable("root");
 
   @Test

core/src/test/java/com/google/common/truth/ChainingTest.java

@@ -16,6 +16,7 @@
 package com.google.common.truth;
 
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
 import static com.google.common.truth.Truth.assertThat;
 
 import org.junit.Test;
@@ -28,7 +29,7 @@
  * @author Christian Gruber ([email protected])
  */
 @RunWith(JUnit4.class)
-public class ClassSubjectTest extends BaseSubjectTestCase {
+public class ClassSubjectTest {
   @Test
   public void testIsAssignableTo_same() {
     assertThat(String.class).isAssignableTo(String.class);

core/src/test/java/com/google/common/truth/ClassSubjectTest.java

@@ -18,6 +18,7 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.truth.ExpectFailure.assertThat;
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static org.junit.Assert.fail;
@@ -33,7 +34,7 @@
  * @author Kurt Alfred Kluever
  */
 @RunWith(JUnit4.class)
-public class ComparableSubjectTest extends BaseSubjectTestCase {
+public class ComparableSubjectTest {
 
   @Test
   // test of a mistaken call and of unnecessary use of isEquivalentAccordingToCompareTo

core/src/test/java/com/google/common/truth/ComparableSubjectTest.java

@@ -32,7 +32,7 @@
  * @author Pete Gillin
  */
 @RunWith(JUnit4.class)
-public final class CorrespondenceExceptionStoreTest extends BaseSubjectTestCase {
+public final class CorrespondenceExceptionStoreTest {
 
   @Test
   public void hasCompareException_empty() {

core/src/test/java/com/google/common/truth/CorrespondenceExceptionStoreTest.java

@@ -19,6 +19,8 @@
 import static com.google.common.truth.Correspondence.tolerance;
 import static com.google.common.truth.ExpectFailure.assertThat;
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
 import static com.google.common.truth.TestCorrespondences.INT_DIFF_FORMATTER;
 import static com.google.common.truth.Truth.assertThat;
 import static java.util.Arrays.asList;
@@ -35,7 +37,7 @@
  * @author Pete Gillin
  */
 @RunWith(JUnit4.class)
-public final class CorrespondenceTest extends BaseSubjectTestCase {
+public final class CorrespondenceTest {
   // Tests of the abstract base class (just assert that equals and hashCode throw).
 
   private static final Correspondence<Object, Object> INSTANCE =

core/src/test/java/com/google/common/truth/CorrespondenceTest.java

@@ -15,6 +15,7 @@
  */
 package com.google.common.truth;
 
+import static com.google.common.truth.ExpectFailure.expectFailure;
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 import static com.google.common.truth.Truth.assert_;
@@ -31,14 +32,15 @@
  */
 @SuppressWarnings("LenientFormatStringValidation") // Intentional for testing
 @RunWith(JUnit4.class)
-public class CustomFailureMessageTest extends BaseSubjectTestCase {
+public class CustomFailureMessageTest {
 
   @Test
   public void assertWithMessageThat() {
-    expectFailure.whenTesting().withMessage("This is a custom message").that(false).isTrue();
-    assertThat(expectFailure.getFailure())
-        .hasMessageThat()
-        .startsWith("This is a custom message\n");
+    AssertionError e =
+        expectFailure(
+            whenTesting ->
+                whenTesting.withMessage("This is a custom message").that(false).isTrue());
+    assertThat(e).hasMessageThat().startsWith("This is a custom message\n");
   }
 
   @Test
@@ -59,14 +61,14 @@ public void countPlaceholders() {
 
   @Test
   public void assertWithMessageThat_withPlaceholders() {
-    expectFailure
-        .whenTesting()
-        .withMessage("This is a %s %s", "custom", "message")
-        .that(false)
-        .isTrue();
-    assertThat(expectFailure.getFailure())
-        .hasMessageThat()
-        .startsWith("This is a custom message\n");
+    AssertionError e =
+        expectFailure(
+            whenTesting ->
+                whenTesting
+                    .withMessage("This is a %s %s", "custom", "message")
+                    .that(false)
+                    .isTrue());
+    assertThat(e).hasMessageThat().startsWith("This is a custom message\n");
   }
 
   @Test

core/src/test/java/com/google/common/truth/CustomFailureMessageTest.java

@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.ExpectFailure.assertThat;
 import static com.google.common.truth.Fact.formatNumericValue;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
@@ -34,7 +35,7 @@
  * @author Kurt Alfred Kluever
  */
 @RunWith(JUnit4.class)
-public class DoubleSubjectTest extends BaseSubjectTestCase {
+public class DoubleSubjectTest {
 
   private static final double NEARLY_MAX = 1.7976931348623155E308;
   private static final double NEGATIVE_NEARLY_MAX = -1.7976931348623155E308;

core/src/test/java/com/google/common/truth/DoubleSubjectTest.java

@@ -17,7 +17,7 @@
 
 import static com.google.common.truth.ExpectFailure.assertThat;
 
-/** Convenience methods for Java 8 Truth Subject tests, similar to BaseSubjectTestCase. */
+/** Convenience methods for {@link Subject} tests. */
 final class FailureAssertions {
   static void assertFailureKeys(AssertionError e, String... keys) {
     assertThat(e).factKeys().containsExactlyElementsIn(keys).inOrder();

extensions/java8/src/test/java/com/google/common/truth/ExpectFailure8Test.java core/src/test/java/com/google/common/truth/ExpectFailure8Test.java

@@ -17,6 +17,7 @@
 
 import static com.google.common.truth.ExpectFailure.assertThat;
 import static com.google.common.truth.Fact.formatNumericValue;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
@@ -34,7 +35,7 @@
  * @author Kurt Alfred Kluever
  */
 @RunWith(JUnit4.class)
-public class FloatSubjectTest extends BaseSubjectTestCase {
+public class FloatSubjectTest {
   private static final float NEARLY_MAX = 3.4028233E38f;
   private static final float NEGATIVE_NEARLY_MAX = -3.4028233E38f;
   private static final float JUST_OVER_MIN = 2.8E-45f;

extensions/java8/src/test/java/com/google/common/truth/FailureAssertions.java core/src/test/java/com/google/common/truth/FailureAssertions.java

@@ -16,6 +16,8 @@
 package com.google.common.truth;
 
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
@@ -30,7 +32,7 @@
  * @author Christian Gruber ([email protected])
  */
 @RunWith(JUnit4.class)
-public class GuavaOptionalSubjectTest extends BaseSubjectTestCase {
+public class GuavaOptionalSubjectTest {
 
   @Test
   public void isPresent() {

core/src/test/java/com/google/common/truth/FloatSubjectTest.java

@@ -34,7 +34,7 @@
  * @author Kurt Alfred Kluever
  */
 @RunWith(JUnit4.class)
-public class IntegerSubjectTest extends BaseSubjectTestCase {
+public class IntegerSubjectTest {
 
   @Test
   @SuppressWarnings("TruthSelfEquals")
@@ -50,17 +50,17 @@ public void simpleInequality() {
   @Test
   public void equalityWithLongs() {
     assertThat(0).isEqualTo(0L);
-    expectFailureWhenTestingThat(0).isNotEqualTo(0L);
+    expectFailure(whenTesting -> whenTesting.that(0).isNotEqualTo(0L));
   }
 
   @Test
   public void equalityFail() {
-    expectFailureWhenTestingThat(4).isEqualTo(5);
+    expectFailure(whenTesting -> whenTesting.that(4).isEqualTo(5));
   }
 
   @Test
   public void inequalityFail() {
-    expectFailureWhenTestingThat(4).isNotEqualTo(4);
+    expectFailure(whenTesting -> whenTesting.that(4).isNotEqualTo(4));
   }
 
   @Test
@@ -70,12 +70,12 @@ public void equalityOfNulls() {
 
   @Test
   public void equalityOfNullsFail_nullActual() {
-    expectFailureWhenTestingThat(null).isEqualTo(5);
+    expectFailure(whenTesting -> whenTesting.that(null).isEqualTo(5));
   }
 
   @Test
   public void equalityOfNullsFail_nullExpected() {
-    expectFailureWhenTestingThat(5).isEqualTo(null);
+    expectFailure(whenTesting -> whenTesting.that(5).isEqualTo(null));
   }
 
   @Test
@@ -86,7 +86,7 @@ public void inequalityOfNulls() {
 
   @Test
   public void inequalityOfNullsFail() {
-    expectFailureWhenTestingThat(null).isNotEqualTo(null);
+    expectFailure(whenTesting -> whenTesting.that(null).isNotEqualTo(null));
   }
 
   @Test
@@ -103,22 +103,24 @@ public void overflowOnPrimitives() {
 
   @Test
   public void overflowOnPrimitives_shouldBeEqualAfterCast_min() {
-    expectFailureWhenTestingThat(Integer.MIN_VALUE).isNotEqualTo((long) Integer.MIN_VALUE);
+    expectFailure(
+        whenTesting -> whenTesting.that(Integer.MIN_VALUE).isNotEqualTo((long) Integer.MIN_VALUE));
   }
 
   @Test
   public void overflowOnPrimitives_shouldBeEqualAfterCast_max() {
-    expectFailureWhenTestingThat(Integer.MAX_VALUE).isNotEqualTo((long) Integer.MAX_VALUE);
+    expectFailure(
+        whenTesting -> whenTesting.that(Integer.MAX_VALUE).isNotEqualTo((long) Integer.MAX_VALUE));
   }
 
   @Test
   public void overflowBetweenIntegerAndLong_shouldBeDifferent_min() {
-    expectFailureWhenTestingThat(Integer.MIN_VALUE).isEqualTo(Long.MIN_VALUE);
+    expectFailure(whenTesting -> whenTesting.that(Integer.MIN_VALUE).isEqualTo(Long.MIN_VALUE));
   }
 
   @Test
   public void overflowBetweenIntegerAndLong_shouldBeDifferent_max() {
-    expectFailureWhenTestingThat(Integer.MAX_VALUE).isEqualTo(Long.MAX_VALUE);
+    expectFailure(whenTesting -> whenTesting.that(Integer.MAX_VALUE).isEqualTo(Long.MAX_VALUE));
   }
 
   @Test
@@ -220,8 +222,4 @@ private static AssertionError expectFailure(
       SimpleSubjectBuilderCallback<IntegerSubject, Integer> callback) {
     return ExpectFailure.expectFailureAbout(IntegerSubject::new, callback);
   }
-
-  private IntegerSubject expectFailureWhenTestingThat(Integer actual) {
-    return expectFailure.whenTesting().that(actual);
-  }
 }

core/src/test/java/com/google/common/truth/GuavaOptionalSubjectTest.java

@@ -21,6 +21,9 @@
 import static com.google.common.truth.Correspondence.tolerance;
 import static com.google.common.truth.ExpectFailure.assertThat;
 import static com.google.common.truth.ExpectFailure.expectFailure;
+import static com.google.common.truth.FailureAssertions.assertFailureKeys;
+import static com.google.common.truth.FailureAssertions.assertFailureValue;
+import static com.google.common.truth.FailureAssertions.assertFailureValueIndexed;
 import static com.google.common.truth.TestCorrespondences.CASE_INSENSITIVE_EQUALITY;
 import static com.google.common.truth.TestCorrespondences.CASE_INSENSITIVE_EQUALITY_HALF_NULL_SAFE;
 import static com.google.common.truth.TestCorrespondences.NULL_SAFE_RECORD_ID;
@@ -55,7 +58,7 @@
  * @author Pete Gillin
  */
 @RunWith(JUnit4.class)
-public class IterableSubjectCorrespondenceTest extends BaseSubjectTestCase {
+public class IterableSubjectCorrespondenceTest {
 
   @Test
   // test of a mistaken call