From e5eaacec20615b8c85eea520955d33d6c0fe7094 Mon Sep 17 00:00:00 2001 From: ibaker Date: Wed, 8 Jan 2020 17:15:03 +0000 Subject: [PATCH] Fix typo in SpannedSubject.hasBoldItalicSpanBetween PiperOrigin-RevId: 288710939 --- .../testutil/truth/SpannedSubject.java | 4 ++-- .../testutil/truth/SpannedSubjectTest.java | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java index 78c41a43e8..1751502ac4 100644 --- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java +++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java @@ -167,8 +167,8 @@ public final class SpannedSubject extends Subject { simpleFact( String.format("No matching StyleSpans found between start=%s,end=%s", start, end)), fact("in text", actual.toString()), - fact("expected either styles", Arrays.asList(Typeface.BOLD_ITALIC)), - fact("or styles", Arrays.asList(Typeface.BOLD, Typeface.BOLD_ITALIC)), + fact("expected either styles", Collections.singletonList(Typeface.BOLD_ITALIC)), + fact("or styles", Arrays.asList(Typeface.BOLD, Typeface.ITALIC)), fact("but found styles", styles)); return ALREADY_FAILED_WITH_FLAGS; } diff --git a/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java b/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java index d1ee3ee81a..32ce419c19 100644 --- a/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java +++ b/testutils/src/test/java/com/google/android/exoplayer2/testutil/truth/SpannedSubjectTest.java @@ -151,6 +151,23 @@ public class SpannedSubjectTest { .withFlags(Spanned.SPAN_INCLUSIVE_EXCLUSIVE); } + @Test + public void boldItalicSpan_onlyItalic() { + SpannableString spannable = SpannableString.valueOf("test with italic section"); + int start = "test with ".length(); + int end = start + "italic".length(); + spannable.setSpan(new StyleSpan(Typeface.ITALIC), start, end, Spanned.SPAN_INCLUSIVE_EXCLUSIVE); + + AssertionError expected = + expectFailure( + whenTesting -> whenTesting.that(spannable).hasBoldItalicSpanBetween(start, end)); + assertThat(expected) + .factKeys() + .contains( + String.format("No matching StyleSpans found between start=%s,end=%s", start, end)); + assertThat(expected).factValue("but found styles").contains("[" + Typeface.ITALIC + "]"); + } + @Test public void boldItalicSpan_mismatchedStartIndex() { SpannableString spannable = SpannableString.valueOf("test with bold & italic section");