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

Fix PictureInPictureSettingsTest.

Browse Source 
Bug: 73892555
Bug: 73892683
Test: m RunSettingsRoboTests
Change-Id: Id4145600240f12c2cc2f5aed978a1fe65fd1fd74
This commit is contained in:
Tracy Zhou
2018-02-26 14:13:53 -08:00
parent c3bc3bc690
commit 220b6e2331
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/robotests/src/com/android/settings/applications/appinfo/PictureInPictureSettingsTest.java
View File

@@ -34,6 +34,8 @@ import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.wrapper.UserManagerWrapper; import com.android.settings.wrapper.UserManagerWrapper;
import com.android.settingslib.wrapper.PackageManagerWrapper; import com.android.settingslib.wrapper.PackageManagerWrapper;
import com.google.common.collect.ImmutableList;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
@@ -60,7 +62,6 @@ public class PictureInPictureSettingsTest {
private UserManagerWrapper mUserManager; private UserManagerWrapper mUserManager;
private ArrayList<PackageInfo> mPrimaryUserPackages; private ArrayList<PackageInfo> mPrimaryUserPackages;
private ArrayList<PackageInfo> mProfileUserPackages; private ArrayList<PackageInfo> mProfileUserPackages;
private ArrayList<UserInfo> mUsers;
@Before @Before
public void setUp() { public void setUp() {
@@ -69,15 +70,20 @@ public class PictureInPictureSettingsTest {
mFragment = new PictureInPictureSettings(mPackageManager, mUserManager); mFragment = new PictureInPictureSettings(mPackageManager, mUserManager);
mPrimaryUserPackages = new ArrayList<>(); mPrimaryUserPackages = new ArrayList<>();
mProfileUserPackages = new ArrayList<>(); mProfileUserPackages = new ArrayList<>();
mUsers = new ArrayList<>();
when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PRIMARY_USER_ID))) when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PRIMARY_USER_ID)))
.thenReturn(mPrimaryUserPackages); .thenReturn(mPrimaryUserPackages);
when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PROFILE_USER_ID))) when(mPackageManager.getInstalledPackagesAsUser(anyInt(), eq(PROFILE_USER_ID)))
.thenReturn(mProfileUserPackages); .thenReturn(mProfileUserPackages);
when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers);
UserInfo primaryUserInfo = new UserInfo();
primaryUserInfo.id = PRIMARY_USER_ID;
UserInfo profileUserInfo = new UserInfo();
profileUserInfo.id = PROFILE_USER_ID;
when(mUserManager.getProfiles(PRIMARY_USER_ID)).thenReturn(
ImmutableList.of(primaryUserInfo, profileUserInfo));
} }
@Ignore("b/73892555")
@Test @Test
public void testCollectPipApps() { public void testCollectPipApps() {
PackageInfo primaryP1 = createPackage("Calculator", true); PackageInfo primaryP1 = createPackage("Calculator", true);
@@ -95,7 +101,6 @@ public class PictureInPictureSettingsTest {
assertThat(containsPackages(apps, primaryP2, profileP1)).isFalse(); assertThat(containsPackages(apps, primaryP2, profileP1)).isFalse();
} }
@Ignore("b/73892683")
@Test @Test
public void testAppSort() { public void testAppSort() {
PackageInfo primaryP1 = createPackage("Android", true); PackageInfo primaryP1 = createPackage("Android", true);
@@ -114,7 +119,7 @@ public class PictureInPictureSettingsTest {
ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID); ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
Collections.sort(apps, new PictureInPictureSettings.AppComparator(null)); Collections.sort(apps, new PictureInPictureSettings.AppComparator(null));
assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2)).isTrue(); assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2, primaryP3)).isTrue();
} }
private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps, private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,