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

Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c

Browse Source 
Change-Id: Icb842b19dba816ca4566e8af900adbbc5527061c
This commit is contained in:
TreeHugger Robot
2020-04-28 03:35:31 +00:00
committed by Automerger Merge Worker
parent 01f33c6c37 6471bef55c
commit 0009d317fa
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.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.content.pm.UserInfo;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.provider.Settings; import android.provider.Settings;
@@ -25,7 +26,6 @@ import com.android.settings.testutils.shadow.ShadowUtils;
import org.junit.After; import org.junit.After;
import org.junit.Assert; import org.junit.Assert;
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;
@@ -103,12 +103,13 @@ public class RedactionInterstitialTest {
} }
@Test @Test
@Ignore
public void managedProfileNoRestrictionsTest() { public void managedProfileNoRestrictionsTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */); setupSettings(1 /* show */, 1 /* showUnredacted */);
final ShadowUserManager sum = final ShadowUserManager sum =
Shadow.extract(RuntimeEnvironment.application.getSystemService(UserManager.class)); Shadow.extract(RuntimeEnvironment.application.getSystemService(UserManager.class));
sum.setManagedProfile(true); sum.addProfile(
UserHandle.myUserId(), UserHandle.myUserId(),
"work-profile"/* profileName */, UserInfo.FLAG_MANAGED_PROFILE);
setupActivity(); setupActivity();
assertHideAllVisible(false); assertHideAllVisible(false);
@@ -117,12 +118,13 @@ public class RedactionInterstitialTest {
} }
@Test @Test
@Ignore
public void managedProfileUnredactedRestrictionTest() { public void managedProfileUnredactedRestrictionTest() {
setupSettings(1 /* show */, 1 /* showUnredacted */); setupSettings(1 /* show */, 1 /* showUnredacted */);
final ShadowUserManager sum = final ShadowUserManager sum =
Shadow.extract(RuntimeEnvironment.application.getSystemService(UserManager.class)); 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( ShadowRestrictedLockUtilsInternal.setKeyguardDisabledFeatures(
KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS); KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS);
setupActivity(); setupActivity();