From cefef920de91b60c01b38ab4deed9fec149ba593 Mon Sep 17 00:00:00 2001 From: kholoud mohamed Date: Thu, 19 Mar 2020 15:19:38 +0000 Subject: [PATCH] Re-enable ignored tests Also fix issue in one test. Fixes: 151572330 Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest Change-Id: I335b19223e39e19b04d719785aa08800237798cd --- .../InteractAcrossProfilesDetailsTest.java | 3 --- .../InteractAcrossProfilesSettingsTest.java | 4 +--- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java index 3b6b3acb209..9e48b9ea3bb 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetailsTest.java @@ -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( diff --git a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java index 85980cb268c..19ea50b6572 100644 --- a/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java +++ b/tests/robotests/src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesSettingsTest.java @@ -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(