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

Commit 7c39c885 authored by Kevin Liu's avatar Kevin Liu Committed by Android (Google) Code Review
Browse files

Merge "Update ShadowApplication.getInstance() usage" into main

parents b112050d 679978de
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;

import android.app.Application;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
@@ -35,6 +37,7 @@ import android.provider.Settings;

import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;

import com.android.settingslib.RestrictedSwitchPreference;

@@ -68,7 +71,8 @@ public class EnableAdbPreferenceControllerTest {
    @Before
    public void setUp() throws Exception {
        MockitoAnnotations.initMocks(this);
        ShadowApplication shadowContext = ShadowApplication.getInstance();
        ShadowApplication shadowContext =
                shadowOf((Application) ApplicationProvider.getApplicationContext());
        shadowContext.setSystemService(Context.USER_SERVICE, mUserManager);
        mContext = spy(RuntimeEnvironment.application);
        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+6 −1
Original line number Diff line number Diff line
@@ -34,7 +34,9 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;

import android.app.Application;
import android.app.AutomaticZenRule;
import android.app.NotificationManager;
import android.app.NotificationManager.Policy;
@@ -47,6 +49,8 @@ import android.service.notification.ZenDeviceEffects;
import android.service.notification.ZenModeConfig;
import android.service.notification.ZenPolicy;

import androidx.test.core.app.ApplicationProvider;

import com.google.common.collect.ImmutableMap;

import org.junit.Before;
@@ -142,7 +146,8 @@ public class ZenModesBackendTest {
    @Before
    public void setup() {
        MockitoAnnotations.initMocks(this);
        ShadowApplication shadowApplication = ShadowApplication.getInstance();
        ShadowApplication shadowApplication =
                shadowOf((Application) ApplicationProvider.getApplicationContext());
        shadowApplication.setSystemService(Context.NOTIFICATION_SERVICE, mNm);

        mContext = RuntimeEnvironment.application;