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

Commit 903cbb86 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Fix Robotest failures" into main

parents 036249ef 61eccced

packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/ProviderTileTest.java

+0 −7
Original line number Diff line number Diff line
@@ -258,13 +258,6 @@ public class ProviderTileTest { 
        assertThat(tile.getType()).isEqualTo(Tile.Type.GROUP);

    }



    @Test

    public void isSearchable_noMetadata_isTrue() {

        final Tile tile = new ProviderTile(mProviderInfo, "category", null);



        assertThat(tile.isSearchable()).isTrue();

    }



    @Test

    public void isSearchable_notSet_isTrue() {

        final Tile tile = new ProviderTile(mProviderInfo, "category", mMetaData);

packages/SettingsLib/tests/robotests/src/com/android/settingslib/license/LicenseHtmlGeneratorFromXmlTest.java

+2 −2
Original line number Diff line number Diff line
@@ -168,10 +168,10 @@ public class LicenseHtmlGeneratorFromXmlTest { 
    private static final String EXPECTED_NEW_HTML_STRING = HTML_HEAD_STRING + HTML_NEW_BODY_STRING;



    private static final String EXPECTED_OLD_HTML_STRING_WITH_CUSTOM_HEADING =

            HTML_HEAD_STRING + HTML_CUSTOM_HEADING + "\n" + HTML_OLD_BODY_STRING;

            HTML_HEAD_STRING + HTML_CUSTOM_HEADING + "\n<br/>\n" + HTML_OLD_BODY_STRING;



    private static final String EXPECTED_NEW_HTML_STRING_WITH_CUSTOM_HEADING =

            HTML_HEAD_STRING + HTML_CUSTOM_HEADING + "\n" + HTML_NEW_BODY_STRING;

            HTML_HEAD_STRING + HTML_CUSTOM_HEADING + "\n<br/>\n" + HTML_NEW_BODY_STRING;



    @Test

    public void testParseValidXmlStream() throws XmlPullParserException, IOException {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/BannerMessagePreferenceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ import android.widget.TextView; 


import androidx.annotation.ColorRes;

import androidx.preference.PreferenceViewHolder;

import com.android.settingslib.widget.preference.banner.R;



import com.android.settingslib.testutils.OverpoweredReflectionHelper;

import com.android.settingslib.widget.preference.banner.R;



import org.junit.Before;

import org.junit.Test;