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

Commit d5c12147 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix failed test cases" into rvc-dev am: 1676454b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I42facdf7ead83078fd227193a08684701036b0eb
parents 009332ed 1676454b

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -184,6 +184,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 




    @VisibleForTesting

    @VisibleForTesting

    List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {

    List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {

        if (candidates.isEmpty()) {

            return candidates;

        }



        final ExecutorService executor = Executors.newFixedThreadPool(candidates.size());

        final ExecutorService executor = Executors.newFixedThreadPool(candidates.size());

        final List<ContextualCard> cards = new ArrayList<>();

        final List<ContextualCard> cards = new ArrayList<>();

        List<Future<ContextualCard>> eligibleCards = new ArrayList<>();

        List<Future<ContextualCard>> eligibleCards = new ArrayList<>();

tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java

+7 −3
Original line number Original line Diff line number Diff line
@@ -270,23 +270,27 @@ public class SettingsSliceProviderTest { 




    @Test

    @Test

    public void onBindSlice_nightModeChanged_shouldReloadTheme() {

    public void onBindSlice_nightModeChanged_shouldReloadTheme() {

        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;

        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;



        final SliceData data = getDummyData();

        final SliceData data = getDummyData();

        mProvider.mSliceWeakDataCache.put(data.getUri(), data);

        mProvider.mSliceWeakDataCache.put(data.getUri(), data);

        mProvider.onBindSlice(data.getUri());

        mProvider.onBindSlice(data.getUri());





        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;

        mProvider.onBindSlice(data.getUri());



        assertThat(ShadowTheme.isThemeRebased()).isTrue();

        assertThat(ShadowTheme.isThemeRebased()).isTrue();

    }

    }





    @Test

    @Test

    public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() {

    public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() {

        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;

        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;



        SliceData data = getDummyData();

        SliceData data = getDummyData();

        mProvider.mSliceWeakDataCache.put(data.getUri(), data);

        mProvider.mSliceWeakDataCache.put(data.getUri(), data);

        mProvider.onBindSlice(data.getUri());

        mProvider.onBindSlice(data.getUri());





        mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;

        mProvider.onBindSlice(data.getUri());



        assertThat(ShadowTheme.isThemeRebased()).isFalse();

        assertThat(ShadowTheme.isThemeRebased()).isFalse();

    }

    }