Skip to content

Use Truth a little better, and use assertThrows in a place that I'd missed. #8526

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.

Sign up for GitHub

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

Merged
copybara-service merged 1 commit into from
Jun 27, 2026
+14 −40
Merged

Use Truth a little better, and use assertThrows in a place that I'd missed. #8526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions android/guava-tests/test/com/google/common/primitives/CharsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ public void testSaturatedCast() {
private void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> Chars.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

// We need to test that our method behaves like the JDK method.
Expand Down
4 changes: 1 addition & 3 deletions android/guava-tests/test/com/google/common/primitives/IntsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ public void testSaturatedCast() {
private static void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> Ints.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

// We need to test that our method behaves like the JDK method.
Expand Down
4 changes: 1 addition & 3 deletions android/guava-tests/test/com/google/common/primitives/ShortsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ public void testSaturatedCast() {
private static void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> Shorts.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

// We need to test that our method behaves like the JDK method.
Expand Down
11 changes: 3 additions & 8 deletions android/guava-tests/test/com/google/common/primitives/SignedBytesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,9 @@ public void testSaturatedCast() {
}

private static void assertCastFails(long value) {
try {
SignedBytes.checkedCast(value);
fail("Cast to byte should have failed: " + value);
} catch (IllegalArgumentException ex) {
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
}
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> SignedBytes.checkedCast(value));
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

public void testCompare() {
Expand Down
4 changes: 1 addition & 3 deletions android/guava-tests/test/com/google/common/primitives/UnsignedBytesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,7 @@ public void testSaturatedCast() {
private static void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> UnsignedBytes.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

public void testCompare() {
Expand Down
4 changes: 1 addition & 3 deletions guava-tests/test/com/google/common/primitives/CharsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ public void testSaturatedCast() {
private void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> Chars.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

// We need to test that our method behaves like the JDK method.
Expand Down
4 changes: 1 addition & 3 deletions guava-tests/test/com/google/common/primitives/IntsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ public void testSaturatedCast() {
private static void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> Ints.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

// We need to test that our method behaves like the JDK method.
Expand Down
4 changes: 1 addition & 3 deletions guava-tests/test/com/google/common/primitives/ShortsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ public void testSaturatedCast() {
private static void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> Shorts.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

// We need to test that our method behaves like the JDK method.
Expand Down
11 changes: 3 additions & 8 deletions guava-tests/test/com/google/common/primitives/SignedBytesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,9 @@ public void testSaturatedCast() {
}

private static void assertCastFails(long value) {
try {
SignedBytes.checkedCast(value);
fail("Cast to byte should have failed: " + value);
} catch (IllegalArgumentException ex) {
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
}
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> SignedBytes.checkedCast(value));
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

public void testCompare() {
Expand Down
4 changes: 1 addition & 3 deletions guava-tests/test/com/google/common/primitives/UnsignedBytesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,7 @@ public void testSaturatedCast() {
private static void assertCastFails(long value) {
IllegalArgumentException ex =
assertThrows(IllegalArgumentException.class, () -> UnsignedBytes.checkedCast(value));
assertWithMessage("%s not found in exception text: %s", value, ex.getMessage())
.that(ex.getMessage().contains(String.valueOf(value)))
.isTrue();
assertThat(ex).hasMessageThat().contains(String.valueOf(value));
}

public void testCompare() {
Expand Down
Loading