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

Commit 35de64a6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix broken tests"

parents 86135591 7be195f1

tests/robotests/src/com/android/settings/dashboard/profileselector/ProfileSelectDialogTest.java

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ import org.robolectric.RobolectricTestRunner; 
@Ignore

public class ProfileSelectDialogTest {



    private static final UserHandle NORMAL_USER = UserHandle.of(1111);

    private static final UserHandle REMOVED_USER = UserHandle.of(2222);

    private static final UserHandle NORMAL_USER = new UserHandle(1111);

    private static final UserHandle REMOVED_USER = new UserHandle(2222);



    @Mock

    private Context mContext;

tests/robotests/src/com/android/settings/enterprise/ActionDisabledByAdminDialogHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ public class ActionDisabledByAdminDialogHelperTest { 
            new ComponentName("some.package.name", "some.package.name.SomeClass");

    private static final int USER_ID = 123;

    private static final EnforcedAdmin ENFORCED_ADMIN =

            new EnforcedAdmin(ADMIN_COMPONENT, UserHandle.of(USER_ID));

            new EnforcedAdmin(ADMIN_COMPONENT, new UserHandle(USER_ID));

    private ActionDisabledByAdminDialogHelper mHelper;

    private Activity mActivity;

    private org.robolectric.shadows.ShadowActivity mActivityShadow;