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

Merge "Use timeout consts in all ConnService tests" am: bbba1f7f9f

Browse Source 
am: 68225bc676

Change-Id: I3d4a35aa3b78b455fe527c686b1a5cb2573ba47a
This commit is contained in:
Remi NGUYEN VAN
2018-07-27 00:20:07 -07:00
committed by android-build-merger
parent 6c8e385212 68225bc676
commit aa66c957f6
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -3217,7 +3217,8 @@ public class ConnectivityServiceTest {
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
mWiFiNetworkAgent.connect(false);
networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false, timeoutMs);
networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false,
TEST_CALLBACK_TIMEOUT_MS);
// pass timeout and validate that UNAVAILABLE is not called
networkCallback.assertNoCallback();
@@ -3237,8 +3238,8 @@ public class ConnectivityServiceTest {
mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);
mWiFiNetworkAgent.connect(false);
final int assertTimeoutMs = 100;
networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false, assertTimeoutMs);
networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false,
TEST_CALLBACK_TIMEOUT_MS);
mWiFiNetworkAgent.disconnect();
networkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);