Merge "Fix failures on com.android.settings.network.ApnEditorTest"

This commit is contained in:
Tom Hsu
2020-04-16 06:36:02 +00:00
committed by Android (Google) Code Review
2 changed files with 113 additions and 87 deletions

View File

@@ -22,6 +22,7 @@ import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
@@ -99,6 +100,8 @@ public class ApnEditorTest {
@Mock
private FragmentActivity mActivity;
@Mock
private ProxySubscriptionManager mProxySubscriptionMgr;
@Captor
private ArgumentCaptor<Uri> mUriCaptor;
@@ -450,6 +453,8 @@ public class ApnEditorTest {
@Test
@Config(shadows = ShadowFragment.class)
public void onCreate_noAction_shouldFinishAndNoCrash() {
ProxySubscriptionManager proxySubscriptionMgr = mock(ProxySubscriptionManager.class);
mApnEditorUT.mProxySubscriptionMgr = proxySubscriptionMgr;
doReturn(new Intent()).when(mActivity).getIntent();
doNothing().when(mApnEditorUT).addPreferencesFromResource(anyInt());