commit 38690413907e1536d059c4be24ac0e8a3765de0b
author Chiachang Wang <chiachangwang@google.com> Sat Mar 09 05:43:05 2019 -0800
committer android-build-merger <android-build-merger@google.com> Sat Mar 09 05:43:05 2019 -0800
tree 3f5a9a65c4a12a7acb26fe55c7bfa02401047bf8
parent e2ff3cb9fdf0cb067f3764fa3c1228913ce81794
parent 0f8bbdd3eccb94012d8839d39431e1d148a54fe5

Merge "Not to use any() to verify DataStallDetectionStats" am: 18e931ba12 am: b0ccd2517e
am: 0f8bbdd3ec

Change-Id: Id96afb78c32fab20c41da88cc89410efc7458ba5

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

diff --git a/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java b/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
index ee2baf2..34ca6ac 100644
--- a/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
+++ b/packages/NetworkStack/tests/src/com/android/server/connectivity/NetworkMonitorTest.java
@@ -525,7 +525,7 @@
         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 @@
         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 @@
         }
     }
 
+    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);