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

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
View File

@@ -24,12 +24,12 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -50,7 +50,7 @@ public class DefaultAutofillPickerTest {
@Mock
private UserManager mUserManager;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private DefaultAutofillPicker mPicker;
@Before

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
View File

@@ -23,6 +23,7 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
import android.provider.Settings;
import androidx.preference.Preference;
@@ -30,7 +31,6 @@ import android.view.autofill.AutofillManager;
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;
@@ -49,7 +49,7 @@ public class DefaultAutofillPreferenceControllerTest {
@Mock
private UserManager mUserManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
@Mock
private AutofillManager mAutofillManager;

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPickerTest.java
View File

@@ -23,10 +23,10 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -46,7 +46,7 @@ public class DefaultBrowserPickerTest {
@Mock
private UserManager mUserManager;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private DefaultBrowserPicker mPicker;

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultBrowserPreferenceControllerTest.java
View File

@@ -25,13 +25,13 @@ 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.os.UserManager;
import androidx.preference.Preference;
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;
@@ -51,7 +51,7 @@ public class DefaultBrowserPreferenceControllerTest {
@Mock
private UserManager mUserManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private DefaultBrowserPreferenceController mController;

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultEmergencyPickerTest.java
View File

@@ -23,11 +23,11 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
import android.provider.Settings;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -48,7 +48,7 @@ public class DefaultEmergencyPickerTest {
@Mock
private UserManager mUserManager;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private DefaultEmergencyPicker mPicker;

12
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePickerTest.java
View File

@@ -43,7 +43,6 @@ import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -67,8 +66,6 @@ public class DefaultHomePickerTest {
@Mock
private UserManager mUserManager;
@Mock
private PackageManagerWrapper mPackageManagerWrapper;
@Mock
private PackageManager mPackageManager;
private Context mContext;
@@ -78,12 +75,11 @@ public class DefaultHomePickerTest {
public void setUp() {
MockitoAnnotations.initMocks(this);
when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
when(mPackageManagerWrapper.getPackageManager()).thenReturn(mPackageManager);
mPicker = spy(new DefaultHomePicker());
mPicker.onAttach((Context) mActivity);
ReflectionHelpers.setField(mPicker, "mPm", mPackageManagerWrapper);
ReflectionHelpers.setField(mPicker, "mPm", mPackageManager);
mContext = spy(RuntimeEnvironment.application);
doReturn(mContext).when(mPicker).getContext();
}
@@ -92,7 +88,7 @@ public class DefaultHomePickerTest {
public void setDefaultAppKey_shouldUpdateDefault() {
assertThat(mPicker.setDefaultKey(TEST_APP_KEY)).isTrue();
verify(mPackageManagerWrapper).replacePreferredActivity(any(IntentFilter.class),
verify(mPackageManager).replacePreferredActivity(any(IntentFilter.class),
anyInt(), any(ComponentName[].class), any(ComponentName.class));
verify(mContext).startActivity(any());
}
@@ -100,7 +96,7 @@ public class DefaultHomePickerTest {
@Test
public void getDefaultAppKey_shouldReturnDefault() {
final ComponentName cn = mock(ComponentName.class);
when(mPackageManagerWrapper.getHomeActivities(anyList())).thenReturn(cn);
when(mPackageManager.getHomeActivities(anyList())).thenReturn(cn);
mPicker.getDefaultKey();
verify(cn).flattenToString();
}
@@ -158,6 +154,6 @@ public class DefaultHomePickerTest {
"package.2", "PreLollipopLauncher", Build.VERSION_CODES.KITKAT));
return null;
})
.when(mPackageManagerWrapper).getHomeActivities(anyList());
.when(mPackageManager).getHomeActivities(anyList());
}
}

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultHomePreferenceControllerTest.java
View File

@@ -29,12 +29,12 @@ import static org.mockito.Mockito.when;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.os.UserManager;
import androidx.preference.Preference;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -55,7 +55,7 @@ public class DefaultHomePreferenceControllerTest {
@Mock
private UserManager mUserManager;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private Context mContext;
private DefaultHomePreferenceController mController;

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultPhonePickerTest.java
View File

@@ -26,10 +26,10 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -52,7 +52,7 @@ public class DefaultPhonePickerTest {
@Mock
private DefaultPhonePicker.DefaultKeyUpdater mDefaultKeyUpdater;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private DefaultPhonePicker mPicker;

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultSmsPickerTest.java
View File

@@ -25,10 +25,10 @@ import static org.mockito.Mockito.when;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.UserManager;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.wrapper.PackageManagerWrapper;
import org.junit.Before;
import org.junit.Test;
@@ -51,7 +51,7 @@ public class DefaultSmsPickerTest {
@Mock
private DefaultSmsPicker.DefaultKeyUpdater mDefaultKeyUpdater;
@Mock
private PackageManagerWrapper mPackageManager;
private PackageManager mPackageManager;
private DefaultSmsPicker mPicker;