loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tweak SpannedSubject error message when actual has no spans

Browse Source 
Before:
No matching span found
in text  : Text with combined section.
expected : start=10	end=18	type=HorizontalTextInVerticalContextSpan	substring='combined'
but found:

After:
No matching span found
in text : Text with combined section.
expected: start=10	end=18	type=HorizontalTextInVerticalContextSpan	substring='combined'
but found no spans
PiperOrigin-RevId: 292878264
This commit is contained in:
ibaker 2020-02-03 10:27:09 +00:00 committed by Oliver Woodman
parent c7ea8bbf1a
commit dd10d96a3f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
testutils/src/main/java/com/google/android/exoplayer2/testutil/truth/SpannedSubject.java
View File

@ -39,6 +39,7 @@ import androidx.annotation.Nullable;
import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan; import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan;
import com.google.android.exoplayer2.text.span.RubySpan; import com.google.android.exoplayer2.text.span.RubySpan;
import com.google.android.exoplayer2.util.Util; import com.google.android.exoplayer2.util.Util;
import com.google.common.truth.Fact;
import com.google.common.truth.FailureMetadata; import com.google.common.truth.FailureMetadata;
import com.google.common.truth.Subject; import com.google.common.truth.Subject;
import java.util.ArrayList; import java.util.ArrayList;
@ -84,9 +85,7 @@ public final class SpannedSubject extends Subject {
Object[] spans = actual.getSpans(0, actual.length(), Object.class); Object[] spans = actual.getSpans(0, actual.length(), Object.class);
if (spans.length > 0) { if (spans.length > 0) {
failWithoutActual( failWithoutActual(
simpleFact("Expected no spans"), simpleFact("Expected no spans"), fact("in text", actual), actualSpansFact());
fact("in text", actual),
fact("but found", getAllSpansAsString(actual)));
} }
} }
@ -615,7 +614,7 @@ public final class SpannedSubject extends Subject {
"Found unexpected %ss between start=%s,end=%s", "Found unexpected %ss between start=%s,end=%s",
spanClazz.getSimpleName(), start, end)), spanClazz.getSimpleName(), start, end)),
simpleFact("expected none"), simpleFact("expected none"),
fact("but found", getAllSpansAsString(actual))); actualSpansFact());
} }
} }
@ -641,7 +640,17 @@ public final class SpannedSubject extends Subject {
simpleFact("No matching span found"), simpleFact("No matching span found"),
fact("in text", actual), fact("in text", actual),
fact("expected", getSpanAsString(start, end, spanType, spannedSubstring)), fact("expected", getSpanAsString(start, end, spanType, spannedSubstring)),
fact("but found", getAllSpansAsString(actual))); actualSpansFact());
}
@RequiresNonNull("actual")
private Fact actualSpansFact() {
String actualSpans = getAllSpansAsString(actual);
if (actualSpans.isEmpty()) {
return Fact.simpleFact("but found no spans");
} else {
return Fact.fact("but found", actualSpans);
}
} }
private static String getAllSpansAsString(Spanned spanned) { private static String getAllSpansAsString(Spanned spanned) {