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

Commit e43f1623 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Not to use any() to verify DataStallDetectionStats 

Build a empty DataStallDetectionStats object instead of use
any() to do the verification to prevent NPE while trying to
write the metrics.

Bug: 120452078
Test: atest NetworkStackTests
Change-Id: Ib9f3e56195a539a5ca4826b4aad0e38945a9a3a7
parent c8dfb728

packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java

+6 −2
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ public class NetworkMonitorTest { 
        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        makeDnsTimeoutEvent(wrappedMonitor, 5);

        assertTrue(wrappedMonitor.isDataStall());

        verify(mDataStallStatsUtils, times(1)).write(any(), any());

        verify(mDataStallStatsUtils, times(1)).write(makeEmptyDataStallDetectionStats(), any());

    }



    @Test
@@ -534,7 +534,7 @@ public class NetworkMonitorTest { 
        wrappedMonitor.setLastProbeTime(SystemClock.elapsedRealtime() - 1000);

        makeDnsTimeoutEvent(wrappedMonitor, 3);

        assertFalse(wrappedMonitor.isDataStall());

        verify(mDataStallStatsUtils, never()).write(any(), any());

        verify(mDataStallStatsUtils, never()).write(makeEmptyDataStallDetectionStats(), any());

    }



    @Test
@@ -586,6 +586,10 @@ public class NetworkMonitorTest { 
        }

    }



    private DataStallDetectionStats makeEmptyDataStallDetectionStats() {

        return new DataStallDetectionStats.Builder().build();

    }



    private void setDataStallEvaluationType(int type) {

        when(mDependencies.getSetting(any(),

            eq(Settings.Global.DATA_STALL_EVALUATION_TYPE), anyInt())).thenReturn(type);