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

Fix broken tests in RedactionInterstitialTest

Browse Source 
correctly set the user as managed profile after the
implementation for ShadowUserManager#isManagedProfile changed.

Fixes: 154567856
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.notification.RedactionInterstitialTest
Change-Id: I14472913391c3986c5f27391023e396b7b64aad3
This commit is contained in:
kholoud mohamed
2020-04-27 15:09:10 +01:00
parent b6bf10ebbc
commit c5b78e072f
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/robotests/src/com/android/settings/notification/RedactionInterstitialTest.java
View File

@@ -11,6 +11,7 @@ import static org.robolectric.Robolectric.buildActivity;
import android.content.ContentResolver;
import android.content.Intent;
import android.content.pm.UserInfo;
import android.os.UserHandle;
import android.os.UserManager;
import android.provider.Settings;
@@ -25,7 +26,6 @@ import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
@@ -103,12 +103,13 @@ public class RedactionInterstitialTest {
}
@Test
@Ignore
public void managedProfileNoRestrictionsTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
final ShadowUserManager sum =
Shadow.extract(RuntimeEnvironment.application.getSystemService(UserManager.class));
sum.setManagedProfile(true);
sum.addProfile(
UserHandle.myUserId(), UserHandle.myUserId(),
"work-profile"/* profileName */, UserInfo.FLAG_MANAGED_PROFILE);
setupActivity();
assertHideAllVisible(false);
@@ -117,12 +118,13 @@ public class RedactionInterstitialTest {
}
@Test
@Ignore
public void managedProfileUnredactedRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */);
final ShadowUserManager sum =
Shadow.extract(RuntimeEnvironment.application.getSystemService(UserManager.class));
sum.setManagedProfile(true);
sum.addProfile(
UserHandle.myUserId(), UserHandle.myUserId(),
"work-profile"/* profileName */, UserInfo.FLAG_MANAGED_PROFILE);
ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
setupActivity();