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

Merge "Extend CTS test coverage to include registerDefaultNetworkRequest()" into nyc-dev

Browse Source 
am: c2f9d8f

* commit 'c2f9d8f3db67f3802ed9a2cd0e91575674b12d58':
  Extend CTS test coverage to include registerDefaultNetworkRequest()

Change-Id: Id9756021ea4e873b39371870ee4a9130890a58e4
This commit is contained in:
Erik Kline
2016-04-06 09:22:36 +00:00
committed by android-build-merger
parent faf0a62b69 8d422e8c57
commit 77bd264c3b
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java
View File

@@ -265,13 +265,16 @@ public class ConnectivityManagerTest extends AndroidTestCase {
}
// We will register for a WIFI network being available or lost.
NetworkRequest request = new NetworkRequest.Builder()
final NetworkRequest request = new NetworkRequest.Builder()
.addTransportType(NetworkCapabilities.TRANSPORT_WIFI)
.build();
TestNetworkCallback callback = new TestNetworkCallback();
final TestNetworkCallback callback = new TestNetworkCallback();
mCm.registerNetworkCallback(request, callback);
boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
final TestNetworkCallback defaultTrackingCallback = new TestNetworkCallback();
mCm.registerDefaultNetworkCallback(defaultTrackingCallback);
final boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
try {
// Make sure WiFi is connected to an access point to start with.
@@ -284,12 +287,16 @@ public class ConnectivityManagerTest extends AndroidTestCase {
// is registered.
assertTrue("Did not receive NetworkCallback.onAvailable for TRANSPORT_WIFI",
callback.waitForAvailable());
assertTrue("Did not receive NetworkCallback.onAvailable for any default network",
defaultTrackingCallback.waitForAvailable());
} catch (InterruptedException e) {
fail("Broadcast receiver or NetworkCallback wait was interrupted.");
} finally {
mCm.unregisterNetworkCallback(callback);
mCm.unregisterNetworkCallback(defaultTrackingCallback);
// Return WiFI to its original enabled/disabled state.
// Return WiFi to its original enabled/disabled state.
if (!previousWifiEnabledState) {
disconnectFromWifi();
}
@@ -327,7 +334,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
.build();
mCm.registerNetworkCallback(request, pendingIntent);
boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
final boolean previousWifiEnabledState = mWifiManager.isWifiEnabled();
try {
// Make sure WiFi is connected to an access point to start with.
@@ -347,7 +354,7 @@ public class ConnectivityManagerTest extends AndroidTestCase {
pendingIntent.cancel();
mContext.unregisterReceiver(receiver);
// Return WiFI to its original enabled/disabled state.
// Return WiFi to its original enabled/disabled state.
if (!previousWifiEnabledState) {
disconnectFromWifi();
}