Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7376ac0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

Use timeout consts in all ConnService tests 

Fix some timeouts that were forgotten in parent CL.

Bug: b/111778226
Test: runtest --no-hidden-api-checks -x ConnectivityServiceTest.java
Change-Id: Ib848eaba8c69c07ac596aa4386a741c9a2a87fc9
parent ef8377db

tests/net/java/com/android/server/ConnectivityServiceTest.java

+4 −3
Original line number Diff line number Diff line
@@ -3215,7 +3215,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();
@@ -3235,8 +3236,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);