PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move logic for FR in demo mode out of Settings

Browse Source 
Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
This commit is contained in:
Christine Franks
2017-06-23 14:28:21 -07:00
parent 50ac1cebc3
commit c6890ab6c5
9 changed files with 59 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
View File

@@ -22,7 +22,6 @@ import static org.mockito.Mockito.when;
import android.accounts.AccountManager;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
@@ -76,21 +75,16 @@ public class FactoryResetPreferenceControllerTest {
@Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
public void isAvailable_nonSystemUser() {
when(mUserManager.isAdminUser()).thenReturn(false);
ShadowUtils.setIsCarrierDemoUser(false);
ShadowUtils.setIsDemoUser(false);
assertThat(mController.isAvailable()).isFalse();
}
@Test
@Config(shadows = { ShadowSecureSettings.class, ShadowUtils.class })
public void isAvailable_carrierDemoUser() {
public void isAvailable_demoUser() {
when(mUserManager.isAdminUser()).thenReturn(false);
ShadowUtils.setIsCarrierDemoUser(true);
final String carrierDemoModeSetting = "carrier_demo_mode";
when(mContext.getString(com.android.internal.R.string.config_carrierDemoModeSetting))
.thenReturn(carrierDemoModeSetting);
Settings.Secure.putInt(null, carrierDemoModeSetting, 1);
ShadowUtils.setIsDemoUser(true);
assertThat(mController.isAvailable()).isTrue();
}