Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev

am: 55ae317213

Change-Id: I9e49ba0af1772980a5a8fadd5f6b9d27efad5c8d
This commit is contained in:
Seigo Nonaka
2018-04-10 13:51:12 -07:00
committed by android-build-merger
2 changed files with 4 additions and 4 deletions

View File

@@ -54,7 +54,7 @@ public class SpannableStringNoCopyTest {
first.setSpan(new UnderlineSpan(), 0, first.length(), Spanned.SPAN_PRIORITY);
// Do not copy NoCopySpan if specified so.
final SpannedString copied = new SpannedString(first, false /* copyNoCopySpan */);
final SpannedString copied = new SpannedString(first, true /* ignoreNoCopySpan */);
final Object[] spans = copied.getSpans(0, copied.length(), Object.class);
assertNotNull(spans);
assertEquals(2, spans.length);
@@ -87,7 +87,7 @@ public class SpannableStringNoCopyTest {
// Do not copy NoCopySpan if specified so.
final SpannedString copied = new SpannedString(
new CustomSpannable(first), false /* copyNoCopySpan */);
new CustomSpannable(first), true /* ignoreNoCopySpan */);
final Object[] spans = copied.getSpans(0, copied.length(), Object.class);
assertNotNull(spans);
assertEquals(2, spans.length);

View File

@@ -54,7 +54,7 @@ public class SpannedStringNoCopyTest {
first.setSpan(new UnderlineSpan(), 0, first.length(), Spanned.SPAN_PRIORITY);
// Do not copy NoCopySpan if specified so.
final SpannedString copied = new SpannedString(first, false /* copyNoCopySpan */);
final SpannedString copied = new SpannedString(first, true /* ignoreNoCopySpan */);
final Object[] spans = copied.getSpans(0, copied.length(), Object.class);
assertNotNull(spans);
assertEquals(2, spans.length);
@@ -87,7 +87,7 @@ public class SpannedStringNoCopyTest {
// Do not copy NoCopySpan if specified so.
final SpannedString copied = new SpannedString(
new CustomSpanned(first), false /* copyNoCopySpan */);
new CustomSpanned(first), true /* ignoreNoCopySpan */);
final Object[] spans = copied.getSpans(0, copied.length(), Object.class);
assertNotNull(spans);
assertEquals(2, spans.length);