Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c623c257 authored by Seigo Nonaka's avatar Seigo Nonaka Committed by android-build-merger
Browse files

Merge "Fix {Spanned|Spannable}StringNoCopyTest test cases" into pi-dev am: 55ae3172 

am: e310042d

Change-Id: Iafdffc033f6198feb545538466b92a820fbc3b5c
parents 8c12f27b e310042d

core/tests/coretests/src/android/text/SpannableStringNoCopyTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

core/tests/coretests/src/android/text/SpannedStringNoCopyTest.java

+2 −2
Original line number Diff line number Diff line
@@ -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);