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

Commit 4fcbe910 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Define a constant as stall evaluation interval for testing 

Follow up from aosp/1684386. It would be clearer to define the
value in a constant. Update the usages accordingly.

Bug: 185082309
Test: atest NetworkMonitorTest
Change-Id: I8a3aa33fe61ad8aa8f400526a54a48fafaebe7b7
parent e752407b

tests/unit/src/com/android/server/connectivity/NetworkMonitorTest.java

+17 −10
Original line number Original line Diff line number Diff line
@@ -283,7 +283,9 @@ public class NetworkMonitorTest { 
    private static final int DEFAULT_DNS_TIMEOUT_THRESHOLD = 5;

    private static final int DEFAULT_DNS_TIMEOUT_THRESHOLD = 5;





    private static final int HANDLER_TIMEOUT_MS = 1000;

    private static final int HANDLER_TIMEOUT_MS = 1000;



    private static final int TEST_MIN_STALL_EVALUATE_INTERVAL_MS = 500;

    private static final int STALL_EXPECTED_LAST_PROBE_TIME_MS =

            TEST_MIN_STALL_EVALUATE_INTERVAL_MS + HANDLER_TIMEOUT_MS;

    private static final LinkProperties TEST_LINK_PROPERTIES = new LinkProperties();

    private static final LinkProperties TEST_LINK_PROPERTIES = new LinkProperties();





    // Cannot have a static member for the LinkProperties with captive portal API information, as

    // Cannot have a static member for the LinkProperties with captive portal API information, as
@@ -543,7 +545,7 @@ public class NetworkMonitorTest { 




        resetCallbacks();

        resetCallbacks();





        setMinDataStallEvaluateInterval(500);

        setMinDataStallEvaluateInterval(TEST_MIN_STALL_EVALUATE_INTERVAL_MS);

        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_DNS);

        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_DNS);

        setValidDataStallDnsTimeThreshold(500);

        setValidDataStallDnsTimeThreshold(500);

        setConsecutiveDnsTimeoutThreshold(5);

        setConsecutiveDnsTimeoutThreshold(5);
@@ -1603,7 +1605,8 @@ public class NetworkMonitorTest { 
        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100);

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100);

        assertFalse(wrappedMonitor.isDataStall());

        assertFalse(wrappedMonitor.isDataStall());





        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        wrappedMonitor.setLastProbeTime(

                SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        makeDnsTimeoutEvent(wrappedMonitor, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        makeDnsTimeoutEvent(wrappedMonitor, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        assertTrue(wrappedMonitor.isDataStall());

        assertTrue(wrappedMonitor.isDataStall());

        verify(mCallbacks).notifyDataStallSuspected(

        verify(mCallbacks).notifyDataStallSuspected(
@@ -1613,7 +1616,8 @@ public class NetworkMonitorTest { 
    @Test

    @Test

    public void testIsDataStall_EvaluationDnsWithDnsTimeoutCount() throws Exception {

    public void testIsDataStall_EvaluationDnsWithDnsTimeoutCount() throws Exception {

        WrappedNetworkMonitor wrappedMonitor = makeCellMeteredNetworkMonitor();

        WrappedNetworkMonitor wrappedMonitor = makeCellMeteredNetworkMonitor();

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        wrappedMonitor.setLastProbeTime(

                SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        makeDnsTimeoutEvent(wrappedMonitor, 3);

        makeDnsTimeoutEvent(wrappedMonitor, 3);

        assertFalse(wrappedMonitor.isDataStall());

        assertFalse(wrappedMonitor.isDataStall());

        // Reset consecutive timeout counts.

        // Reset consecutive timeout counts.
@@ -1631,7 +1635,8 @@ public class NetworkMonitorTest { 
        // Set the value to larger than the default dns log size.

        // Set the value to larger than the default dns log size.

        setConsecutiveDnsTimeoutThreshold(51);

        setConsecutiveDnsTimeoutThreshold(51);

        wrappedMonitor = makeCellMeteredNetworkMonitor();

        wrappedMonitor = makeCellMeteredNetworkMonitor();

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        wrappedMonitor.setLastProbeTime(

                SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        makeDnsTimeoutEvent(wrappedMonitor, 50);

        makeDnsTimeoutEvent(wrappedMonitor, 50);

        assertFalse(wrappedMonitor.isDataStall());

        assertFalse(wrappedMonitor.isDataStall());
@@ -1663,7 +1668,8 @@ public class NetworkMonitorTest { 
        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100);

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100);

        makeDnsTimeoutEvent(wrappedMonitor, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        makeDnsTimeoutEvent(wrappedMonitor, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        assertFalse(wrappedMonitor.isDataStall());

        assertFalse(wrappedMonitor.isDataStall());

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        wrappedMonitor.setLastProbeTime(

                SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        assertTrue(wrappedMonitor.isDataStall());

        assertTrue(wrappedMonitor.isDataStall());

        verify(mCallbacks).notifyDataStallSuspected(

        verify(mCallbacks).notifyDataStallSuspected(

                matchDnsDataStallParcelable(DEFAULT_DNS_TIMEOUT_THRESHOLD));

                matchDnsDataStallParcelable(DEFAULT_DNS_TIMEOUT_THRESHOLD));
@@ -1674,7 +1680,8 @@ public class NetworkMonitorTest { 
        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100);

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 100);

        makeDnsTimeoutEvent(wrappedMonitor, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        makeDnsTimeoutEvent(wrappedMonitor, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        assertFalse(wrappedMonitor.isDataStall());

        assertFalse(wrappedMonitor.isDataStall());

        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        wrappedMonitor.setLastProbeTime(

                SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        assertFalse(wrappedMonitor.isDataStall());

        assertFalse(wrappedMonitor.isDataStall());

    }

    }
@@ -1708,7 +1715,7 @@ public class NetworkMonitorTest { 
        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_DNS | DATA_STALL_EVALUATION_TYPE_TCP);

        setDataStallEvaluationType(DATA_STALL_EVALUATION_TYPE_DNS | DATA_STALL_EVALUATION_TYPE_TCP);

        setupTcpDataStall();

        setupTcpDataStall();

        final WrappedNetworkMonitor nm = makeMonitor(CELL_METERED_CAPABILITIES);

        final WrappedNetworkMonitor nm = makeMonitor(CELL_METERED_CAPABILITIES);

        nm.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        nm.setLastProbeTime(SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        makeDnsTimeoutEvent(nm, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        makeDnsTimeoutEvent(nm, DEFAULT_DNS_TIMEOUT_THRESHOLD);

        assertTrue(nm.isDataStall());

        assertTrue(nm.isDataStall());

        verify(mCallbacks).notifyDataStallSuspected(

        verify(mCallbacks).notifyDataStallSuspected(
@@ -2001,7 +2008,7 @@ public class NetworkMonitorTest { 
        nm.notifyNetworkConnected(TEST_LINK_PROPERTIES, nc);

        nm.notifyNetworkConnected(TEST_LINK_PROPERTIES, nc);

        verifyNetworkTested(NETWORK_VALIDATION_RESULT_VALID,

        verifyNetworkTested(NETWORK_VALIDATION_RESULT_VALID,

                NETWORK_VALIDATION_PROBE_DNS | NETWORK_VALIDATION_PROBE_HTTPS);

                NETWORK_VALIDATION_PROBE_DNS | NETWORK_VALIDATION_PROBE_HTTPS);

        nm.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        nm.setLastProbeTime(SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        return nm;

        return nm;

    }

    }
@@ -2024,7 +2031,7 @@ public class NetworkMonitorTest { 
        verify(mDependencies, timeout(HANDLER_TIMEOUT_MS).times(1))

        verify(mDependencies, timeout(HANDLER_TIMEOUT_MS).times(1))

                .writeDataStallDetectionStats(statsCaptor.capture(), probeResultCaptor.capture());

                .writeDataStallDetectionStats(statsCaptor.capture(), probeResultCaptor.capture());

        // Ensure probe will not stop due to rate-limiting mechanism.

        // Ensure probe will not stop due to rate-limiting mechanism.

        nm.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        nm.setLastProbeTime(SystemClock.elapsedRealtime() - STALL_EXPECTED_LAST_PROBE_TIME_MS);

        assertTrue(nm.isDataStall());

        assertTrue(nm.isDataStall());

        assertTrue(probeResultCaptor.getValue().isSuccessful());

        assertTrue(probeResultCaptor.getValue().isSuccessful());

        verifyTestDataStallDetectionStats(evalType, transport, statsCaptor.getValue());

        verifyTestDataStallDetectionStats(evalType, transport, statsCaptor.getValue());