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

Commit 12e7fc47 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by android-build-merger
Browse files

Merge "Use timeout consts in all ConnService tests" am: 3fbbe734 am: 589432e7 

am: 617b89e4

Change-Id: Ia2a25b560dd0aac670472a78583fa890b24c0633
parents 3e499f7f 617b89e4

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

+4 −3
Original line number Original line Diff line number Diff line
@@ -3217,7 +3217,8 @@ public class ConnectivityServiceTest { 




        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent.connect(false);

        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

        // pass timeout and validate that UNAVAILABLE is not called

        networkCallback.assertNoCallback();

        networkCallback.assertNoCallback();
@@ -3237,8 +3238,8 @@ public class ConnectivityServiceTest { 




        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI);

        mWiFiNetworkAgent.connect(false);

        mWiFiNetworkAgent.connect(false);

        final int assertTimeoutMs = 100;

        networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false,

        networkCallback.expectAvailableCallbacks(mWiFiNetworkAgent, false, false, assertTimeoutMs);

                TEST_CALLBACK_TIMEOUT_MS);

        mWiFiNetworkAgent.disconnect();

        mWiFiNetworkAgent.disconnect();

        networkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);

        networkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent);