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

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);