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

Merge "Moved wi-fi switch to hostside." into nyc-dev

Browse Source
This commit is contained in:
Felipe Leme
2016-04-01 17:40:14 +00:00
committed by Android (Google) Code Review
parent 058f525d35 eac0fe6ab1
commit af092432df
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java
View File

@@ -247,8 +247,9 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
protected void assertDelayedShellCommand(String command, String expectedResult) protected void assertDelayedShellCommand(String command, String expectedResult)
throws Exception { throws Exception {
final int maxTries = 5; final int maxTries = 5;
String result = "";
for (int i = 1; i <= maxTries; i++) { for (int i = 1; i <= maxTries; i++) {
final String result = executeShellCommand(command).trim(); result = executeShellCommand(command).trim();
if (result.equals(expectedResult)) if (result.equals(expectedResult))
return; return;
Log.v(TAG, "Command '" + command + "' returned '" + result + " instead of '" Log.v(TAG, "Command '" + command + "' returned '" + result + " instead of '"
@@ -256,7 +257,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
Thread.sleep(SECOND_IN_MS); Thread.sleep(SECOND_IN_MS);
} }
fail("Command '" + command + "' did not return '" + expectedResult + "' after " + maxTries fail("Command '" + command + "' did not return '" + expectedResult + "' after " + maxTries
+ " attempts"); + " attempts. Last result: '" + result + "'");
} }
protected void setMeteredNetwork() throws Exception { protected void setMeteredNetwork() throws Exception {
@@ -265,6 +266,8 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
if (metered) { if (metered) {
Log.d(TAG, "Active network already metered: " + info); Log.d(TAG, "Active network already metered: " + info);
return; return;
} else {
Log.w(TAG, "Active network not metered: " + info);
} }
final String netId = setWifiMeteredStatus(true); final String netId = setWifiMeteredStatus(true);
assertTrue("Could not set wifi '" + netId + "' as metered (" assertTrue("Could not set wifi '" + netId + "' as metered ("
@@ -274,7 +277,10 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation
} }
protected String setWifiMeteredStatus(boolean metered) throws Exception { protected String setWifiMeteredStatus(boolean metered) throws Exception {
mWfm.setWifiEnabled(true); // We could call setWifiEnabled() here, but it might take sometime to be in a consistent
// state (for example, if one of the saved network is not properly authenticated), so it's
// better to let the hostside test take care of that.
assertTrue("wi-fi is disabled", mWfm.isWifiEnabled());
// TODO: if it's not guaranteed the device has wi-fi, we need to change the tests // TODO: if it's not guaranteed the device has wi-fi, we need to change the tests
// to make the actual verification of restrictions optional. // to make the actual verification of restrictions optional.
final String ssid = mWfm.getConnectionInfo().getSSID(); final String ssid = mWfm.getConnectionInfo().getSSID();

2
tests/cts/hostside/src/com/android/cts/net/HostsideNetworkTestCase.java
View File

@@ -63,6 +63,8 @@ abstract class HostsideNetworkTestCase extends DeviceTestCase implements IAbiRec
assertNotNull(mAbi); assertNotNull(mAbi);
assertNotNull(mCtsBuild); assertNotNull(mCtsBuild);
assertTrue("device not connected to network", getDevice().checkConnectivity());
uninstallPackage(TEST_PKG, false); uninstallPackage(TEST_PKG, false);
installPackage(TEST_APK); installPackage(TEST_APK);
} }