Loading tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java +15 −13 Original line number Diff line number Diff line Loading @@ -20,9 +20,9 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; Loading Loading @@ -791,14 +791,14 @@ public class ContextFixture implements TestFixture<Context> { public ContextFixture() { MockitoAnnotations.initMocks(this); doAnswer(new Answer<List<ResolveInfo>>() { lenient().doAnswer(new Answer<List<ResolveInfo>>() { @Override public List<ResolveInfo> answer(InvocationOnMock invocation) throws Throwable { return doQueryIntentServices((Intent) invocation.getArguments()[0]); } }).when(mPackageManager).queryIntentServices((Intent) any(), anyInt()); doAnswer(new Answer<List<ResolveInfo>>() { lenient().doAnswer(new Answer<List<ResolveInfo>>() { @Override public List<ResolveInfo> answer(InvocationOnMock invocation) throws Throwable { return doQueryIntentServices((Intent) invocation.getArguments()[0]); Loading @@ -812,30 +812,32 @@ public class ContextFixture implements TestFixture<Context> { Log.d(TAG, "NameNotFoundException: e=" + e); } doAnswer((Answer<Boolean>) lenient().doAnswer((Answer<Boolean>) invocation -> mSystemFeatures.contains((String) invocation.getArgument(0))) .when(mPackageManager).hasSystemFeature(any()); try { doReturn(mResources).when(mPackageManager).getResourcesForApplication(anyString()); lenient().doReturn(mResources).when(mPackageManager) .getResourcesForApplication(anyString()); } catch (NameNotFoundException ex) { Log.d(TAG, "NameNotFoundException: ex=" + ex); } doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt()); doReturn(mBundle).when(mCarrierConfigManager).getConfig(); doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString()); doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId(); doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent( lenient().doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt()); lenient().doReturn(mBundle).when(mCarrierConfigManager).getConfig(); lenient().doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString()); lenient().doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId(); lenient().doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent( any(), any(), any(), any(), any(), any(), anyInt()); doReturn(true).when(mEuiccManager).isEnabled(); lenient().doReturn(true).when(mEuiccManager).isEnabled(); mConfiguration.locale = Locale.US; doReturn(mConfiguration).when(mResources).getConfiguration(); lenient().doReturn(mConfiguration).when(mResources).getConfiguration(); mDisplayMetrics.density = 2.25f; doReturn(mDisplayMetrics).when(mResources).getDisplayMetrics(); lenient().doReturn(mDisplayMetrics).when(mResources).getDisplayMetrics(); mPermissionTable.add(PERMISSION_ENABLE_ALL); } Loading Loading
tests/telephonytests/src/com/android/internal/telephony/ContextFixture.java +15 −13 Original line number Diff line number Diff line Loading @@ -20,9 +20,9 @@ import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.any; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.lenient; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; Loading Loading @@ -791,14 +791,14 @@ public class ContextFixture implements TestFixture<Context> { public ContextFixture() { MockitoAnnotations.initMocks(this); doAnswer(new Answer<List<ResolveInfo>>() { lenient().doAnswer(new Answer<List<ResolveInfo>>() { @Override public List<ResolveInfo> answer(InvocationOnMock invocation) throws Throwable { return doQueryIntentServices((Intent) invocation.getArguments()[0]); } }).when(mPackageManager).queryIntentServices((Intent) any(), anyInt()); doAnswer(new Answer<List<ResolveInfo>>() { lenient().doAnswer(new Answer<List<ResolveInfo>>() { @Override public List<ResolveInfo> answer(InvocationOnMock invocation) throws Throwable { return doQueryIntentServices((Intent) invocation.getArguments()[0]); Loading @@ -812,30 +812,32 @@ public class ContextFixture implements TestFixture<Context> { Log.d(TAG, "NameNotFoundException: e=" + e); } doAnswer((Answer<Boolean>) lenient().doAnswer((Answer<Boolean>) invocation -> mSystemFeatures.contains((String) invocation.getArgument(0))) .when(mPackageManager).hasSystemFeature(any()); try { doReturn(mResources).when(mPackageManager).getResourcesForApplication(anyString()); lenient().doReturn(mResources).when(mPackageManager) .getResourcesForApplication(anyString()); } catch (NameNotFoundException ex) { Log.d(TAG, "NameNotFoundException: ex=" + ex); } doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt()); doReturn(mBundle).when(mCarrierConfigManager).getConfig(); doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString()); doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId(); doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent( lenient().doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt()); lenient().doReturn(mBundle).when(mCarrierConfigManager).getConfig(); lenient().doReturn(mBundle).when(mCarrierConfigManager).getConfigForSubId(anyInt(), anyString()); lenient().doAnswer(invocation -> mNetworkId++).when(mNetwork).getNetId(); lenient().doReturn(mNetwork).when(mConnectivityManager).registerNetworkAgent( any(), any(), any(), any(), any(), any(), anyInt()); doReturn(true).when(mEuiccManager).isEnabled(); lenient().doReturn(true).when(mEuiccManager).isEnabled(); mConfiguration.locale = Locale.US; doReturn(mConfiguration).when(mResources).getConfiguration(); lenient().doReturn(mConfiguration).when(mResources).getConfiguration(); mDisplayMetrics.density = 2.25f; doReturn(mDisplayMetrics).when(mResources).getDisplayMetrics(); lenient().doReturn(mDisplayMetrics).when(mResources).getDisplayMetrics(); mPermissionTable.add(PERMISSION_ENABLE_ALL); } Loading