LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "cts(wifi): Fix WifiManager.testWifiManagerActions" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-18 19:13:09 +00:00
committed by Android (Google) Code Review
parent 8a16ce5a11 4e474bccdb
commit b061da6df9
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/cts/net/src/android/net/wifi/cts/WifiManagerTest.java
View File

@@ -188,6 +188,7 @@ public class WifiManagerTest extends AndroidTestCase {
private void startScan() throws Exception { private void startScan() throws Exception {
synchronized (mMySync) { synchronized (mMySync) {
mMySync.expectedState = STATE_SCANNING; mMySync.expectedState = STATE_SCANNING;
mScanResults = null;
assertTrue(mWifiManager.startScan()); assertTrue(mWifiManager.startScan());
long timeout = System.currentTimeMillis() + TIMEOUT_MSEC; long timeout = System.currentTimeMillis() + TIMEOUT_MSEC;
while (System.currentTimeMillis() < timeout && mMySync.expectedState == STATE_SCANNING) while (System.currentTimeMillis() < timeout && mMySync.expectedState == STATE_SCANNING)
@@ -239,10 +240,17 @@ public class WifiManagerTest extends AndroidTestCase {
assertTrue(mWifiManager.reconnect()); assertTrue(mWifiManager.reconnect());
assertTrue(mWifiManager.reassociate()); assertTrue(mWifiManager.reassociate());
assertTrue(mWifiManager.disconnect()); assertTrue(mWifiManager.disconnect());
startScan();
setWifiEnabled(false); setWifiEnabled(false);
startScan();
Thread.sleep(DURATION); Thread.sleep(DURATION);
assertTrue(mWifiManager.isScanAlwaysAvailable()); if (mWifiManager.isScanAlwaysAvailable()) {
// Make sure at least one AP is found.
assertNotNull("mScanResult should not be null!", mScanResults);
assertFalse("empty scan results!", mScanResults.isEmpty());
} else {
// Make sure no scan results are available.
assertNull("mScanResult should be null!", mScanResults);
}
final String TAG = "Test"; final String TAG = "Test";
assertNotNull(mWifiManager.createWifiLock(TAG)); assertNotNull(mWifiManager.createWifiLock(TAG));
assertNotNull(mWifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG)); assertNotNull(mWifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG));