Merge "Use mockito-extended in FrameworksNetTests" am: 35e6108119 am: 98ea169c22

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1727825

Change-Id: I1fe4628d1ade1dfe5c9f950895f74994f14fc150
This commit is contained in:
Remi NGUYEN VAN 2021-06-09 09:15:39 +00:00 • committed by Automerger Merge Worker
commit bd35a6de07

View file

@ -46,6 +46,7 @@ import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
@ -216,6 +217,7 @@ public class ConnectivityManagerTest {
ConnectivityManager manager = new ConnectivityManager(mCtx, mService);
NetworkRequest request = makeRequest(1);
NetworkCallback callback = mock(ConnectivityManager.NetworkCallback.class);
doCallRealMethod().when(callback).onAvailable(any(), any(), any(), anyInt());
Handler handler = new Handler(Looper.getMainLooper());
ArgumentCaptor<Messenger> captor = ArgumentCaptor.forClass(Messenger.class);
@ -244,6 +246,7 @@ public class ConnectivityManagerTest {
NetworkRequest req1 = makeRequest(1);
NetworkRequest req2 = makeRequest(2);
NetworkCallback callback = mock(ConnectivityManager.NetworkCallback.class);
doCallRealMethod().when(callback).onAvailable(any(), any(), any(), anyInt());
Handler handler = new Handler(Looper.getMainLooper());
ArgumentCaptor<Messenger> captor = ArgumentCaptor.forClass(Messenger.class);