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

Merge "CTS WifiManagerTest: Enable scanning if not enabled" into rvc-dev

Browse Source
This commit is contained in:
David Su
2020-03-13 03:49:24 +00:00
committed by Android (Google) Code Review
parent 05dabbbdfd ad61ab46f7
commit 67fe4fa0cc
1 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,6 +66,7 @@ import androidx.test.platform.app.InstrumentationRegistry;
import com.android.compatibility.common.util.PollingCheck;
import com.android.compatibility.common.util.ShellIdentityUtils;
import com.android.compatibility.common.util.SystemUtil;
import com.android.compatibility.common.util.ThrowingRunnable;
import java.io.BufferedReader;
import java.io.IOException;
@@ -76,6 +77,7 @@ import java.net.URL;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.Executor;
import java.util.concurrent.Executors;
@@ -1067,6 +1069,23 @@ public class WifiManagerTest extends AndroidTestCase {
}
}
private void runWithScanningEnabled(ThrowingRunnable r) throws Exception {
boolean wasScanEnabledForTest = false;
if (!mWifiManager.isScanAlwaysAvailable()) {
ShellIdentityUtils.invokeWithShellPermissions(
() -> mWifiManager.setScanAlwaysAvailable(true));
wasScanEnabledForTest = true;
}
try {
r.run();
} finally {
if (wasScanEnabledForTest) {
ShellIdentityUtils.invokeWithShellPermissions(
() -> mWifiManager.setScanAlwaysAvailable(false));
}
}
}
/**
* Verify that Wi-Fi scanning is not turned off when the screen turns off while wifi is disabled
* but location is on.
@@ -1085,17 +1104,16 @@ public class WifiManagerTest extends AndroidTestCase {
fail("Please enable location for this test - since Marshmallow WiFi scan results are"
+ " empty when location is disabled!");
}
if(!mWifiManager.isScanAlwaysAvailable()) {
fail("Please enable Wi-Fi scanning for this test!");
}
setWifiEnabled(false);
turnScreenOn();
assertWifiScanningIsOn();
// Toggle screen and verify Wi-Fi scanning is still on.
turnScreenOff();
assertWifiScanningIsOn();
turnScreenOn();
assertWifiScanningIsOn();
runWithScanningEnabled(() -> {
setWifiEnabled(false);
turnScreenOn();
assertWifiScanningIsOn();
// Toggle screen and verify Wi-Fi scanning is still on.
turnScreenOff();
assertWifiScanningIsOn();
turnScreenOn();
assertWifiScanningIsOn();
});
}
/**
@@ -1115,17 +1133,16 @@ public class WifiManagerTest extends AndroidTestCase {
fail("Please enable location for this test - since Marshmallow WiFi scan results are"
+ " empty when location is disabled!");
}
if(!mWifiManager.isScanAlwaysAvailable()) {
fail("Please enable Wi-Fi scanning for this test!");
}
setWifiEnabled(true);
turnScreenOn();
assertWifiScanningIsOn();
// Toggle screen and verify Wi-Fi scanning is still on.
turnScreenOff();
assertWifiScanningIsOn();
turnScreenOn();
assertWifiScanningIsOn();
runWithScanningEnabled(() -> {
setWifiEnabled(true);
turnScreenOn();
assertWifiScanningIsOn();
// Toggle screen and verify Wi-Fi scanning is still on.
turnScreenOff();
assertWifiScanningIsOn();
turnScreenOn();
assertWifiScanningIsOn();
});
}
/**