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

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

Merge "Fix battery saver switch test case" into udc-dev am: e4058d20 

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



Change-Id: Ie27d402ac7e1972d5143a081c78df95374af7ac2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ea5b2854 e4058d20

src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ public class BatterySaverButtonPreferenceController extends 
    @Override

    public boolean setChecked(boolean stateOn) {

        return BatterySaverUtils.setPowerSaveMode(mContext, stateOn,

                true /* needFirstTimeWarning */);

                false /* needFirstTimeWarning */);

    }



    @Override

tests/robotests/src/com/android/settings/fuelgauge/batterysaver/BatterySaverButtonPreferenceControllerTest.java

+15 −7
Original line number Diff line number Diff line
@@ -18,17 +18,13 @@ package com.android.settings.fuelgauge.batterysaver; 


import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.content.Intent;

import android.os.PowerManager;

import android.provider.Settings;

import android.provider.SettingsSlicesContract;
@@ -85,6 +81,15 @@ public class BatterySaverButtonPreferenceControllerTest { 
        assertThat(mPreference.isChecked()).isFalse();

    }



    @Test

    public void onSwitchChanged_isCheckedAndAcked_setPowerSaveMode() {

        setLowPowerWarningAcked(/* acked= */ 1);



        mController.onSwitchChanged(/* switchView= */ null, /* isChecked= */ true);



        verify(mPowerManager).setPowerSaveModeEnabled(true);

    }



    @Test

    public void updateState_lowPowerOn_preferenceIsChecked() {

        when(mPowerManager.isPowerSaveMode()).thenReturn(true);
@@ -104,11 +109,10 @@ public class BatterySaverButtonPreferenceControllerTest { 
    }



    @Test

    public void setChecked_on_showWarningMessage() {

    public void setChecked_on_setPowerSaveMode() {

        mController.setChecked(true);



        verify(mContext).sendBroadcast(any(Intent.class));

        verify(mPowerManager, never()).setPowerSaveModeEnabled(anyBoolean());

        verify(mPowerManager).setPowerSaveModeEnabled(true);

    }



    @Test
@@ -143,5 +147,9 @@ public class BatterySaverButtonPreferenceControllerTest { 
                mContext.getContentResolver(),

                Settings.Secure.LOW_POWER_WARNING_ACKNOWLEDGED,

                acked);

        Settings.Secure.putInt(

                mContext.getContentResolver(),

                Settings.Secure.EXTRA_LOW_POWER_WARNING_ACKNOWLEDGED,

                acked);

    }

}