diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-25 17:23:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-25 17:23:35 +0000 |
| commit | b7072d6c59ff67573155a0abb3a13c554dc80fa3 (patch) | |
| tree | 263464a574277312ba11339ff9cdcba4a891d2f3 /tests | |
| parent | 74a518bca1f2818f20e0b93d68d395fd77e43ecc (diff) | |
| parent | 47678c136b1f88be3d04d89aa5898e77fa1862a3 (diff) | |
Merge "ScanDetailCache cleanup" into oc-mr1-dev
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 a85e5740b..70f660e8e 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); } @@ -3990,7 +3990,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 4623fe7d4..c63db86e1 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); @@ -1822,7 +1822,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|. @@ -1850,7 +1850,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|. |