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

Commit 2c631fcd authored by josephpv's avatar josephpv
Browse files

canAddPrivateProfile checks for private space creation test 

Bug: 332854426
Test: atest PrivateSpaceMaintainerTest, atest PrivateSpaceDeletionProgressFragmentTest
Change-Id: I50ddd15f53e14b54a2d8df201b94f8423eec3d72
parent 727ec973

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

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settings.privatespace; 


import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assume.assumeTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.spy;
@@ -27,6 +28,7 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.content.Intent;

import android.os.Flags;

import android.os.UserManager;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;
@@ -91,6 +93,7 @@ public class PrivateSpaceAuthenticationActivityTest { 
    @RequiresFlagsEnabled({Flags.FLAG_ALLOW_PRIVATE_PROFILE,

            android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES})

    public void whenPrivateProfileDoesNotExist_triggersSetupFlow() {

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        when(mPrivateSpaceMaintainer.doesPrivateSpaceExist()).thenReturn(false);



        final ArgumentCaptor<Intent> intentCaptor = ArgumentCaptor.forClass(Intent.class);

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

+12 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ public class PrivateSpaceMaintainerTest { 
    public void deletePrivateSpace_psExists_deletesPS() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -112,6 +113,7 @@ public class PrivateSpaceMaintainerTest { 
    public void createPrivateSpace_psDoesNotExist_createsPS() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.deletePrivateSpace();
@@ -127,6 +129,7 @@ public class PrivateSpaceMaintainerTest { 
    public void createPrivateSpace_psExists_returnsFalse() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.deletePrivateSpace();
@@ -143,6 +146,7 @@ public class PrivateSpaceMaintainerTest { 
    public void createPrivateSpace_psDoesNotExist_resetsHidePSSettings() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        Settings.Secure.putInt(
@@ -166,6 +170,7 @@ public class PrivateSpaceMaintainerTest { 
                Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PS_SENSITIVE_NOTIFICATIONS_TOGGLE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.deletePrivateSpace();
@@ -183,6 +188,7 @@ public class PrivateSpaceMaintainerTest { 
    public void createPrivateSpace_psExists_doesNotResetHidePSSettings() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -204,6 +210,7 @@ public class PrivateSpaceMaintainerTest { 
    public void lockPrivateSpace_psExistsAndPrivateProfileRunning_locksCreatedPrivateSpace() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -222,6 +229,7 @@ public class PrivateSpaceMaintainerTest { 
    public void lockPrivateSpace_psExistsAndPrivateProfileNotRunning_returnsFalse() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -258,6 +266,7 @@ public class PrivateSpaceMaintainerTest { 
    public void createPrivateSpace_psDoesNotExist_setsUserSetupComplete() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -272,6 +281,7 @@ public class PrivateSpaceMaintainerTest { 
    public void createPrivateSpace_pSExists_doesNotChangeUserSetupSetting() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -290,6 +300,7 @@ public class PrivateSpaceMaintainerTest { 
                Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        final int autoLockOption = 2;

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);
@@ -314,6 +325,7 @@ public class PrivateSpaceMaintainerTest { 
                Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_SUPPORT_AUTOLOCK_FOR_PRIVATE_SPACE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());

        final int privateSpaceAutLockValue = 1;

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

tests/unit/src/com/android/settings/privatespace/delete/PrivateSpaceDeletionProgressFragmentTest.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.android.settings.privatespace.PrivateSpaceMaintainer.ErrorDele 


import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assume.assumeTrue;

import static org.mockito.Mockito.doNothing;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;
@@ -28,6 +29,7 @@ import static org.mockito.Mockito.verify; 
import android.app.settings.SettingsEnums;

import android.content.Context;

import android.os.Flags;

import android.os.UserManager;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.annotation.UiThreadTest;
@@ -90,6 +92,7 @@ public class PrivateSpaceDeletionProgressFragmentTest { 
        doNothing().when(spyFragment).showSuccessfulDeletionToast();

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());



        mPrivateSpaceMaintainer.createPrivateSpace();

        spyFragment.deletePrivateSpace();
@@ -104,6 +107,7 @@ public class PrivateSpaceDeletionProgressFragmentTest { 
        doNothing().when(spyFragment).showSuccessfulDeletionToast();

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());



        mPrivateSpaceMaintainer.createPrivateSpace();

        spyFragment.deletePrivateSpace();
@@ -128,6 +132,7 @@ public class PrivateSpaceDeletionProgressFragmentTest { 
        doNothing().when(spyFragment).showDeletionInternalErrorToast();

        mSetFlagsRule.enableFlags(Flags.FLAG_ALLOW_PRIVATE_PROFILE,

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        assumeTrue(mContext.getSystemService(UserManager.class).canAddPrivateProfile());



        spyFragment.deletePrivateSpace();