Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove workaround for ancient Android bug. #1238

Merged
merged 1 commit into from
Feb 6, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 4 additions & 33 deletions core/src/main/java/com/google/common/truth/Truth.java
Original file line number Diff line number Diff line change
Expand Up @@ -330,39 +330,16 @@ public static PathSubject assertThat(@Nullable Path actual) {
}

/**
* An {@code AssertionError} that (a) always supports a cause, even under old versions of Android
* and (b) omits "java.lang.AssertionError:" from the beginning of its toString() representation.
* An {@code AssertionError} that omits "java.lang.AssertionError:" from the beginning of its
* toString() representation.
*/
// TODO(cpovirk): Consider eliminating this, adding its functionality to AssertionErrorWithFacts?
@SuppressWarnings("OverrideThrowableToString") // We intentionally replace the normal format.
static final class SimpleAssertionError extends AssertionError {
/** Separate cause field, in case initCause() fails. */
private final @Nullable Throwable cause;

private SimpleAssertionError(String message, @Nullable Throwable cause) {
super(checkNotNull(message));
this.cause = cause;

try {
initCause(cause);
} catch (IllegalStateException alreadyInitializedBecauseOfHarmonyBug) {
/*
* initCause() throws under old versions of Android:
* https://issuetracker.google.com/issues/36945167
*
* Yes, it's *nice* if initCause() works:
*
* - It ensures that, if someone tries to call initCause() later, the call will fail loudly
* rather than be silently ignored.
*
* - It populates the usual `Throwable.cause` field, where users of debuggers and other
* tools are likely to look first.
*
* But if it doesn't work, that's fine: Most consumers of the cause should be retrieving it
* through getCause(), which we've overridden to return *our* `cause` field, which we've
* populated with the correct value.
*/
}

initCause(cause);
}

static SimpleAssertionError create(String message, @Nullable Throwable cause) {
Expand All @@ -379,12 +356,6 @@ static SimpleAssertionError createWithNoStack(String message) {
return createWithNoStack(message, /* cause= */ null);
}

@Override
@SuppressWarnings("UnsynchronizedOverridesSynchronized")
public @Nullable Throwable getCause() {
return cause;
}

@Override
public String toString() {
return checkNotNull(getLocalizedMessage());
Expand Down