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

Commit 2a1051cb authored by Fan Wu's avatar Fan Wu Committed by Android (Google) Code Review
Browse files

Merge "Update custom shadow usage of ShadowActivityManager" into main

parents 889de5bd 1ce7938a

tests/robotests/src/com/android/settings/applications/specialaccess/vrlistener/VrListenerScreenPreferenceControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -23,15 +23,15 @@ import static com.google.common.truth.Truth.assertThat; 


import android.content.Context;



import com.android.settings.testutils.shadow.ShadowActivityManager;

import androidx.test.core.app.ApplicationProvider;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.shadows.ShadowActivityManager;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {
@@ -45,7 +45,7 @@ public class VrListenerScreenPreferenceControllerTest { 


    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mContext = ApplicationProvider.getApplicationContext();

        mController = new VrListenerScreenPreferenceController(mContext, "key");

        mActivityManager = Shadow.extract(mContext.getSystemService(Context.ACTIVITY_SERVICE));

    }

tests/robotests/src/com/android/settings/applications/specialaccess/zenaccess/ZenAccessControllerTest.java

+3 −9
Original line number Diff line number Diff line
@@ -25,23 +25,20 @@ import static org.mockito.Mockito.verify; 
import android.app.NotificationManager;

import android.content.Context;



import androidx.test.core.app.ApplicationProvider;



import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowActivityManager;

import com.android.settings.testutils.shadow.ShadowNotificationManager;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadow.api.Shadow;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = {

        ShadowActivityManager.class,

})

public class ZenAccessControllerTest {



    private static final String TEST_PKG = "com.test.package";
@@ -49,15 +46,12 @@ public class ZenAccessControllerTest { 
    private FakeFeatureFactory mFeatureFactory;

    private Context mContext;

    private ZenAccessController mController;

    private ShadowActivityManager mActivityManager;





    @Before

    public void setUp() {

        mContext = RuntimeEnvironment.application;

        mContext = ApplicationProvider.getApplicationContext();

        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mController = new ZenAccessController(mContext, "key");

        mActivityManager = Shadow.extract(mContext.getSystemService(Context.ACTIVITY_SERVICE));

    }



    @Test

tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java

+9 −7
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ import android.os.UserHandle; 


import androidx.fragment.app.FragmentActivity;

import androidx.loader.app.LoaderManager;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;

import com.android.settings.SettingsActivity;
@@ -53,7 +54,6 @@ import com.android.settings.fuelgauge.batteryusage.BatteryDiffEntry; 
import com.android.settings.fuelgauge.batteryusage.BatteryEntry;

import com.android.settings.fuelgauge.batteryusage.ConvertUtils;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowActivityManager;

import com.android.settings.testutils.shadow.ShadowEntityHeaderController;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.PrimarySwitchPreference;
@@ -65,15 +65,16 @@ import com.android.settingslib.widget.LayoutPreference; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.mockito.stubbing.Answer;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;
@@ -83,10 +84,13 @@ import java.util.concurrent.TimeUnit; 
@Config(

        shadows = {

            ShadowEntityHeaderController.class,

            ShadowActivityManager.class,

            com.android.settings.testutils.shadow.ShadowFragment.class,

        })

public class AdvancedPowerUsageDetailTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private static final String APP_LABEL = "app label";

    private static final String SUMMARY = "summary";

    private static final String[] PACKAGE_NAME = {"com.android.app"};
@@ -125,9 +129,7 @@ public class AdvancedPowerUsageDetailTest { 


    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mContext = spy(RuntimeEnvironment.application);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getPackageName()).thenReturn("foo");

        mFeatureFactory = FakeFeatureFactory.setupForTest();

        mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;

tests/robotests/src/com/android/settings/fuelgauge/PowerBackgroundUsageDetailTest.java

+9 −7
Original line number Diff line number Diff line
@@ -47,11 +47,11 @@ import android.widget.CompoundButton; 


import androidx.fragment.app.FragmentActivity;

import androidx.loader.app.LoaderManager;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.SettingsActivity;

import com.android.settings.fuelgauge.batteryusage.BatteryEntry;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.shadow.ShadowActivityManager;

import com.android.settings.testutils.shadow.ShadowEntityHeaderController;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.applications.AppUtils;
@@ -65,15 +65,16 @@ import com.android.settingslib.widget.SelectorWithWidgetPreference; 


import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.mockito.stubbing.Answer;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.util.ReflectionHelpers;
@@ -83,10 +84,13 @@ import java.util.concurrent.TimeUnit; 
@Config(

        shadows = {

            ShadowEntityHeaderController.class,

            ShadowActivityManager.class,

            com.android.settings.testutils.shadow.ShadowFragment.class,

        })

public class PowerBackgroundUsageDetailTest {



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    private static final String APP_LABEL = "app label";

    private static final String SUMMARY = "summary";

    private static final int ICON_ID = 123;
@@ -123,9 +127,7 @@ public class PowerBackgroundUsageDetailTest { 


    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);



        mContext = spy(RuntimeEnvironment.application);

        mContext = spy(ApplicationProvider.getApplicationContext());

        when(mContext.getPackageName()).thenReturn("foo");

        when(mContext.getPackageManager()).thenReturn(mPackageManager);

        when(mPackageManager.getInstallSourceInfo(anyString())).thenReturn(mInstallSourceInfo);

tests/robotests/src/com/android/settings/homepage/SettingsHomepageActivityTest.java

+9 −10
Original line number Diff line number Diff line
@@ -45,29 +45,30 @@ import android.view.WindowManager; 
import android.widget.FrameLayout;



import androidx.fragment.app.Fragment;

import androidx.test.core.app.ApplicationProvider;



import com.android.settings.R;

import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;

import com.android.settings.testutils.shadow.ShadowActivityEmbeddingUtils;

import com.android.settings.testutils.shadow.ShadowActivityManager;

import com.android.settings.testutils.shadow.ShadowPasswordUtils;

import com.android.settings.testutils.shadow.ShadowUserManager;

import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin;



import org.junit.After;

import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;

import org.robolectric.Robolectric;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.android.controller.ActivityController;

import org.robolectric.annotation.Config;

import org.robolectric.annotation.Implementation;

import org.robolectric.annotation.Implements;

import org.robolectric.shadow.api.Shadow;

import org.robolectric.shadows.ShadowActivityManager;

import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)
@@ -77,11 +78,8 @@ import org.robolectric.util.ReflectionHelpers; 
        ShadowActivityManager.class,

})

public class SettingsHomepageActivityTest {



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);

    }

    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();



    @After

    public void tearDown() {
@@ -120,7 +118,8 @@ public class SettingsHomepageActivityTest { 
    @Config(qualifiers = "mcc999")

    public void launch_LowRamDevice_shouldHideAvatar() {

        final ShadowActivityManager activityManager = Shadow.extract(

                RuntimeEnvironment.application.getSystemService(ActivityManager.class));

                ApplicationProvider.getApplicationContext().getSystemService(

                        ActivityManager.class));

        activityManager.setIsLowRamDevice(true);



        final SettingsHomepageActivity activity = Robolectric.buildActivity(