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

Replace PackageManagerWrapper with PackageManager

Browse Source 
Replace all SettingsLib/PackageManagerWrapper in Settings,
by PackageManager,
Remove ShadowPackageManagerWrapper.

Bug: 62067063
Test: make RunSettingsRoboTests
Change-Id: I6d1af55c13d80c1907b98b21e0207cc903cd9b1f
This commit is contained in:
HJ ChangLiao
2018-04-24 15:12:31 +08:00
parent bb2c8a3147
commit 5693be2863
68 changed files with 181 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/development/LocalTerminalPreferenceControllerTest.java
View File

@@ -30,7 +30,6 @@ import androidx.preference.SwitchPreference;
import androidx.preference.PreferenceScreen;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +49,7 @@ public class LocalTerminalPreferenceControllerTest {
@Mock
private UserManager mUserManager;
@Mock
private PackageManagerWrapper mPackageManagerWrapper;
private PackageManager mPackageManager;
private LocalTerminalPreferenceController mController;
@@ -61,7 +60,7 @@ public class LocalTerminalPreferenceControllerTest {
when(mUserManager.isAdminUser()).thenReturn(true);
mController = spy(new LocalTerminalPreferenceController(mContext));
doReturn(true).when(mController).isAvailable();
doReturn(mPackageManagerWrapper).when(mController).getPackageManagerWrapper();
doReturn(mPackageManager).when(mController).getPackageManager();
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);
@@ -79,7 +78,7 @@ public class LocalTerminalPreferenceControllerTest {
public void onPreferenceChanged_turnOnTerminal() {
mController.onPreferenceChange(null, true);
verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
verify(mPackageManager).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
PackageManager.COMPONENT_ENABLED_STATE_ENABLED, 0);
}
@@ -87,13 +86,13 @@ public class LocalTerminalPreferenceControllerTest {
public void onPreferenceChanged_turnOffTerminal() {
mController.onPreferenceChange(null, false);
verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
verify(mPackageManager).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
}
@Test
public void updateState_preferenceShouldBeChecked() {
when(mPackageManagerWrapper.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn(
when(mPackageManager.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn(
PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
mController.updateState(mPreference);
@@ -102,7 +101,7 @@ public class LocalTerminalPreferenceControllerTest {
@Test
public void updateState_preferenceShouldNotBeChecked() {
when(mPackageManagerWrapper.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn(
when(mPackageManager.getApplicationEnabledSetting(TERMINAL_APP_PACKAGE)).thenReturn(
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
mController.updateState(mPreference);
@@ -113,7 +112,7 @@ public class LocalTerminalPreferenceControllerTest {
public void onDeveloperOptionsSwitchDisabled_shouldDisablePreference() {
mController.onDeveloperOptionsSwitchDisabled();
verify(mPackageManagerWrapper).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
verify(mPackageManager).setApplicationEnabledSetting(TERMINAL_APP_PACKAGE,
PackageManager.COMPONENT_ENABLED_STATE_DEFAULT, 0);
verify(mPreference).setChecked(false);
verify(mPreference).setEnabled(false);

3
tests/robotests/src/com/android/settings/development/MockLocationAppPreferenceControllerTest.java
View File

@@ -21,7 +21,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -41,7 +40,7 @@ public class MockLocationAppPreferenceControllerTest {
@Mock
private AppOpsManager mAppOpsManager;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
@Mock
private Preference mPreference;
@Mock

6
tests/robotests/src/com/android/settings/development/SelectDebugAppPreferenceControllerTest.java
View File

@@ -27,13 +27,13 @@ import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.provider.Settings;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -53,7 +53,7 @@ public class SelectDebugAppPreferenceControllerTest {
@Mock
private DevelopmentSettingsDashboardFragment mFragment;
@Mock
private PackageManagerWrapper mPackageManagerWrapper;
private PackageManager mPackageManager;
private Context mContext;
private SelectDebugAppPreferenceController mController;
@@ -64,7 +64,7 @@ public class SelectDebugAppPreferenceControllerTest {
mContext = RuntimeEnvironment.application;
mController = spy(new SelectDebugAppPreferenceController(mContext, mFragment));
ReflectionHelpers
.setField(mController, "mPackageManager" /* field name */, mPackageManagerWrapper);
.setField(mController, "mPackageManager" /* field name */, mPackageManager);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey()))
.thenReturn(mPreference);
mController.displayPreference(mPreferenceScreen);

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

@@ -26,6 +26,7 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.provider.Settings;
import android.provider.Settings.Global;
@@ -34,7 +35,6 @@ import androidx.preference.PreferenceScreen;
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;
@@ -51,7 +51,7 @@ import java.util.List;
public class VerifyAppsOverUsbPreferenceControllerTest {
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
@Mock
private PreferenceScreen mScreen;
@Mock

5
tests/robotests/src/com/android/settings/development/WebViewAppPreferenceControllerTest.java
View File

@@ -21,6 +21,8 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.pm.PackageManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -28,7 +30,6 @@ import com.android.settings.R;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.webview.WebViewUpdateServiceWrapper;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -44,7 +45,7 @@ public class WebViewAppPreferenceControllerTest {
@Mock
private PreferenceScreen mPreferenceScreen;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
@Mock
private WebViewUpdateServiceWrapper mWebViewUpdateServiceWrapper;
@Mock