Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffec1a0c authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I8dcc30b0,I85292ad2,Ie0ab3534 

* changes:
  Settings: Disable failing test
  Settings: Disable failing test
  Settings: Fix assertThat in tests
parents 727ec42d 81231353

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

+6 −3
Original line number Original line Diff line number Diff line
@@ -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,