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

Commit c38d390c authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Trying to fix flaky tests related to testCharSequence* 

We now recycle the Parcels after use. Hoping this fixes/reduces flakiness.

Bug: 62715590
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ifbce8d8a7d823d36aa7bfbeae49059ae15abd334
parent 0b513504

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

+40 −19
Original line number Diff line number Diff line
@@ -363,14 +363,23 @@ public class TextUtilsTest { 
    @Test

    public void testCharSequenceCreator() {

        Parcel p = Parcel.obtain();

        CharSequence text;

        try {

            TextUtils.writeToParcel(null, p, 0);

        CharSequence text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);

            text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);

            assertNull("null CharSequence should generate null from parcel", text);

        } finally {

            p.recycle();

        }

        p = Parcel.obtain();

        try {

            TextUtils.writeToParcel("test", p, 0);

            p.setDataPosition(0);

            text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);

            assertEquals("conversion to/from parcel failed", "test", text);

        } finally {

            p.recycle();

        }

    }



    @Test
@@ -378,10 +387,14 @@ public class TextUtilsTest { 
        Parcel p;

        CharSequence text;

        p = Parcel.obtain();

        try {

            TextUtils.writeToParcel(null, p, 0);

            p.setDataPosition(0);

            text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);

            assertNull("null CharSequence should generate null from parcel", text);

        } finally {

            p.recycle();

        }

    }



    @Test
@@ -389,10 +402,14 @@ public class TextUtilsTest { 
        Parcel p;

        CharSequence text;

        p = Parcel.obtain();

        try {

            TextUtils.writeToParcel(new SpannableString("test"), p, 0);

            p.setDataPosition(0);

            text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);

            assertEquals("conversion to/from parcel failed", "test", text.toString());

        } finally {

            p.recycle();

        }

    }



    @Test
@@ -400,10 +417,14 @@ public class TextUtilsTest { 
        Parcel p;

        CharSequence text;

        p = Parcel.obtain();

        try {

            TextUtils.writeToParcel("test", p, 0);

            p.setDataPosition(0);

            text = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(p);

            assertEquals("conversion to/from parcel failed", "test", text.toString());

        } finally {

            p.recycle();

        }

    }



    /**