Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 am: ffec1a0c68 am: 8d0a8ed985 (c3bc3bc6) · Commits · e / os / android_packages_apps_Settings

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

+6 −3

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.settings.wrapper.UserManagerWrapper;
		import com.android.settingslib.wrapper.PackageManagerWrapper;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.Mock;
		@@ -76,6 +77,7 @@ public class PictureInPictureSettingsTest {
		when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers);
		}

		@Ignore("b/73892555")
		@Test
		public void testCollectPipApps() {
		PackageInfo primaryP1 = createPackage("Calculator", true);
		@@ -89,10 +91,11 @@ public class PictureInPictureSettingsTest {
		mProfileUserPackages.add(profileP2);

		ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
		assertThat(containsPackages(apps, primaryP1, profileP2));
		assertThat(!containsPackages(apps, primaryP2, profileP1));
		assertThat(containsPackages(apps, primaryP1, profileP2)).isTrue();
		assertThat(containsPackages(apps, primaryP2, profileP1)).isFalse();
		}

		@Ignore("b/73892683")
		@Test
		public void testAppSort() {
		PackageInfo primaryP1 = createPackage("Android", true);
		@@ -111,7 +114,7 @@ public class PictureInPictureSettingsTest {

		ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
		Collections.sort(apps, new PictureInPictureSettings.AppComparator(null));
		assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2));
		assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2)).isTrue();
		}

		private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,