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

Merge "Introduce VerifyAppsOverUsbPreferenceControllerV2"

Browse Source
This commit is contained in:
Jeffrey Huang
2017-10-02 20:54:53 +00:00
committed by Android (Google) Code Review
parent f1c3e8f479 7b216bae94
commit 498e883d52
5 changed files with 391 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
View File

@@ -47,6 +47,10 @@ import org.robolectric.util.ReflectionHelpers;
import java.util.Collections;
import java.util.List;
/**
* deprecated in favor of {@link VerifyAppsOverUsbPreferenceControllerV2}
*/
@Deprecated
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VerifyAppsOverUsbPreferenceControllerTest {

211
tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerV2Test.java Normal file
View File

@@ -0,0 +1,211 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.development;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
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.content.pm.ResolveInfo;
import android.provider.Settings;
import android.provider.Settings.Global;
import android.support.v7.preference.PreferenceScreen;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.wrapper.PackageManagerWrapper;
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.annotation.Config;
import org.robolectric.util.ReflectionHelpers;
import java.util.Collections;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class VerifyAppsOverUsbPreferenceControllerV2Test {
@Mock
private PackageManagerWrapper mPackageManager;
@Mock
private PreferenceScreen mScreen;
@Mock
private RestrictedSwitchPreference mPreference;
@Mock
private VerifyAppsOverUsbPreferenceControllerV2.RestrictedLockUtilsDelegate
mRestrictedLockUtilsDelegate;
private Context mContext;
private VerifyAppsOverUsbPreferenceControllerV2 mController;
/** Convenience class for setting global int settings. */
class GlobalSetter {
public GlobalSetter set(String setting, int value) {
Global.putInt(mContext.getContentResolver(), setting, value);
return this;
}
}
private final GlobalSetter mGlobals = new GlobalSetter();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
when(mScreen.findPreference(anyString())).thenReturn(mPreference);
mController = new VerifyAppsOverUsbPreferenceControllerV2(mContext);
ReflectionHelpers.setField(
mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
mController.displayPreference(mScreen);
}
private void setupVerifyBroadcastReceivers(boolean nonEmpty) {
final List<ResolveInfo> resolveInfos = nonEmpty
? Collections.singletonList(mock(ResolveInfo.class))
: Collections.<ResolveInfo>emptyList();
when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt()))
.thenReturn(resolveInfos);
}
private void setupEnforcedAdmin(EnforcedAdmin result) {
when(mRestrictedLockUtilsDelegate.checkIfRestrictionEnforced(
(Context) any(), anyString(), anyInt())).thenReturn(result);
}
@Test
public void updateState_settingEnabled_preferenceShouldBeChecked() {
setupVerifyBroadcastReceivers(true);
setupEnforcedAdmin(null);
mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
mController.updateState(mPreference);
verify(mPreference).setChecked(true);
}
@Test
public void updateState_settingDisabled_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(true);
setupEnforcedAdmin(null);
mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0 /* setting disabled */);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void updateState_adbDisabled_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(true);
setupEnforcedAdmin(null);
mGlobals.set(Global.ADB_ENABLED, 0 /* setting disabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void updateState_verifierOff_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(true);
setupEnforcedAdmin(null);
mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_ENABLE, 0 /* setting disabled */);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void updateState_noBroadcastReceivers_preferenceShouldNotBeChecked() {
setupVerifyBroadcastReceivers(false);
setupEnforcedAdmin(null);
mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
mController.updateState(mPreference);
verify(mPreference).setChecked(false);
}
@Test
public void updateState_restrictedByAdmin_preferenceShouldBeDisabled() {
setupVerifyBroadcastReceivers(true);
final EnforcedAdmin admin = new EnforcedAdmin();
setupEnforcedAdmin(admin);
mGlobals.set(Global.ADB_ENABLED, 1 /* setting enabled */)
.set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1 /* setting enabled */);
mController.updateState(mPreference);
verify(mPreference).setDisabledByAdmin(admin);
}
@Test
public void isAvailable_verifierNotVisible_shouldReturnFalse() {
setupVerifyBroadcastReceivers(true);
mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 0 /* setting disabled */);
assertThat(mController.isAvailable()).isFalse();
}
@Test
public void isAvailable_verifierVisible_shouldReturnTrue() {
setupVerifyBroadcastReceivers(true);
mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1 /* setting enabled */);
assertThat(mController.isAvailable()).isTrue();
}
@Test
public void onPreferenceChange_settingEnabled_shouldEnableUsbVerify() {
mController.onPreferenceChange(mPreference, true /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_ON);
}
@Test
public void onPreferenceChange_settingDisabled_shouldDisableUsbVerify() {
mController.onPreferenceChange(mPreference, false /* new value */);
final int mode = Settings.Global.getInt(mContext.getContentResolver(),
android.provider.Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, -1 /* default */);
assertThat(mode).isEqualTo(VerifyAppsOverUsbPreferenceControllerV2.SETTING_VALUE_OFF);
}
@Test
public void onDeveloperOptionsEnabled_shouldUpdateState() {
mController = spy(mController);
mController.onDeveloperOptionsSwitchEnabled();
verify(mController).updateState(mPreference);
}
}