am 77d482d6: Merge "New CTS test for ConnectivityManager.getActiveNetwork." into mnc-dev

* commit '77d482d6b3b211acb60fc9e1a4671a88fcfde713':
  New CTS test for ConnectivityManager.getActiveNetwork.
This commit is contained in:
Jim Guggemos
2015-07-16 13:16:01 +00:00
committed by Android Git Automerger

View File

@@ -22,6 +22,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkConfig; import android.net.NetworkConfig;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.NetworkInfo.DetailedState; import android.net.NetworkInfo.DetailedState;
@@ -129,6 +130,17 @@ public class ConnectivityManagerTest extends AndroidTestCase {
assertTrue(ni.getState() == State.CONNECTED); assertTrue(ni.getState() == State.CONNECTED);
} }
public void testGetActiveNetwork() {
Network network = mCm.getActiveNetwork();
assertTrue("You must have an active network connection to complete CTS", network != null);
NetworkInfo ni = mCm.getNetworkInfo(network);
assertTrue("Network returned from getActiveNetwork was invalid", ni != null);
// Similar to testGetActiveNetworkInfo above.
assertTrue(ConnectivityManager.isNetworkTypeValid(ni.getType()));
assertTrue(ni.getState() == State.CONNECTED);
}
public void testGetNetworkInfo() { public void testGetNetworkInfo() {
for (int type = -1; type <= ConnectivityManager.MAX_NETWORK_TYPE+1; type++) { for (int type = -1; type <= ConnectivityManager.MAX_NETWORK_TYPE+1; type++) {
if (isSupported(type)) { if (isSupported(type)) {