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

Commit ed3f4c9d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Re-enable ignored tests" into rvc-dev am: 87c0179c am: 875b0df3 

Change-Id: I79a8ebd1fd0fe103749fdbc7047b6ce9c7202b4a
parents ffc010f5 875b0df3

tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import androidx.test.core.app.ApplicationProvider; 


import com.android.settings.R;



import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;
@@ -48,7 +47,6 @@ public class InteractAcrossProfilesDetailsTest { 
    private final InteractAcrossProfilesDetails mFragment = new InteractAcrossProfilesDetails();



    @Test

    @Ignore

    public void getPreferenceSummary_appOpAllowed_returnsAllowed() {

        String appOp = AppOpsManager.permissionToOp(INTERACT_ACROSS_PROFILES_PERMISSION);

        shadowOf(mAppOpsManager).setMode(
@@ -61,7 +59,6 @@ public class InteractAcrossProfilesDetailsTest { 
    }



    @Test

    @Ignore

    public void getPreferenceSummary_appOpNotAllowed_returnsNotAllowed() {

        String appOp = AppOpsManager.permissionToOp(INTERACT_ACROSS_PROFILES_PERMISSION);

        shadowOf(mAppOpsManager).setMode(

tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java

+1 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import androidx.test.core.app.ApplicationProvider; 


import com.google.common.collect.ImmutableList;



import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;
@@ -129,7 +128,6 @@ public class InteractAcrossProfilesSettingsTest { 
    }



    @Test

    @Ignore

    public void getNumberOfEnabledApps_returnsNumberOfEnabledApps() {

        shadowOf(mUserManager).addUser(

                PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */);
@@ -144,7 +142,7 @@ public class InteractAcrossProfilesSettingsTest { 
        shadowOf(mAppOpsManager).setMode(

                appOp, PACKAGE_UID, PERSONAL_CROSS_PROFILE_PACKAGE, AppOpsManager.MODE_ALLOWED);

        shadowOf(mAppOpsManager).setMode(

                appOp, PACKAGE_UID, PERSONAL_CROSS_PROFILE_PACKAGE, AppOpsManager.MODE_IGNORED);

                appOp, PACKAGE_UID, PERSONAL_NON_CROSS_PROFILE_PACKAGE, AppOpsManager.MODE_IGNORED);

        shadowOf(mPackageManager).addPermissionInfo(createCrossProfilesPermissionInfo());



        int numOfApps = mFragment.getNumberOfEnabledApps(