diff options
| author | Ningyuan Wang <nywang@google.com> | 2017-08-14 12:58:54 -0700 |
|---|---|---|
| committer | Ningyuan Wang <nywang@google.com> | 2017-08-14 14:26:07 -0700 |
| commit | 47678c136b1f88be3d04d89aa5898e77fa1862a3 (patch) | |
| tree | a38bfc1ab09abe385fb39bd34d641dcdbb290f8a /tests | |
| parent | ff14f546b406ead034c70d09381c6dadb9a0062d (diff) | |
ScanDetailCache cleanup
This renames get() to getScanResult() to provide better
consistency with names of other methods.
This also adds @NonNull annotation for a few other
methods.
Bug: 64541323
Test: compile, unit tests
Change-Id: I7e61559390dd82f59b07ebfe2ae69ee9bb5152d2
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java | 4 | ||||
| -rw-r--r-- | tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 7509c18b3..761c06716 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -1144,7 +1144,7 @@ public class WifiConfigManagerTest { ScanDetailCache retrievedScanDetailCache = mWifiConfigManager.getScanDetailCacheForNetwork(result.getNetworkId()); assertEquals(1, retrievedScanDetailCache.size()); - ScanResult retrievedScanResult = retrievedScanDetailCache.get(scanResult.BSSID); + ScanResult retrievedScanResult = retrievedScanDetailCache.getScanResult(scanResult.BSSID); ScanTestUtil.assertScanResultEquals(scanResult, retrievedScanResult); } @@ -3971,7 +3971,7 @@ public class WifiConfigManagerTest { ScanDetailCache retrievedScanDetailCache = mWifiConfigManager.getScanDetailCacheForNetwork(network.networkId); assertEquals(1, retrievedScanDetailCache.size()); - ScanResult retrievedScanResult = retrievedScanDetailCache.get(scanResult.BSSID); + ScanResult retrievedScanResult = retrievedScanDetailCache.getScanResult(scanResult.BSSID); ScanTestUtil.assertScanResultEquals(scanResult, retrievedScanResult); } diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java index 5d5a5a6aa..5d74279a6 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java @@ -969,7 +969,7 @@ public class WifiStateMachineTest { when(mScanDetailCache.getScanDetail(sBSSID)).thenReturn( getGoogleGuestScanDetail(TEST_RSSI, sBSSID, sFreq)); - when(mScanDetailCache.get(sBSSID)).thenReturn( + when(mScanDetailCache.getScanResult(sBSSID)).thenReturn( getGoogleGuestScanDetail(TEST_RSSI, sBSSID, sFreq).getScanResult()); mWsm.sendMessage(WifiMonitor.NETWORK_CONNECTION_EVENT, 0, 0, sBSSID); @@ -1759,7 +1759,7 @@ public class WifiStateMachineTest { .thenReturn(mScanDetailCache); when(mScanDetailCache.getScanDetail(sBSSID1)).thenReturn( getGoogleGuestScanDetail(TEST_RSSI, sBSSID1, sFreq1)); - when(mScanDetailCache.get(sBSSID1)).thenReturn( + when(mScanDetailCache.getScanResult(sBSSID1)).thenReturn( getGoogleGuestScanDetail(TEST_RSSI, sBSSID1, sFreq1).getScanResult()); // This simulates the behavior of roaming to network with |sBSSID1|, |sFreq1|. @@ -1787,7 +1787,7 @@ public class WifiStateMachineTest { .thenReturn(mScanDetailCache); when(mScanDetailCache.getScanDetail(sBSSID1)).thenReturn( getGoogleGuestScanDetail(TEST_RSSI, sBSSID1, sFreq1)); - when(mScanDetailCache.get(sBSSID1)).thenReturn( + when(mScanDetailCache.getScanResult(sBSSID1)).thenReturn( getGoogleGuestScanDetail(TEST_RSSI, sBSSID1, sFreq1).getScanResult()); // This simulates the behavior of roaming to network with |sBSSID1|, |sFreq1|. |