Convert BatterySaverButton controller to Slice compatible.
- Update preference key to match the key defined in SettingsSlicesContract - Model TwoStateButtonPreference similar to TwoStatePreference (add setChecked, isChecked method) - Remove TwoStateButtonPreferenceController entirely because all methods are moved into Preference directly for better encapsulation. - Make BatterySaverButtonPrefController direclty implement TogglePreferenceController. It was not possible before because the interface between TwoStateButtonPreferene is too different from TwoStatePreference. Bug: 80106671 Test: robotests Change-Id: Ib72807dcf1b36e959e08df8d80538c3f9f79b76d
This commit is contained in:
Fan Zhang
committed by
Matthew Fritze
Matthew Fritze
parent
c4a3393b45
commit
ddc6c646c0
@@ -21,17 +21,12 @@ import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
|
||||
import androidx.lifecycle.LifecycleOwner;
|
||||
import android.content.Context;
|
||||
import android.os.PowerManager;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.widget.TwoStateButtonPreference;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -41,6 +36,9 @@ import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowPowerManager;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowPowerManager.class)
|
||||
@@ -48,67 +46,58 @@ public class BatterySaverButtonPreferenceControllerTest {
|
||||
|
||||
private BatterySaverButtonPreferenceController mController;
|
||||
private Context mContext;
|
||||
private Lifecycle mLifecycle;
|
||||
private LifecycleOwner mLifecycleOwner;
|
||||
private Button mButtonOn;
|
||||
private Button mButtonOff;
|
||||
private PowerManager mPowerManager;
|
||||
@Mock
|
||||
private TwoStateButtonPreference mPreference;
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mLifecycleOwner = () -> mLifecycle;
|
||||
mLifecycle = new Lifecycle(mLifecycleOwner);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
mButtonOn = new Button(mContext);
|
||||
mButtonOff = new Button(mContext);
|
||||
mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
|
||||
mPreference = spy(new TwoStateButtonPreference(mContext, null /* AttributeSet */));
|
||||
ReflectionHelpers.setField(mPreference, "mButtonOn", mButtonOn);
|
||||
ReflectionHelpers.setField(mPreference, "mButtonOff", mButtonOff);
|
||||
doReturn(mPreference).when(mPreferenceScreen).findPreference(anyString());
|
||||
|
||||
mButtonOn = new Button(mContext);
|
||||
mButtonOn.setId(R.id.state_on_button);
|
||||
doReturn(mButtonOn).when(mPreference).getStateOnButton();
|
||||
mButtonOff = new Button(mContext);
|
||||
mButtonOff.setId(R.id.state_off_button);
|
||||
doReturn(mButtonOff).when(mPreference).getStateOffButton();
|
||||
|
||||
mController = new BatterySaverButtonPreferenceController(mContext, mLifecycle);
|
||||
mController = new BatterySaverButtonPreferenceController(mContext, "test_key");
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateState_lowPowerOn_displayButtonOff() {
|
||||
public void updateState_lowPowerOn_preferenceIsChecked() {
|
||||
mPowerManager.setPowerSaveMode(true);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.GONE);
|
||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(mPreference.isChecked()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testUpdateState_lowPowerOff_displayButtonOn() {
|
||||
public void testUpdateState_lowPowerOff_preferenceIsUnchecked() {
|
||||
mPowerManager.setPowerSaveMode(false);
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
|
||||
assertThat(mPreference.isChecked()).isFalse();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnClick_clickButtonOn_setPowerSaveMode() {
|
||||
mController.onClick(mButtonOn);
|
||||
public void setChecked_on_setPowerSaveMode() {
|
||||
mController.setChecked(true);
|
||||
|
||||
assertThat(mPowerManager.isPowerSaveMode()).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnClick_clickButtonOff_clearPowerSaveMode() {
|
||||
mController.onClick(mButtonOff);
|
||||
public void setChecked_off_unsetPowerSaveMode() {
|
||||
mController.setChecked(false);
|
||||
|
||||
assertThat(mPowerManager.isPowerSaveMode()).isFalse();
|
||||
}
|
||||
|
||||
@@ -17,34 +17,27 @@
|
||||
package com.android.settings.widget;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
import static org.mockito.Matchers.anyString;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
import static org.mockito.Mockito.spy;
|
||||
import static org.mockito.Mockito.verify;
|
||||
|
||||
import android.content.Context;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
public class TwoStateButtonPreferenceControllerTest {
|
||||
public class TwoStateButtonPreferenceTest {
|
||||
|
||||
private static final String KEY = "pref_key";
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mPreferenceScreen;
|
||||
@Mock
|
||||
private TwoStateButtonPreference mPreference;
|
||||
private TwoStateButtonPreferenceController mController;
|
||||
private Context mContext;
|
||||
private Button mButtonOn;
|
||||
private Button mButtonOff;
|
||||
@@ -53,35 +46,34 @@ public class TwoStateButtonPreferenceControllerTest {
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = spy(RuntimeEnvironment.application);
|
||||
doReturn(mPreference).when(mPreferenceScreen).findPreference(anyString());
|
||||
mPreference = spy(new TwoStateButtonPreference(mContext, null /* AttributeSet */));
|
||||
mButtonOn = new Button(mContext);
|
||||
doReturn(mButtonOn).when(mPreference).getStateOnButton();
|
||||
mButtonOn.setId(R.id.state_on_button);
|
||||
mButtonOff = new Button(mContext);
|
||||
doReturn(mButtonOff).when(mPreference).getStateOffButton();
|
||||
|
||||
mController = new TestButtonsPreferenceController(mContext, KEY);
|
||||
mController.displayPreference(mPreferenceScreen);
|
||||
mButtonOff.setId(R.id.state_off_button);
|
||||
ReflectionHelpers.setField(mPreference, "mButtonOn", mButtonOn);
|
||||
ReflectionHelpers.setField(mPreference, "mButtonOff", mButtonOff);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetButtonVisibility_stateOn_onlyShowButtonOn() {
|
||||
mController.setButtonVisibility(true /* stateOn */);
|
||||
|
||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetButtonVisibility_stateOff_onlyShowButtonOff() {
|
||||
mController.setButtonVisibility(false /* stateOn */);
|
||||
mPreference.setChecked(true /* stateOn */);
|
||||
|
||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.GONE);
|
||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetButtonVisibility_stateOff_onlyShowButtonOff() {
|
||||
mPreference.setChecked(false /* stateOn */);
|
||||
|
||||
assertThat(mButtonOn.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
assertThat(mButtonOff.getVisibility()).isEqualTo(View.GONE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSetButtonEnabled_enabled_buttonEnabled() {
|
||||
mController.setButtonEnabled(true /* enabled */);
|
||||
mPreference.setButtonEnabled(true /* enabled */);
|
||||
|
||||
assertThat(mButtonOn.isEnabled()).isTrue();
|
||||
assertThat(mButtonOff.isEnabled()).isTrue();
|
||||
@@ -89,30 +81,18 @@ public class TwoStateButtonPreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void testSetButtonEnabled_disabled_buttonDisabled() {
|
||||
mController.setButtonEnabled(false /* enabled */);
|
||||
mPreference.setButtonEnabled(false /* enabled */);
|
||||
|
||||
assertThat(mButtonOn.isEnabled()).isFalse();
|
||||
assertThat(mButtonOff.isEnabled()).isFalse();
|
||||
}
|
||||
|
||||
/**
|
||||
* Controller to test methods in {@link TwoStateButtonPreferenceController}
|
||||
*/
|
||||
public static class TestButtonsPreferenceController
|
||||
extends TwoStateButtonPreferenceController {
|
||||
@Test
|
||||
public void onClick_shouldPropagateChangeToListener() {
|
||||
mPreference.onClick(mButtonOn);
|
||||
verify(mPreference).callChangeListener(true);
|
||||
|
||||
TestButtonsPreferenceController(Context context, String key) {
|
||||
super(context, key);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onButtonClicked(boolean stateOn) {
|
||||
//do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return AVAILABLE;
|
||||
}
|
||||
mPreference.onClick(mButtonOff);
|
||||
verify(mPreference).callChangeListener(false);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user