From 199cae427b455e22fe99cabe41e15498c8346981 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Tue, 1 Oct 2019 16:10:28 +0800 Subject: [PATCH] [AutoTest] Settings Telephony part Change design to avoid using Robolectric.setupActivity() Bug: 140707056 Test: make RunSettingsRoboTests ROBOTEST_FILTER=EuiccPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=DataServiceSetupPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=ApnPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkActivityTest make RunSettingsRoboTests ROBOTEST_FILTER=DataUsagePreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=ApnEditorTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkSummaryControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkListControllerTest make RunSettingsRoboTests ROBOTEST_FILTER=MobileNetworkPreferenceControllerTest Change-Id: Ifacd2e6c8733d8e814a277cf34d6f7eb1a9ddba4 --- .../settings/network/ApnEditorTest.java | 20 +++++++++++++------ .../MobileNetworkListControllerTest.java | 6 ++++-- ...MobileNetworkPreferenceControllerTest.java | 6 ++++-- .../MobileNetworkSummaryControllerTest.java | 20 ++++++++++--------- ...SubscriptionsPreferenceControllerTest.java | 10 ++++++---- .../ApnPreferenceControllerTest.java | 6 ++++-- ...aServiceSetupPreferenceControllerTest.java | 7 ++++--- .../DataUsagePreferenceControllerTest.java | 7 +++++-- .../EuiccPreferenceControllerTest.java | 12 +++++++---- .../telephony/MobileNetworkActivityTest.java | 6 +++--- 10 files changed, 63 insertions(+), 37 deletions(-) diff --git a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java index 6a714d7e6f2..3aa6a6f88ed 100644 --- a/tests/robotests/src/com/android/settings/network/ApnEditorTest.java +++ b/tests/robotests/src/com/android/settings/network/ApnEditorTest.java @@ -30,6 +30,7 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.ContentValues; import android.content.Context; +import android.content.Intent; import android.content.res.Resources; import android.database.Cursor; import android.net.Uri; @@ -98,27 +99,33 @@ public class ApnEditorTest { @Mock private Cursor mCursor; + @Mock + private FragmentActivity mActivity; + @Captor private ArgumentCaptor mUriCaptor; private ApnEditor mApnEditorUT; - private FragmentActivity mActivity; + private Context mContext; private Resources mResources; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mActivity = spy(Robolectric.setupActivity(FragmentActivity.class)); - mResources = mActivity.getResources(); + mContext = spy(RuntimeEnvironment.application); + + mResources = mContext.getResources(); mApnEditorUT = spy(new ApnEditor()); doReturn(mActivity).when(mApnEditorUT).getActivity(); doReturn(mResources).when(mApnEditorUT).getResources(); doNothing().when(mApnEditorUT).finish(); doNothing().when(mApnEditorUT).showError(); - when(mApnEditorUT.getContext()).thenReturn(RuntimeEnvironment.application); + doReturn(mContext).when(mApnEditorUT).getContext(); + doReturn(mContext.getTheme()).when(mActivity).getTheme(); + doReturn(mContext.getContentResolver()).when(mActivity).getContentResolver(); - setMockPreference(mActivity); + setMockPreference(mContext); mApnEditorUT.mApnData = new FakeApnData(APN_DATA); mApnEditorUT.sNotSet = "Not Set"; } @@ -319,7 +326,7 @@ public class ApnEditorTest { // WHEN press the back button final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_BACK); - mApnEditorUT.onKey(new View(mActivity), KeyEvent.KEYCODE_BACK, event); + mApnEditorUT.onKey(new View(mContext), KeyEvent.KEYCODE_BACK, event); // THEN the apn data is saved and the apn editor is closed verify(mApnEditorUT).validateAndSaveApnData(); @@ -459,6 +466,7 @@ public class ApnEditorTest { @Test @Config(shadows = ShadowFragment.class) public void onCreate_noAction_shouldFinishAndNoCrash() { + doReturn(new Intent()).when(mActivity).getIntent(); doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt()); mApnEditorUT.onCreate(null); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java index 4a98753e2b0..1c71b962e3e 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkListControllerTest.java @@ -22,6 +22,7 @@ import static android.telephony.SubscriptionManager.INVALID_SUBSCRIPTION_ID; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -47,6 +48,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; import java.util.Arrays; @@ -76,7 +78,7 @@ public class MobileNetworkListControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); @@ -137,9 +139,9 @@ public class MobileNetworkListControllerTest { // Check that the onclick listeners are setup to fire with the right subscription id. final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); + doNothing().when(mContext).startActivity(intentCaptor.capture()); pref1.getOnPreferenceClickListener().onPreferenceClick(pref1); pref2.getOnPreferenceClickListener().onPreferenceClick(pref2); - verify(mContext, times(2)).startActivity(intentCaptor.capture()); final Intent intent1 = intentCaptor.getAllValues().get(0); final Intent intent2 = intentCaptor.getAllValues().get(1); assertThat(intent1.getIntExtra(EXTRA_SUB_ID, INVALID_SUBSCRIPTION_ID)).isEqualTo(1); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java index 43e8c471ec5..b7691afacaf 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkPreferenceControllerTest.java @@ -23,6 +23,7 @@ import static com.android.settings.network.MobileNetworkPreferenceController.MOB import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -61,6 +62,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) @@ -81,7 +83,7 @@ public class MobileNetworkPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager); @@ -190,10 +192,10 @@ public class MobileNetworkPreferenceControllerTest { mController = new MobileNetworkPreferenceController(mContext); FeatureFlagUtils.setEnabled(mContext, FeatureFlags.MOBILE_NETWORK_V2, false); ArgumentCaptor argument = ArgumentCaptor.forClass(Intent.class); + doNothing().when(mContext).startActivity(argument.capture()); mController.handlePreferenceTreeClick(mPreference); - verify(mContext).startActivity(argument.capture()); final ComponentName componentName = argument.getValue().getComponent(); assertThat(componentName.getPackageName()).isEqualTo(MOBILE_NETWORK_PACKAGE); assertThat(componentName.getClassName()).isEqualTo(MOBILE_NETWORK_CLASS); diff --git a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java index e24b0f22a5b..4f4a549b1f2 100644 --- a/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/MobileNetworkSummaryControllerTest.java @@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.notNull; import static org.mockito.Mockito.atLeastOnce; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; @@ -53,6 +54,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; import java.util.Arrays; @@ -81,7 +83,7 @@ public class MobileNetworkSummaryControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); when(mContext.getSystemService(EuiccManager.class)).thenReturn(mEuiccManager); @@ -130,9 +132,9 @@ public class MobileNetworkSummaryControllerTest { mController.onResume(); assertThat(mController.getSummary()).isEqualTo("Add a network"); - mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).startActivity(intentCaptor.capture()); + doNothing().when(mContext).startActivity(intentCaptor.capture()); + mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); assertThat(intentCaptor.getValue().getAction()).isEqualTo( EuiccManager.ACTION_PROVISION_EMBEDDED_SUBSCRIPTION); } @@ -155,9 +157,9 @@ public class MobileNetworkSummaryControllerTest { mController.onResume(); assertThat(mController.getSummary()).isEqualTo("sub1"); assertThat(mPreference.getFragment()).isNull(); - mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).startActivity(intentCaptor.capture()); + doNothing().when(mContext).startActivity(intentCaptor.capture()); + mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); Intent intent = intentCaptor.getValue(); assertThat(intent.getComponent().getClassName()).isEqualTo( MobileNetworkActivity.class.getName()); @@ -218,9 +220,9 @@ public class MobileNetworkSummaryControllerTest { mController.onSubscriptionsChanged(); assertThat(mController.getSummary()).isEqualTo("sub1"); assertThat(mPreference.getFragment()).isNull(); - mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).startActivity(intentCaptor.capture()); + doNothing().when(mContext).startActivity(intentCaptor.capture()); + mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); assertThat(intentCaptor.getValue().getComponent().getClassName()).isEqualTo( MobileNetworkActivity.class.getName()); } @@ -239,9 +241,9 @@ public class MobileNetworkSummaryControllerTest { mController.onResume(); assertThat(mController.getSummary()).isEqualTo("sub1"); assertThat(mPreference.getFragment()).isNull(); - mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).startActivity(intentCaptor.capture()); + doNothing().when(mContext).startActivity(intentCaptor.capture()); + mPreference.getOnPreferenceClickListener().onPreferenceClick(mPreference); assertThat(intentCaptor.getValue().getComponent().getClassName()).isEqualTo( MobileNetworkActivity.class.getName()); diff --git a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java index 51f8ec09fc9..6fd94c3a199 100644 --- a/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/SubscriptionsPreferenceControllerTest.java @@ -29,6 +29,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; @@ -63,6 +64,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowSubscriptionManager; @@ -107,7 +109,7 @@ public class SubscriptionsPreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); mLifecycleOwner = () -> mLifecycle; mLifecycle = new Lifecycle(mLifecycleOwner); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); @@ -257,14 +259,14 @@ public class SubscriptionsPreferenceControllerTest { */ private void runPreferenceClickTest(final int subscriptionCount, final int selectedPrefIndex) { final List subs = setupMockSubscriptions(subscriptionCount); - mController.displayPreference(mScreen); final ArgumentCaptor prefCaptor = ArgumentCaptor.forClass(Preference.class); + mController.displayPreference(mScreen); verify(mPreferenceCategory, times(subscriptionCount)).addPreference(prefCaptor.capture()); final List prefs = prefCaptor.getAllValues(); final Preference pref = prefs.get(selectedPrefIndex); - pref.getOnPreferenceClickListener().onPreferenceClick(pref); final ArgumentCaptor intentCaptor = ArgumentCaptor.forClass(Intent.class); - verify(mContext).startActivity(intentCaptor.capture()); + doNothing().when(mContext).startActivity(intentCaptor.capture()); + pref.getOnPreferenceClickListener().onPreferenceClick(pref); final Intent intent = intentCaptor.getValue(); assertThat(intent).isNotNull(); assertThat(intent.hasExtra(Settings.EXTRA_SUB_ID)).isTrue(); diff --git a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java index ce4c9a2fcd5..d3628373357 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/ApnPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -47,6 +48,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) public class ApnPreferenceControllerTest { @@ -69,7 +71,7 @@ public class ApnPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); @@ -138,10 +140,10 @@ public class ApnPreferenceControllerTest { @Test public void handPreferenceTreeClick_fireIntent() { ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); + doNothing().when(mContext).startActivity(captor.capture()); mController.handlePreferenceTreeClick(mPreference); - verify(mContext).startActivity(captor.capture()); final Intent intent = captor.getValue(); assertThat(intent.getAction()).isEqualTo(Settings.ACTION_APN_SETTINGS); assertThat(intent.getIntExtra(ApnSettings.SUB_ID, 0)).isEqualTo(SUB_ID); diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java index 8907164c666..46e69782b51 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataServiceSetupPreferenceControllerTest.java @@ -21,6 +21,7 @@ import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_U import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -49,6 +50,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) public class DataServiceSetupPreferenceControllerTest { @@ -72,7 +74,7 @@ public class DataServiceSetupPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId( @@ -125,11 +127,10 @@ public class DataServiceSetupPreferenceControllerTest { @Test public void handlePreferenceTreeClick_startActivity() { ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); + doNothing().when(mContext).startActivity(captor.capture()); mController.handlePreferenceTreeClick(mPreference); - verify(mContext).startActivity(captor.capture()); - final Intent intent = captor.getValue(); assertThat(intent.getAction()).isEqualTo(Intent.ACTION_VIEW); assertThat(intent.getData()).isEqualTo( diff --git a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java index 7a097e7be8f..7681f447314 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/DataUsagePreferenceControllerTest.java @@ -17,6 +17,7 @@ package com.android.settings.network.telephony; import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -40,6 +41,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.Shadows; import org.robolectric.shadows.ShadowTelephonyManager; import org.robolectric.util.ReflectionHelpers; @@ -58,7 +60,7 @@ public class DataUsagePreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); + mContext = spy(RuntimeEnvironment.application); final TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class); final ShadowTelephonyManager shadowTelephonyManager = Shadows.shadowOf(telephonyManager); @@ -91,9 +93,10 @@ public class DataUsagePreferenceControllerTest { @Test public void handlePreferenceTreeClick_needDialog_showDialog() { final ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); + doNothing().when(mContext).startActivity(captor.capture()); + mController.handlePreferenceTreeClick(mPreference); - verify(mContext).startActivity(captor.capture()); final Intent intent = captor.getValue(); assertThat(intent.getAction()).isEqualTo(Settings.ACTION_MOBILE_DATA_USAGE); diff --git a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java index 7fbddb49169..e4cf3033c9e 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/EuiccPreferenceControllerTest.java @@ -38,6 +38,7 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) public class EuiccPreferenceControllerTest { @@ -46,6 +47,9 @@ public class EuiccPreferenceControllerTest { @Mock private TelephonyManager mTelephonyManager; + @Mock + private Activity mActivity; + private EuiccPreferenceController mController; private Preference mPreference; private Context mContext; @@ -54,12 +58,12 @@ public class EuiccPreferenceControllerTest { public void setUp() { MockitoAnnotations.initMocks(this); - mContext = spy(Robolectric.setupActivity(Activity.class)); - doReturn(mTelephonyManager).when(mContext).getSystemService(Context.TELEPHONY_SERVICE); + mContext = spy(RuntimeEnvironment.application); + doReturn(mTelephonyManager).when(mActivity).getSystemService(Context.TELEPHONY_SERVICE); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID); mPreference = new Preference(mContext); - mController = new EuiccPreferenceController(mContext, "euicc"); + mController = new EuiccPreferenceController(mActivity, "euicc"); mController.init(SUB_ID); mPreference.setKey(mController.getPreferenceKey()); } @@ -70,7 +74,7 @@ public class EuiccPreferenceControllerTest { mController.handlePreferenceTreeClick(mPreference); - verify(mContext).startActivity(captor.capture()); + verify(mActivity).startActivity(captor.capture()); assertThat(captor.getValue().getAction()).isEqualTo( EuiccManager.ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS); } diff --git a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java index 43897d503d9..59fd510d6fd 100644 --- a/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java +++ b/tests/robotests/src/com/android/settings/network/telephony/MobileNetworkActivityTest.java @@ -164,7 +164,7 @@ public class MobileNetworkActivityTest { @Test public void phoneChangeReceiver_ignoresStickyBroadcastFromBeforeRegistering() { - Activity activity = Robolectric.setupActivity(Activity.class); + Context activity = mContext; MobileNetworkActivity.PhoneChangeReceiver.Client client = mock( MobileNetworkActivity.PhoneChangeReceiver.Client.class); MobileNetworkActivity.PhoneChangeReceiver receiver = @@ -181,7 +181,7 @@ public class MobileNetworkActivityTest { @Test public void phoneChangeReceiver_ignoresCarrierConfigChangeForWrongSubscriptionId() { - Activity activity = Robolectric.setupActivity(Activity.class); + Context activity = mContext; MobileNetworkActivity.PhoneChangeReceiver.Client client = mock( MobileNetworkActivity.PhoneChangeReceiver.Client.class); @@ -200,7 +200,7 @@ public class MobileNetworkActivityTest { @Test public void phoneChangeReceiver_dispatchesCarrierConfigChangeForCorrectSubscriptionId() { - Activity activity = Robolectric.setupActivity(Activity.class); + Context activity = mContext; MobileNetworkActivity.PhoneChangeReceiver.Client client = mock( MobileNetworkActivity.PhoneChangeReceiver.Client.class);