Refactor AdbPreferenceController

- Refactor AdbPreferenceController to use
 AbstractEnableAdbPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: If34e2968ff8900276023e12f89d9cc86468adf7a
This commit is contained in:
jeffreyhuang
2017-10-09 11:15:55 -07:00
parent 37df3d6d1f
commit fe537c8d84
4 changed files with 28 additions and 123 deletions

View File

@@ -18,12 +18,11 @@ package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.ContentResolver;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
@@ -44,8 +43,7 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class AdbPreferenceControllerTest {
@Mock
private Context mContext;
@Mock
private SwitchPreference mPreference;
@Mock
@@ -55,71 +53,24 @@ public class AdbPreferenceControllerTest {
@Mock
private DevelopmentSettingsDashboardFragment mFragment;
private ContentResolver mContentResolver;
private Context mContext;
private AdbPreferenceController mController;
@Before
public void setup() {
MockitoAnnotations.initMocks(this);
mContentResolver = RuntimeEnvironment.application.getContentResolver();
mContext = RuntimeEnvironment.application;
mController = spy(new AdbPreferenceController(mContext, mFragment));
doNothing().when(mController).notifyStateChanged();
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
when(mContext.getContentResolver()).thenReturn(mContentResolver);
doReturn(true).when(mController).isAvailable();
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(
mPreference);
mController.displayPreference(mPreferenceScreen);
}
@Test
public void isAvailable_notAdmin_shouldBeFalse() {
when(mUserManager.isAdminUser()).thenReturn(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_isAdmin_shouldBeTrue() {
when(mUserManager.isAdminUser()).thenReturn(true);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void onPreferenceChanged_settingDisabled_shouldTurnOffAdb() {
when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
mController.onPreferenceChange(null, false);
final int mode = Settings.System.getInt(mContentResolver,
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_OFF);
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
Settings.System.putInt(mContentResolver, Settings.Global.ADB_ENABLED,
AdbPreferenceController.ADB_SETTING_ON);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
}
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
Settings.System.putInt(mContentResolver, Settings.Global.ADB_ENABLED,
AdbPreferenceController.ADB_SETTING_OFF);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void onDeveloperOptionsDisabled_shouldDisablePreference() {
when(mContext.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
when(mUserManager.isAdminUser()).thenReturn(true);
mController.onDeveloperOptionsDisabled();
final int mode = Settings.System.getInt(mContentResolver,
final int mode = Settings.System.getInt(mContext.getContentResolver(),
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_OFF);
@@ -138,7 +89,7 @@ public class AdbPreferenceControllerTest {
@Test
public void onAdbDialogConfirmed_shouldEnableAdbSetting() {
mController.onAdbDialogConfirmed();
final int mode = Settings.System.getInt(mContentResolver,
final int mode = Settings.System.getInt(mContext.getContentResolver(),
Settings.Global.ADB_ENABLED, -1);
assertThat(mode).isEqualTo(AdbPreferenceController.ADB_SETTING_ON);
@@ -146,7 +97,7 @@ public class AdbPreferenceControllerTest {
@Test
public void onAdbDialogDismissed_preferenceShouldNotBeChecked() {
Settings.System.putInt(mContentResolver, Settings.Global.ADB_ENABLED,
Settings.System.putInt(mContext.getContentResolver(), Settings.Global.ADB_ENABLED,
AdbPreferenceController.ADB_SETTING_OFF);
mController.onAdbDialogDismissed();