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

Commit d3b6644b authored by Olivier Nshimiye's avatar Olivier Nshimiye Committed by Android (Google) Code Review
Browse files

Merge "Fix ShortcutManagerTest1 tests" into main

parents 8b7a2209 bdc768c6
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import android.app.usage.UsageStatsManagerInternal;
import android.content.ActivityNotFoundException;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
import android.content.IIntentSender;
import android.content.Intent;
@@ -273,6 +274,11 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
        public String getPackageName() {
            return SYSTEM_PACKAGE_NAME;
        }

        @Override
        public ContentResolver getContentResolver() {
            return mContentResolver;
        }
    }

    /** ShortcutService with injection override methods. */
@@ -665,6 +671,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {

    protected ServiceContext mServiceContext;
    protected ClientContext mClientContext;
    protected ContentResolver mContentResolver;

    protected ShortcutServiceTestable mService;
    protected ShortcutManagerTestable mManager;
@@ -861,6 +868,7 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {

        mServiceContext = spy(new ServiceContext());
        mClientContext = new ClientContext();
        mContentResolver = mock(ContentResolver.class);

        mMockPackageManager = mock(PackageManager.class);
        mMockPackageManagerInternal = mock(PackageManagerInternal.class);
@@ -982,6 +990,8 @@ public abstract class BaseShortcutManagerTest extends InstrumentationTestCase {
                    }
                    return userProperties;
                });
        when(mMockUserManagerInternal.getUserInfos()).thenReturn(
                mUserInfos.values().toArray(new UserInfo[0]));

        // User 0 and P0 are always running
        mRunningUsers.put(USER_0, true);