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

Commit b4e6f205 authored by Olivier Nshimiye's avatar Olivier Nshimiye
Browse files

Add Private Space features flag check to Settings tests 

Adding this flag check since we are putting all the implementations of Private Space features behind this flag.

Bug: 326060689
Test: Run presubmits and verify that nothing breaks
Change-Id: I2c0e9a1afc3787232425f79d06d4aeba001283ec
parent 0f3799cb

tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectFragmentTest.java

+12 −6
Original line number Diff line number Diff line
@@ -170,7 +170,8 @@ public class ProfileSelectFragmentTest { 


    @Test

    public void getTabId_setPrivateId_getCorrectTab() {

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        final Bundle bundle = new Bundle();

        bundle.putInt(EXTRA_USER_ID, 11);

        mUserManager.setPrivateProfile(11, "private", 0);
@@ -200,7 +201,8 @@ public class ProfileSelectFragmentTest { 


    @Test

    public void testGetFragments_whenOnlyPersonal_returnsOneFragment() {

        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mUserManager.addProfile(

                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));

        Fragment[] fragments = ProfileSelectFragment.getFragments(
@@ -235,7 +237,8 @@ public class ProfileSelectFragmentTest { 


    @Test

    public void testGetFragments_whenPrivateEnabled_returnsTwoFragments() {

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mUserManager.addProfile(

                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));

        mUserManager.addProfile(
@@ -257,7 +260,8 @@ public class ProfileSelectFragmentTest { 


    @Test

    public void testGetFragments_whenManagedProfile_returnsTwoFragments() {

        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.disableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mUserManager.addProfile(

                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));

        mUserManager.addProfile(
@@ -279,7 +283,8 @@ public class ProfileSelectFragmentTest { 


    @Test

    public void testGetFragments_whenAllProfiles_returnsThreeFragments() {

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mUserManager.addProfile(

                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));

        mUserManager.addProfile(
@@ -303,7 +308,8 @@ public class ProfileSelectFragmentTest { 


    @Test

    public void testGetFragments_whenAvailableBundle_returnsFragmentsWithCorrectBundles() {

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mUserManager.addProfile(

                new UserInfo(0, PRIMARY_USER_NAME, null, 0, USER_TYPE_FULL_SYSTEM));

        mUserManager.addProfile(

tests/uitests/src/com/android/settings/ui/SecuritySettingsTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ class SecuritySettingsTest { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)

    @RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

            android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES)

    fun privateSpace_ifFlagON() {

        device.assertHasTexts(listOf("Private Space"))

    }

tests/uitests/src/com/android/settings/ui/privatespace/PrivateSpaceAuthenticationActivityTest.kt

+2 −1
Original line number Diff line number Diff line
@@ -38,7 +38,8 @@ import org.junit.runner.RunWith 




@RunWith(AndroidJUnit4::class)

@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE)

@RequiresFlagsEnabled(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

        android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES)

class PrivateSpaceAuthenticationActivityTest {

    private val device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())

tests/unit/src/com/android/settings/biometrics/combination/CombinedBiometricStatusUtilsTest.java

+2 −1
Original line number Diff line number Diff line
@@ -310,7 +310,8 @@ public class CombinedBiometricStatusUtilsTest { 
        when(mFaceManager.hasEnrolledTemplates(anyInt())).thenReturn(false);

        mSetFlagsRule.enableFlags(

                android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);



        assertThat(mCombinedBiometricStatusUtils.getPrivateProfileSettingsClassName())

                .isEqualTo(Settings.PrivateSpaceBiometricSettingsActivity.class.getName());

tests/unit/src/com/android/settings/privatespace/FaceFingerprintUnlockControllerTest.java

+24 −6
Original line number Diff line number Diff line
@@ -75,7 +75,8 @@ public class FaceFingerprintUnlockControllerTest { 
    public void getAvailabilityStatus_whenFlagsEnabled_returnsAvailable() {

        mSetFlagsRule.enableFlags(

                android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);



        assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(true);

    }
@@ -83,18 +84,33 @@ public class FaceFingerprintUnlockControllerTest { 
    /** Tests that the controller is not available when Biometrics flag is not enabled. */

    @Test

    public void getAvailabilityStatus_whenBiometricFlagDisabled_returnsFalse() {

        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mSetFlagsRule.disableFlags(

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);



        assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);

    }



    /** Tests that the controller is not available when private feature flag is not enabled. */

    /**

     * Tests that the controller is not available when the main private space flag is not

     * enabled.

     */

    @Test

    public void getAvailabilityStatus_whenPrivateFlagDisabled_returnsFalse() {

    public void getAvailabilityStatus_whenPsMainFlagDisabled_returnsFalse() {

        mSetFlagsRule.disableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE);

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);



        assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);

    }



    /** Tests that the controller is not available when private features flag is not enabled. */

    @Test

    public void getAvailabilityStatus_whenPsFeaturesFlagDisabled_returnsFalse() {

        mSetFlagsRule.disableFlags(android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        mSetFlagsRule.enableFlags(android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);



        assertThat(mFaceFingerprintUnlockController.isAvailable()).isEqualTo(false);
@@ -106,7 +122,8 @@ public class FaceFingerprintUnlockControllerTest { 
        doReturn(false).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());

        mSetFlagsRule.enableFlags(

                android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);



        mFaceFingerprintUnlockController.updateState(mPreference);

        assertThat(mPreference.isEnabled()).isFalse();
@@ -119,7 +136,8 @@ public class FaceFingerprintUnlockControllerTest { 
        doReturn(true).when(mLockPatternUtils).isSeparateProfileChallengeEnabled(anyInt());

        mSetFlagsRule.enableFlags(

                android.os.Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE);

                android.multiuser.Flags.FLAG_ENABLE_BIOMETRICS_TO_UNLOCK_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);



        mFaceFingerprintUnlockController.updateState(mPreference);

        assertThat(mPreference.isEnabled()).isTrue();