PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Re-enable ignored tests" into rvc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-03-24 12:22:11 +00:00
committed by Android (Google) Code Review
parent 7afced3599 cefef920de
commit 87c0179c01
2 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R; import com.android.settings.R;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -48,7 +47,6 @@ public class InteractAcrossProfilesDetailsTest {
private final InteractAcrossProfilesDetails mFragment = new InteractAcrossProfilesDetails(); private final InteractAcrossProfilesDetails mFragment = new InteractAcrossProfilesDetails();
@Test @Test
@Ignore
public void getPreferenceSummary_appOpAllowed_returnsAllowed() { public void getPreferenceSummary_appOpAllowed_returnsAllowed() {
String appOp = AppOpsManager.permissionToOp(INTERACT_ACROSS_PROFILES_PERMISSION); String appOp = AppOpsManager.permissionToOp(INTERACT_ACROSS_PROFILES_PERMISSION);
shadowOf(mAppOpsManager).setMode( shadowOf(mAppOpsManager).setMode(
@@ -61,7 +59,6 @@ public class InteractAcrossProfilesDetailsTest {
} }
@Test @Test
@Ignore
public void getPreferenceSummary_appOpNotAllowed_returnsNotAllowed() { public void getPreferenceSummary_appOpNotAllowed_returnsNotAllowed() {
String appOp = AppOpsManager.permissionToOp(INTERACT_ACROSS_PROFILES_PERMISSION); String appOp = AppOpsManager.permissionToOp(INTERACT_ACROSS_PROFILES_PERMISSION);
shadowOf(mAppOpsManager).setMode( shadowOf(mAppOpsManager).setMode(

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

@@ -34,7 +34,6 @@ import androidx.test.core.app.ApplicationProvider;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
@@ -129,7 +128,6 @@ public class InteractAcrossProfilesSettingsTest {
} }
@Test @Test
@Ignore
public void getNumberOfEnabledApps_returnsNumberOfEnabledApps() { public void getNumberOfEnabledApps_returnsNumberOfEnabledApps() {
shadowOf(mUserManager).addUser( shadowOf(mUserManager).addUser(
PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */); PERSONAL_PROFILE_ID, "personal-profile"/* name */, 0/* flags */);
@@ -144,7 +142,7 @@ public class InteractAcrossProfilesSettingsTest {
shadowOf(mAppOpsManager).setMode( shadowOf(mAppOpsManager).setMode(
appOp, PACKAGE_UID, PERSONAL_CROSS_PROFILE_PACKAGE, AppOpsManager.MODE_ALLOWED); appOp, PACKAGE_UID, PERSONAL_CROSS_PROFILE_PACKAGE, AppOpsManager.MODE_ALLOWED);
shadowOf(mAppOpsManager).setMode( 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()); shadowOf(mPackageManager).addPermissionInfo(createCrossProfilesPermissionInfo());
int numOfApps = mFragment.getNumberOfEnabledApps( int numOfApps = mFragment.getNumberOfEnabledApps(