diff options
Diffstat (limited to 'tests')
9 files changed, 50 insertions, 46 deletions
diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java index 53353f997..a5850005f 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java @@ -17,22 +17,8 @@ package com.android.server.wifi; import static org.hamcrest.CoreMatchers.not; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.anyInt; -import static org.mockito.Mockito.anyObject; -import static org.mockito.Mockito.anyString; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.eq; -import static org.mockito.Mockito.intThat; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.reset; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; import android.content.Context; import android.content.pm.UserInfo; @@ -51,6 +37,7 @@ import android.os.Process; import android.os.UserHandle; import android.os.UserManager; import android.security.Credentials; +import android.security.KeyStore; import android.support.test.InstrumentationRegistry; import android.test.suitebuilder.annotation.SmallTest; import android.text.TextUtils; @@ -154,6 +141,7 @@ public class WifiConfigManagerTest { private ConfigurationMap mConfiguredNetworks; public byte[] mNetworkHistoryBytes; private MockKeyStore mMockKeyStore; + private KeyStore mKeyStore; /** * Called before each test diff --git a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java index 9fb859d39..a2379330c 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiConnectivityManagerTest.java @@ -35,6 +35,7 @@ import android.net.wifi.WifiScanner.PnoSettings; import android.net.wifi.WifiScanner.ScanListener; import android.net.wifi.WifiScanner.ScanSettings; import android.net.wifi.WifiSsid; +import android.os.SystemClock; import android.os.WorkSource; import android.test.suitebuilder.annotation.SmallTest; @@ -74,7 +75,7 @@ public class WifiConnectivityManagerTest { mWifiScanner, mWifiConfigManager, mWifiInfo, mWifiQNS, mWifiInjector, mLooper.getLooper()); mWifiConnectivityManager.setWifiEnabled(true); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis()); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime()); } /** @@ -339,7 +340,7 @@ public class WifiConnectivityManagerTest { long currentTimeStamp = 0; for (int attempt = 0; attempt < maxAttemptRate; attempt++) { currentTimeStamp += connectionAttemptIntervals; - when(mClock.currentTimeMillis()).thenReturn(currentTimeStamp); + when(mClock.elapsedRealtime()).thenReturn(currentTimeStamp); // Set WiFi to disconnected state to trigger PNO scan mWifiConnectivityManager.handleConnectionStateChanged( WifiConnectivityManager.WIFI_STATE_DISCONNECTED); @@ -347,7 +348,7 @@ public class WifiConnectivityManagerTest { } // Now trigger another connection attempt before the rate interval, this should be // skipped because we've crossed rate limit. - when(mClock.currentTimeMillis()).thenReturn(currentTimeStamp); + when(mClock.elapsedRealtime()).thenReturn(currentTimeStamp); // Set WiFi to disconnected state to trigger PNO scan mWifiConnectivityManager.handleConnectionStateChanged( WifiConnectivityManager.WIFI_STATE_DISCONNECTED); @@ -378,7 +379,7 @@ public class WifiConnectivityManagerTest { long currentTimeStamp = 0; for (int attempt = 0; attempt < maxAttemptRate; attempt++) { currentTimeStamp += connectionAttemptIntervals; - when(mClock.currentTimeMillis()).thenReturn(currentTimeStamp); + when(mClock.elapsedRealtime()).thenReturn(currentTimeStamp); // Set WiFi to disconnected state to trigger PNO scan mWifiConnectivityManager.handleConnectionStateChanged( WifiConnectivityManager.WIFI_STATE_DISCONNECTED); @@ -386,7 +387,7 @@ public class WifiConnectivityManagerTest { } // Now trigger another connection attempt after the rate interval, this should not be // skipped because we should've evicted the older attempt. - when(mClock.currentTimeMillis()).thenReturn( + when(mClock.elapsedRealtime()).thenReturn( currentTimeStamp + connectionAttemptIntervals * 2); // Set WiFi to disconnected state to trigger PNO scan mWifiConnectivityManager.handleConnectionStateChanged( @@ -418,7 +419,7 @@ public class WifiConnectivityManagerTest { long currentTimeStamp = 0; for (int attempt = 0; attempt < maxAttemptRate; attempt++) { currentTimeStamp += connectionAttemptIntervals; - when(mClock.currentTimeMillis()).thenReturn(currentTimeStamp); + when(mClock.elapsedRealtime()).thenReturn(currentTimeStamp); // Set WiFi to disconnected state to trigger PNO scan mWifiConnectivityManager.handleConnectionStateChanged( WifiConnectivityManager.WIFI_STATE_DISCONNECTED); @@ -429,7 +430,7 @@ public class WifiConnectivityManagerTest { for (int attempt = 0; attempt < maxAttemptRate; attempt++) { currentTimeStamp += connectionAttemptIntervals; - when(mClock.currentTimeMillis()).thenReturn(currentTimeStamp); + when(mClock.elapsedRealtime()).thenReturn(currentTimeStamp); // Set WiFi to disconnected state to trigger PNO scan mWifiConnectivityManager.handleConnectionStateChanged( WifiConnectivityManager.WIFI_STATE_DISCONNECTED); @@ -532,7 +533,7 @@ public class WifiConnectivityManagerTest { */ @Test public void checkPeriodicScanIntervalWhenDisconnected() { - when(mClock.currentTimeMillis()).thenReturn(CURRENT_SYSTEM_TIME_MS); + when(mClock.elapsedRealtime()).thenReturn(CURRENT_SYSTEM_TIME_MS); // Set screen to ON mWifiConnectivityManager.handleScreenStateChanged(true); @@ -581,7 +582,7 @@ public class WifiConnectivityManagerTest { */ @Test public void checkPeriodicScanIntervalWhenConnected() { - when(mClock.currentTimeMillis()).thenReturn(CURRENT_SYSTEM_TIME_MS); + when(mClock.elapsedRealtime()).thenReturn(CURRENT_SYSTEM_TIME_MS); // Set screen to ON mWifiConnectivityManager.handleScreenStateChanged(true); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java index 1d8ec43cb..64fee84fc 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiQualifiedNetworkSelectorTest.java @@ -40,6 +40,7 @@ import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiEnterpriseConfig; import android.net.wifi.WifiInfo; import android.net.wifi.WifiSsid; +import android.os.SystemClock; import android.test.suitebuilder.annotation.SmallTest; import android.util.LocalLog; @@ -77,7 +78,7 @@ public class WifiQualifiedNetworkSelectorTest { mWifiQualifiedNetworkSelector.enableVerboseLogging(1); mWifiQualifiedNetworkSelector.setUserPreferredBand(1); mWifiQualifiedNetworkSelector.setWifiNetworkScoreCache(mScoreCache); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis()); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime()); } @After @@ -101,7 +102,7 @@ public class WifiQualifiedNetworkSelectorTest { private List<ScanDetail> getScanDetails(String[] ssids, String[] bssids, int[] frequencies, String[] caps, int[] levels) { List<ScanDetail> scanDetailList = new ArrayList<ScanDetail>(); - long timeStamp = System.currentTimeMillis(); + long timeStamp = mClock.elapsedRealtime(); for (int index = 0; index < ssids.length; index++) { ScanDetail scanDetail = new ScanDetail(WifiSsid.createFromAsciiEncoded(ssids[index]), bssids[index], caps[index], levels[index], frequencies[index], timeStamp, 0); @@ -883,7 +884,7 @@ public class WifiQualifiedNetworkSelectorTest { } //re-enable it - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + WifiQualifiedNetworkSelector.BSSID_BLACKLIST_EXPIRE_TIME); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, false, true, false); @@ -921,6 +922,7 @@ public class WifiQualifiedNetworkSelectorTest { scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); + when(mWifiConfigManager.tryEnableQualifiedNetwork(anyInt())).thenReturn(true); savedConfigs[1].getNetworkSelectionStatus().setNetworkSelectionStatus( WifiConfiguration.NetworkSelectionStatus.NETWORK_SELECTION_TEMPORARY_DISABLED); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, @@ -1144,7 +1146,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiInfo.getBSSID()).thenReturn(bssids[1]); when(mWifiInfo.is24GHz()).thenReturn(false); when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); levels[0] = -50; // if there is QNS, test1 will be chosen scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); @@ -1187,7 +1189,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiInfo.getNetworkId()).thenReturn(1); when(mWifiInfo.getBSSID()).thenReturn(bssids[1]); when(mWifiInfo.is24GHz()).thenReturn(false); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, @@ -1227,7 +1229,7 @@ public class WifiQualifiedNetworkSelectorTest { mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, false, scanDetails, false, false, true, false); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -1271,7 +1273,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiInfo.is24GHz()).thenReturn(false); when(mWifiInfo.is5GHz()).thenReturn(true); when(mWifiConfigManager.isOpenNetwork(savedConfigs[1])).thenReturn(true); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); levels[0] = -60; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); @@ -1322,7 +1324,7 @@ public class WifiQualifiedNetworkSelectorTest { scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); scanResultLinkConfiguration(savedConfigs, scanDetails); when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); WifiConfiguration candidate = mWifiQualifiedNetworkSelector.selectQualifiedNetwork(false, @@ -1366,7 +1368,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiInfo.is5GHz()).thenReturn(true); when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); levels[0] = -60; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); scanResultLinkConfiguration(savedConfigs, scanDetails); @@ -1415,7 +1417,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); levels[0] = -60; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -1462,7 +1464,7 @@ public class WifiQualifiedNetworkSelectorTest { levels[0] = -80 + WifiQualifiedNetworkSelector.SAME_BSSID_AWARD / 4 + WifiQualifiedNetworkSelector.SAME_NETWORK_AWARD / 4 - 1; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(1).getScanResult(); @@ -1508,7 +1510,7 @@ public class WifiQualifiedNetworkSelectorTest { levels[0] = -80 + WifiQualifiedNetworkSelector.SAME_BSSID_AWARD / 4 + WifiQualifiedNetworkSelector.SAME_NETWORK_AWARD / 4 + 1; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); @@ -1559,7 +1561,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); levels[0] = -80 + WifiQualifiedNetworkSelector.SAME_NETWORK_AWARD / 4 - 1; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(1).getScanResult(); @@ -1610,7 +1612,7 @@ public class WifiQualifiedNetworkSelectorTest { when(mWifiConfigManager.getEnableAutoJoinWhenAssociated()).thenReturn(true); levels[0] = -80 + WifiQualifiedNetworkSelector.SAME_BSSID_AWARD / 4 + 1; scanDetails = getScanDetails(ssids, bssids, frequencies, caps, levels); - when(mClock.currentTimeMillis()).thenReturn(System.currentTimeMillis() + 11 * 1000); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime() + 11 * 1000); scanResultLinkConfiguration(savedConfigs, scanDetails); ScanResult chosenScanResult = scanDetails.get(0).getScanResult(); diff --git a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java index bcbf940f3..e0f94ad17 100644 --- a/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java +++ b/tests/wifitests/src/com/android/server/wifi/WifiStateMachineTest.java @@ -348,6 +348,7 @@ public class WifiStateMachineTest { when(mWifiInjector.getWifiLastResortWatchdog()).thenReturn(mWifiLastResortWatchdog); when(mWifiInjector.getPropertyService()).thenReturn(mPropertyService); when(mWifiInjector.getBuildProperties()).thenReturn(mBuildProperties); + when(mWifiInjector.getKeyStore()).thenReturn(mock(KeyStore.class)); FrameworkFacade factory = getFrameworkFacade(); Context context = getContext(); diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java index 15d1465f0..1355961c1 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/BaseWifiScannerImplTest.java @@ -30,6 +30,7 @@ import android.net.wifi.WifiScanner.ScanData; import android.net.wifi.WifiSsid; import android.os.SystemClock; +import com.android.server.wifi.Clock; import com.android.server.wifi.MockAlarmManager; import com.android.server.wifi.MockLooper; import com.android.server.wifi.MockResources; @@ -63,6 +64,7 @@ public abstract class BaseWifiScannerImplTest { MockLooper mLooper; @Mock WifiNative mWifiNative; MockResources mResources; + @Mock Clock mClock; /** * mScanner implementation should be filled in by derived test class @@ -84,6 +86,7 @@ public abstract class BaseWifiScannerImplTest { .thenReturn(mAlarmManager.getAlarmManager()); when(mContext.getResources()).thenReturn(mResources); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime()); } protected Set<Integer> expectedBandScanFreqs(int band) { @@ -386,7 +389,7 @@ public abstract class BaseWifiScannerImplTest { WifiScanner.WIFI_BAND_24_GHZ) .build(); - long approxScanStartUs = SystemClock.elapsedRealtime() * 1000; + long approxScanStartUs = mClock.elapsedRealtime() * 1000; ArrayList<ScanDetail> rawResults = new ArrayList<>(Arrays.asList( new ScanDetail(WifiSsid.createFromAsciiEncoded("TEST AP 1"), "00:00:00:00:00:00", "", -70, 2450, diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java index 7da2bad90..d5ff87797 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/HalWifiScannerTest.java @@ -34,6 +34,6 @@ public class HalWifiScannerTest extends BaseWifiScannerImplTest { new int[]{2400, 2450}, new int[]{5150, 5175}, new int[]{5600, 5650}); - mScanner = new HalWifiScannerImpl(mContext, mWifiNative, mLooper.getLooper()); + mScanner = new HalWifiScannerImpl(mContext, mWifiNative, mLooper.getLooper(), mClock); } } diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java index 4ef8a3f8d..39709f84d 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantPnoScannerTest.java @@ -25,9 +25,11 @@ import static org.mockito.Mockito.*; import android.content.Context; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiScanner; +import android.os.SystemClock; import android.test.suitebuilder.annotation.SmallTest; import com.android.internal.R; +import com.android.server.wifi.Clock; import com.android.server.wifi.MockAlarmManager; import com.android.server.wifi.MockLooper; import com.android.server.wifi.MockResources; @@ -59,6 +61,7 @@ public class SupplicantPnoScannerTest { MockLooper mLooper; @Mock WifiNative mWifiNative; MockResources mResources; + @Mock Clock mClock; SupplicantWifiScannerImpl mScanner; @Before @@ -74,6 +77,7 @@ public class SupplicantPnoScannerTest { when(mContext.getSystemService(Context.ALARM_SERVICE)) .thenReturn(mAlarmManager.getAlarmManager()); when(mContext.getResources()).thenReturn(mResources); + when(mClock.elapsedRealtime()).thenReturn(SystemClock.elapsedRealtime()); } /** @@ -229,12 +233,14 @@ public class SupplicantPnoScannerTest { private void createScannerWithHwPnoScanSupport() { mResources.setBoolean(R.bool.config_wifi_background_scan_support, true); - mScanner = new SupplicantWifiScannerImpl(mContext, mWifiNative, mLooper.getLooper()); + mScanner = + new SupplicantWifiScannerImpl(mContext, mWifiNative, mLooper.getLooper(), mClock); } private void createScannerWithSwPnoScanSupport() { mResources.setBoolean(R.bool.config_wifi_background_scan_support, false); - mScanner = new SupplicantWifiScannerImpl(mContext, mWifiNative, mLooper.getLooper()); + mScanner = + new SupplicantWifiScannerImpl(mContext, mWifiNative, mLooper.getLooper(), mClock); } private WifiNative.PnoSettings createDummyPnoSettings(boolean isConnected) { diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantWifiScannerTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantWifiScannerTest.java index b107f8124..7bf548109 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantWifiScannerTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/SupplicantWifiScannerTest.java @@ -50,7 +50,7 @@ public class SupplicantWifiScannerTest extends BaseWifiScannerImplTest { @Before public void setup() throws Exception { mScanner = new SupplicantWifiScannerImpl(mContext, mWifiNative, - mLooper.getLooper()); + mLooper.getLooper(), mClock); } @Test diff --git a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java index e806f50e2..43dfc5523 100644 --- a/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java +++ b/tests/wifitests/src/com/android/server/wifi/scanner/WifiScanningServiceTest.java @@ -41,6 +41,7 @@ import android.util.Pair; import com.android.internal.app.IBatteryStats; import com.android.internal.util.Protocol; import com.android.server.wifi.BidirectionalAsyncChannel; +import com.android.server.wifi.Clock; import com.android.server.wifi.MockAlarmManager; import com.android.server.wifi.MockAnswerUtil.AnswerWithArguments; import com.android.server.wifi.MockLooper; @@ -101,7 +102,8 @@ public class WifiScanningServiceTest { new int[]{5600, 5650, 5660}); mLooper = new MockLooper(); - when(mWifiScannerImplFactory.create(any(Context.class), any(Looper.class))) + when(mWifiScannerImplFactory + .create(any(Context.class), any(Looper.class), any(Clock.class))) .thenReturn(mWifiScannerImpl); when(mWifiScannerImpl.getChannelHelper()).thenReturn(channelHelper); when(mWifiInjector.getWifiMetrics()).thenReturn(mWifiMetrics); @@ -332,7 +334,8 @@ public class WifiScanningServiceTest { @Test public void loadDriver() throws Exception { startServiceAndLoadDriver(); - verify(mWifiScannerImplFactory, times(1)).create(any(Context.class), any(Looper.class)); + verify(mWifiScannerImplFactory, times(1)) + .create(any(Context.class), any(Looper.class), any(Clock.class)); Handler handler = mock(Handler.class); BidirectionalAsyncChannel controlChannel = connectChannel(handler); |