diff options
| author | Michael Plass <mplass@google.com> | 2017-10-27 15:08:00 -0700 |
|---|---|---|
| committer | Michael Plass <mplass@google.com> | 2018-01-19 07:35:46 +0000 |
| commit | bb3272b409d725dc1aada2cb871f78423ac37c48 (patch) | |
| tree | 45629c17a6161de1f1af366bcfc69a3fdd17a081 /tests | |
| parent | 72ca252ebfb5d91b13627a5f95b89db7b6adc1e5 (diff) | |
WifiMetricsTest fixes
Add missing @Test.
Add missing verifications for StaEvents generated from mTestStaLogInts.
Test: Yes, it is
Bug: 68271729
Bug: 71708302
Change-Id: I505656bc61a87e94edb674db4bbac2f30caa4d48
(cherry picked from commit 38e4d5224e8870484d1f6e028763fc2d6dd62974)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java index 6e0b7759c..a07054abc 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiMetricsTest.java @@ -1161,6 +1161,7 @@ public class WifiMetricsTest { } } private void verifyDeserializedStaEvents(WifiMetricsProto.WifiLog wifiLog) { + assertNotNull(mTestWifiConfig); assertEquals(NUM_TEST_STA_EVENTS, wifiLog.staEventList.length); int j = 0; // De-serialized event index for (int i = 0; i < mTestStaMessageInts.length; i++) { @@ -1180,6 +1181,21 @@ public class WifiMetricsTest { j++; } } + for (int i = 0; i < mTestStaLogInts.length; i++) { + StaEvent event = wifiLog.staEventList[j]; + int[] evs = mExpectedValues[j]; + assertEquals(evs[0], event.type); + assertEquals(evs[1], event.reason); + assertEquals(evs[2], event.status); + assertEquals(evs[3] == 1 ? true : false, event.localGen); + assertEquals(evs[4], event.authFailureReason); + assertEquals(evs[5] == 1 ? true : false, event.associationTimedOut); + assertEquals(evs[6], event.supplicantStateChangesBitmask); + assertConfigInfoEqualsWifiConfig( + evs[7] == 1 ? mTestWifiConfig : null, event.configInfo); + j++; + } + assertEquals(mExpectedValues.length, j); } /** @@ -1360,6 +1376,7 @@ public class WifiMetricsTest { * Test Open Network Notification blacklist size and feature state are not cleared when proto * is dumped. */ + @Test public void testOpenNetworkNotificationBlacklistSizeAndFeatureStateNotCleared() throws Exception { mWifiMetrics.setOpenNetworkRecommenderBlacklistSize( |