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

Commit ed474bfc authored by Clara Thomas's avatar Clara Thomas
Browse files

Fix testGetProfileIdsIncludingAlwaysVisible_supervisingProfile for HSUM 

Modifies the test not to rely on the main user, since it may be
UserHandle.NULL on some builds.

Bug: 413580044
Test: atest
FrameworksMockingServicesTests: com.android.server.pm.UserManagerServiceMockedTest
Flag: android.multiuser.allow_supervising_profile
Change-Id: I95c24848bd0dbf1f6677f465728d55cc29cb0c8b
parent 9d43507e

services/tests/mockingservicestests/src/com/android/server/pm/UserManagerServiceMockedTest.java

+11 −8
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ import com.android.server.pm.UserManagerService.BootStrategy; 
import com.android.server.pm.UserManagerService.UserData;

import com.android.server.storage.DeviceStorageMonitorInternal;



import com.google.common.primitives.Ints;

import com.google.common.truth.Expect;



import org.junit.After;
@@ -832,17 +833,19 @@ public final class UserManagerServiceMockedTest { 
    @Test

    @EnableFlags({android.multiuser.Flags.FLAG_ALLOW_SUPERVISING_PROFILE})

    public void testGetProfileIdsIncludingAlwaysVisible_supervisingProfile() {

        assumeTrue(mUms.canAddMoreUsersOfType(USER_TYPE_FULL_SECONDARY));

        UserInfo secondaryUser = mUms.createUserWithThrow("Secondary", USER_TYPE_FULL_SECONDARY, 0);

        UserInfo supervisingProfile = mUms.createUserWithThrow("Supervising",

                USER_TYPE_PROFILE_SUPERVISING, 0);

        int mainUserId = mUms.getMainUserId();

        assertThat(mUmi.getProfileIds(mainUserId, /* enabledOnly */ true,

                /* includeAlwaysVisible */ true)).asList().containsExactly(

                        mainUserId, supervisingProfile.id);

        assertThat(mUmi.getProfileIds(mainUserId, /* enabledOnly */ true,

                /* includeAlwaysVisible */ false)).asList().containsExactly(mainUserId);

        assertThat(mUmi.getProfileIds(supervisingProfile.id, /* enabledOnly */ true,

        assertThat(mUmi.getProfileIds(secondaryUser.id, /* enabledOnly */ true,

                /* includeAlwaysVisible */ true)).asList().containsExactly(

                        mainUserId, supervisingProfile.id);

                        secondaryUser.id, supervisingProfile.id);

        assertThat(mUmi.getProfileIds(secondaryUser.id, /* enabledOnly */ true,

                /* includeAlwaysVisible */ false)).asList().containsExactly(secondaryUser.id);



        assertThat(mUmi.getProfileIds(

                supervisingProfile.id, /* enabledOnly */ true, /* includeAlwaysVisible */ true))

                .asList().containsExactlyElementsIn(Ints.asList(mUms.getUserIds()));

    }



    @Test