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

Merge changes I8dcc30b0,I85292ad2,Ie0ab3534

Browse Source 
am: ffec1a0c68

Change-Id: Ibac8d021d8d65fdab91f682b9fbfc0231a61a93f
This commit is contained in:
Andreas Gampe
2018-02-26 22:08:50 +00:00
committed by android-build-merger
parent 6b24cc5769 ffec1a0c68
commit 8d0a8ed985
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,6 +38,7 @@ import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner; import com.android.settings.testutils.SettingsRobolectricTestRunner;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Answers; import org.mockito.Answers;
@@ -84,6 +85,7 @@ public class PictureInPictureSettingsTest {
when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers); when(mUserManager.getProfiles(anyInt())).thenReturn(mUsers);
} }
@Ignore("b/73892555")
@Test @Test
public void testCollectPipApps() { public void testCollectPipApps() {
PackageInfo primaryP1 = createPackage("Calculator", true); PackageInfo primaryP1 = createPackage("Calculator", true);
@@ -97,10 +99,11 @@ public class PictureInPictureSettingsTest {
mProfileUserPackages.add(profileP2); mProfileUserPackages.add(profileP2);
ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID); ArrayList<Pair<ApplicationInfo, Integer>> apps = mFragment.collectPipApps(PRIMARY_USER_ID);
assertThat(containsPackages(apps, primaryP1, profileP2)); assertThat(containsPackages(apps, primaryP1, profileP2)).isTrue();
assertThat(!containsPackages(apps, primaryP2, profileP1)); 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);
@@ -119,7 +122,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)); assertThat(isOrdered(apps, primaryP1, profileP1, primaryP2, profileP2)).isTrue();
} }
private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps, private boolean containsPackages(ArrayList<Pair<ApplicationInfo, Integer>> apps,