LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Increase timeouts for loopers" am: 2ed9b3dc70 am: b370da94ec am: b13c54fd94

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

Change-Id: If59c8212bea518255d34ffd59cafe8976f30cf41
This commit is contained in:
Treehugger Robot
2021-10-04 11:24:14 +00:00
committed by Automerger Merge Worker
parent 9d6dfd2afe b13c54fd94
commit 1ba78e5f40
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/unit/java/android/net/ConnectivityManagerTest.java
View File

@@ -47,6 +47,7 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.ArgumentMatchers.nullable;
import static org.mockito.Mockito.CALLS_REAL_METHODS; import static org.mockito.Mockito.CALLS_REAL_METHODS;
import static org.mockito.Mockito.after;
import static org.mockito.Mockito.any; import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -85,6 +86,8 @@ import org.mockito.MockitoAnnotations;
@SmallTest @SmallTest
@DevSdkIgnoreRule.IgnoreUpTo(VERSION_CODES.R) @DevSdkIgnoreRule.IgnoreUpTo(VERSION_CODES.R)
public class ConnectivityManagerTest { public class ConnectivityManagerTest {
private static final int TIMEOUT_MS = 30_000;
private static final int SHORT_TIMEOUT_MS = 150;
@Mock Context mCtx; @Mock Context mCtx;
@Mock IConnectivityManager mService; @Mock IConnectivityManager mService;
@@ -233,7 +236,7 @@ public class ConnectivityManagerTest {
// callback triggers // callback triggers
captor.getValue().send(makeMessage(request, ConnectivityManager.CALLBACK_AVAILABLE)); captor.getValue().send(makeMessage(request, ConnectivityManager.CALLBACK_AVAILABLE));
verify(callback, timeout(500).times(1)).onAvailable(any(Network.class), verify(callback, timeout(TIMEOUT_MS).times(1)).onAvailable(any(Network.class),
any(NetworkCapabilities.class), any(LinkProperties.class), anyBoolean()); any(NetworkCapabilities.class), any(LinkProperties.class), anyBoolean());
// unregister callback // unregister callback
@@ -242,7 +245,7 @@ public class ConnectivityManagerTest {
// callback does not trigger anymore. // callback does not trigger anymore.
captor.getValue().send(makeMessage(request, ConnectivityManager.CALLBACK_LOSING)); captor.getValue().send(makeMessage(request, ConnectivityManager.CALLBACK_LOSING));
verify(callback, timeout(500).times(0)).onLosing(any(), anyInt()); verify(callback, after(SHORT_TIMEOUT_MS).never()).onLosing(any(), anyInt());
} }
@Test @Test
@@ -262,7 +265,7 @@ public class ConnectivityManagerTest {
// callback triggers // callback triggers
captor.getValue().send(makeMessage(req1, ConnectivityManager.CALLBACK_AVAILABLE)); captor.getValue().send(makeMessage(req1, ConnectivityManager.CALLBACK_AVAILABLE));
verify(callback, timeout(100).times(1)).onAvailable(any(Network.class), verify(callback, timeout(TIMEOUT_MS).times(1)).onAvailable(any(Network.class),
any(NetworkCapabilities.class), any(LinkProperties.class), anyBoolean()); any(NetworkCapabilities.class), any(LinkProperties.class), anyBoolean());
// unregister callback // unregister callback
@@ -271,7 +274,7 @@ public class ConnectivityManagerTest {
// callback does not trigger anymore. // callback does not trigger anymore.
captor.getValue().send(makeMessage(req1, ConnectivityManager.CALLBACK_LOSING)); captor.getValue().send(makeMessage(req1, ConnectivityManager.CALLBACK_LOSING));
verify(callback, timeout(100).times(0)).onLosing(any(), anyInt()); verify(callback, after(SHORT_TIMEOUT_MS).never()).onLosing(any(), anyInt());
// callback can be registered again // callback can be registered again
when(mService.requestNetwork(anyInt(), any(), anyInt(), captor.capture(), anyInt(), any(), when(mService.requestNetwork(anyInt(), any(), anyInt(), captor.capture(), anyInt(), any(),
@@ -280,7 +283,7 @@ public class ConnectivityManagerTest {
// callback triggers // callback triggers
captor.getValue().send(makeMessage(req2, ConnectivityManager.CALLBACK_LOST)); captor.getValue().send(makeMessage(req2, ConnectivityManager.CALLBACK_LOST));
verify(callback, timeout(100).times(1)).onLost(any()); verify(callback, timeout(TIMEOUT_MS).times(1)).onLost(any());
// unregister callback // unregister callback
manager.unregisterNetworkCallback(callback); manager.unregisterNetworkCallback(callback);