Block settings when DISALLOW_CONFIG_DATE_TIME.
Test: m -j RunSettingsRoboTests runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/core/UserRestrictionTest.java Fix: 67497909 After turn on the user restriction in TestDPC: https://hsv.googleplex.com/5414119658225664 The date time settings page become: https://hsv.googleplex.com/5199302573948928 Change-Id: I42590c4a505ec1b6ffa86eb460b90fa6ec8ba783
This commit is contained in:
@@ -22,6 +22,7 @@ import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -48,14 +49,15 @@ public class DatePreferenceControllerTest {
|
||||
@Mock
|
||||
private AutoTimePreferenceController mAutoTimePreferenceController;
|
||||
|
||||
private Preference mPreference;
|
||||
private RestrictedPreference mPreference;
|
||||
private DatePreferenceController mController;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
when(mContext.getSystemService(Context.ALARM_SERVICE)).thenReturn(mAlarmManager);
|
||||
mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
|
||||
mPreference = new RestrictedPreference(ShadowApplication.getInstance().
|
||||
getApplicationContext());
|
||||
mController = new DatePreferenceController(mContext, mHost, mAutoTimePreferenceController);
|
||||
}
|
||||
|
||||
@@ -72,6 +74,9 @@ public class DatePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updateState_autoTimeEnabled_shouldDisablePref() {
|
||||
// Make sure not disabled by admin.
|
||||
mPreference.setDisabledByAdmin(null);
|
||||
|
||||
when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
@@ -80,6 +85,9 @@ public class DatePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updateState_autoTimeDisabled_shouldEnablePref() {
|
||||
// Make sure not disabled by admin.
|
||||
mPreference.setDisabledByAdmin(null);
|
||||
|
||||
when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
|
@@ -17,10 +17,11 @@
|
||||
package com.android.settings.datetime;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.os.UserManager;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -31,6 +32,7 @@ import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
@@ -46,12 +48,13 @@ public class TimePreferenceControllerTest {
|
||||
private AutoTimePreferenceController mAutoTimePreferenceController;
|
||||
|
||||
private TimePreferenceController mController;
|
||||
private Preference mPreference;
|
||||
private RestrictedPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mPreference = new Preference(ShadowApplication.getInstance().getApplicationContext());
|
||||
mPreference = new RestrictedPreference(
|
||||
ShadowApplication.getInstance().getApplicationContext());
|
||||
mController = new TimePreferenceController(mContext, mHost, mAutoTimePreferenceController);
|
||||
}
|
||||
|
||||
@@ -62,6 +65,9 @@ public class TimePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updateState_autoTimeEnabled_shouldDisablePref() {
|
||||
// Make sure not disabled by admin.
|
||||
mPreference.setDisabledByAdmin(null);
|
||||
|
||||
when(mAutoTimePreferenceController.isEnabled()).thenReturn(true);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
@@ -70,6 +76,9 @@ public class TimePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updateState_autoTimeDisabled_shouldEnablePref() {
|
||||
// Make sure not disabled by admin.
|
||||
mPreference.setDisabledByAdmin(null);
|
||||
|
||||
when(mAutoTimePreferenceController.isEnabled()).thenReturn(false);
|
||||
mController.updateState(mPreference);
|
||||
|
||||
|
@@ -21,6 +21,7 @@ import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settings.TestConfig;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
@@ -41,15 +42,16 @@ public class TimeZonePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
private AutoTimeZonePreferenceController mAutoTimeZonePreferenceController;
|
||||
|
||||
private Context mContext;
|
||||
private TimeZonePreferenceController mController;
|
||||
private Preference mPreference;
|
||||
private RestrictedPreference mPreference;
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
mContext = ShadowApplication.getInstance().getApplicationContext();
|
||||
mPreference = new Preference(mContext);
|
||||
mPreference = new RestrictedPreference(mContext);
|
||||
mController = spy(new TimeZonePreferenceController(mContext,
|
||||
mAutoTimeZonePreferenceController));
|
||||
}
|
||||
@@ -61,6 +63,9 @@ public class TimeZonePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updateState_autoTimeZoneEnabled_shouldDisablePref() {
|
||||
// Make sure not disabled by admin.
|
||||
mPreference.setDisabledByAdmin(null);
|
||||
|
||||
doReturn("test timezone").when(mController).getTimeZoneOffsetAndName();
|
||||
when(mAutoTimeZonePreferenceController.isEnabled()).thenReturn(true);
|
||||
mController.updateState(mPreference);
|
||||
@@ -70,6 +75,9 @@ public class TimeZonePreferenceControllerTest {
|
||||
|
||||
@Test
|
||||
public void updateState_autoTimeZoneDisabled_shouldEnablePref() {
|
||||
// Make sure not disabled by admin.
|
||||
mPreference.setDisabledByAdmin(null);
|
||||
|
||||
doReturn("test timezone").when(mController).getTimeZoneOffsetAndName();
|
||||
when(mAutoTimeZonePreferenceController.isEnabled()).thenReturn(false);
|
||||
mController.updateState(mPreference);
|
||||
|
Reference in New Issue
Block a user