diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-31 21:33:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-31 21:33:58 +0000 |
| commit | a107d2ca8cb1aaf5e2f5035cb4cdc03a9ffec51a (patch) | |
| tree | 8bf8503b8d8335db301223818678037672a38946 | |
| parent | cbc4ad28904c305b1646d4bbb5dbb2db215df3bf (diff) | |
| parent | 443ee3b76a41c323ec0278dde9f18d2d9029d1e1 (diff) | |
| download | android_frameworks_opt_net_wifi-a107d2ca8cb1aaf5e2f5035cb4cdc03a9ffec51a.tar.gz android_frameworks_opt_net_wifi-a107d2ca8cb1aaf5e2f5035cb4cdc03a9ffec51a.tar.bz2 android_frameworks_opt_net_wifi-a107d2ca8cb1aaf5e2f5035cb4cdc03a9ffec51a.zip | |
Merge "Optimize Link Probing unit test to prevent timeout" into qt-dev
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java b/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java index 6884c03c0..32eb78d8c 100644 --- a/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/LinkProbeManagerTest.java @@ -376,17 +376,17 @@ public class LinkProbeManagerTest { mTimeMs += LinkProbeManager.DELAY_BETWEEN_PROBES_MS + 1000; when(mClock.getElapsedSinceBootMillis()).thenReturn(mTimeMs); mLinkProbeManager.updateConnectionStats(mWifiInfo, TEST_IFACE_NAME); - verify(mWifiNative, times(i)) - .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); } + verify(mWifiNative, times((int) LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD)) + .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); // verify no more quota for (int i = 0; i < 10; i++) { mTimeMs += LinkProbeManager.DELAY_BETWEEN_PROBES_MS + 1000; when(mClock.getElapsedSinceBootMillis()).thenReturn(mTimeMs); mLinkProbeManager.updateConnectionStats(mWifiInfo, TEST_IFACE_NAME); - verify(mWifiNative, times((int) LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD)) - .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); } + verify(mWifiNative, times((int) LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD)) + .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); // start new period mTimeMs += LinkProbeManager.PERIOD_MILLIS + 1000; @@ -397,16 +397,16 @@ public class LinkProbeManagerTest { mTimeMs += LinkProbeManager.DELAY_BETWEEN_PROBES_MS + 1000; when(mClock.getElapsedSinceBootMillis()).thenReturn(mTimeMs); mLinkProbeManager.updateConnectionStats(mWifiInfo, TEST_IFACE_NAME); - verify(mWifiNative, times((int) (LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD + i))) - .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); } + verify(mWifiNative, times((int) (2 * LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD))) + .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); // verify no more quota again for (int i = 0; i < 10; i++) { mTimeMs += LinkProbeManager.DELAY_BETWEEN_PROBES_MS + 1000; when(mClock.getElapsedSinceBootMillis()).thenReturn(mTimeMs); mLinkProbeManager.updateConnectionStats(mWifiInfo, TEST_IFACE_NAME); - verify(mWifiNative, times((int) (2 * LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD))) - .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); } + verify(mWifiNative, times((int) (2 * LinkProbeManager.MAX_PROBE_COUNT_IN_PERIOD))) + .probeLink(eq(TEST_IFACE_NAME), any(), any(), anyInt()); } } |