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

Merge "Add assertion message to assertions for testExecute_withMobile." into lollipop-mr1-cts-dev

Browse Source
This commit is contained in:
Daniel Xie
2016-04-28 16:44:37 +00:00
committed by Gerrit Code Review
parent b996de81cd 51eb8c19a0
commit ce158e65ae
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cts/net/src/android/net/http/cts/ApacheHttpClientTest.java
View File

@@ -146,7 +146,8 @@ public class ApacheHttpClientTest extends AndroidTestCase {
mContext.registerReceiver(receiver, filter); mContext.registerReceiver(receiver, filter);
assertTrue(mWifiManager.setWifiEnabled(true)); assertTrue(mWifiManager.setWifiEnabled(true));
assertTrue("Wifi must be configured to connect to an access point for this test.", assertTrue(
"[RERUN] Wifi must be configured to connect to an access point for this test.",
receiver.waitForStateChange()); receiver.waitForStateChange());
mContext.unregisterReceiver(receiver); mContext.unregisterReceiver(receiver);
@@ -165,9 +166,11 @@ public class ApacheHttpClientTest extends AndroidTestCase {
mContext.registerReceiver(connectMobileReceiver, filter); mContext.registerReceiver(connectMobileReceiver, filter);
mContext.registerReceiver(disconnectWifiReceiver, filter); mContext.registerReceiver(disconnectWifiReceiver, filter);
assertTrue(mWifiManager.setWifiEnabled(false)); assertTrue("Wifi did not disconnect.", mWifiManager.setWifiEnabled(false));
assertTrue(disconnectWifiReceiver.waitForStateChange()); assertTrue("Timeout waiting for wifi to disconnect.",
assertTrue(connectMobileReceiver.waitForStateChange()); disconnectWifiReceiver.waitForStateChange());
assertTrue("[RERUN] Timeout waiting for mobile network. Check signal and SIM.",
connectMobileReceiver.waitForStateChange());
mContext.unregisterReceiver(connectMobileReceiver); mContext.unregisterReceiver(connectMobileReceiver);
mContext.unregisterReceiver(disconnectWifiReceiver); mContext.unregisterReceiver(disconnectWifiReceiver);
@@ -204,7 +207,10 @@ public class ApacheHttpClientTest extends AndroidTestCase {
} }
private boolean hasExpectedState() { private boolean hasExpectedState() {
return mExpectedState == mConnectivityManager.getNetworkInfo(mNetworkType).getState(); NetworkInfo network = mConnectivityManager.getNetworkInfo(mNetworkType);
assertNotNull("Network type should be supported but it is not. Type: " + mNetworkType,
network);
return mExpectedState == network.getState();
} }
} }
} }