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

Commit 727ec973 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge "Fix for test failure in PrivateSpaceMaintainerTest" into main

parents 4e32375f 1108e206

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

+22 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ public class PrivateSpaceMaintainerTest { 
    /** Tests that {@link PrivateSpaceMaintainer#deletePrivateSpace()} deletes PS when PS exists. */

    @Test

    public void deletePrivateSpace_psExists_deletesPS() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -94,6 +96,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void deletePrivateSpace_psDoesNotExist_returnsNoPSError() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        ErrorDeletingPrivateSpace errorDeletingPrivateSpace =
@@ -106,6 +110,8 @@ public class PrivateSpaceMaintainerTest { 
    /** Tests that {@link PrivateSpaceMaintainer#createPrivateSpace()} when PS exists creates PS. */

    @Test

    public void createPrivateSpace_psDoesNotExist_createsPS() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.deletePrivateSpace();
@@ -119,6 +125,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void createPrivateSpace_psExists_returnsFalse() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.deletePrivateSpace();
@@ -133,6 +141,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void createPrivateSpace_psDoesNotExist_resetsHidePSSettings() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        Settings.Secure.putInt(
@@ -171,6 +181,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void createPrivateSpace_psExists_doesNotResetHidePSSettings() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -190,6 +202,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void lockPrivateSpace_psExistsAndPrivateProfileRunning_locksCreatedPrivateSpace() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -206,6 +220,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void lockPrivateSpace_psExistsAndPrivateProfileNotRunning_returnsFalse() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -226,6 +242,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void lockPrivateSpace_psDoesNotExist_returnsFalse() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        assertThat(privateSpaceMaintainer.doesPrivateSpaceExist()).isFalse();
@@ -238,6 +256,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void createPrivateSpace_psDoesNotExist_setsUserSetupComplete() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();
@@ -250,6 +270,8 @@ public class PrivateSpaceMaintainerTest { 
     */

    @Test

    public void createPrivateSpace_pSExists_doesNotChangeUserSetupSetting() {

        mSetFlagsRule.enableFlags(

                android.multiuser.Flags.FLAG_ENABLE_PRIVATE_SPACE_FEATURES);

        PrivateSpaceMaintainer privateSpaceMaintainer =

                PrivateSpaceMaintainer.getInstance(mContext);

        privateSpaceMaintainer.createPrivateSpace();