From 68f66bffff2299aab6103b8fb01854988430c147 Mon Sep 17 00:00:00 2001 From: Brian Muramatsu Date: Wed, 17 Aug 2011 14:16:48 -0700 Subject: [PATCH] Fix for ConnectivityManagerTest Bug 5178134 Some network types can throw SecurityExceptions and depend on the build configuration. Don't fail the test if those throw exceptions. Change-Id: I5365f85280a348ef1777d05ce50b2dff17a1312f --- .../android/net/cts/ConnectivityManagerTest.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index 3751b3cff0..2db0acbaae 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -35,6 +35,8 @@ import android.net.wifi.WifiManager; import android.test.AndroidTestCase; import android.util.Log; +import java.util.HashSet; +import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -170,12 +172,20 @@ public class ConnectivityManagerTest extends AndroidTestCase { args = {int.class, int.class} ) public void testRequestRouteToHost() { + Set exceptionFreeTypes = new HashSet(); + exceptionFreeTypes.add(ConnectivityManager.TYPE_BLUETOOTH); + exceptionFreeTypes.add(ConnectivityManager.TYPE_ETHERNET); + exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE); + exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_DUN); + exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_HIPRI); + exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_MMS); + exceptionFreeTypes.add(ConnectivityManager.TYPE_MOBILE_SUPL); NetworkInfo[] ni = mCm.getAllNetworkInfo(); for (NetworkInfo n : ni) { - // make sure network is up (except WIFI due to always fail) - if (n.isConnected() && (n.getType() != TYPE_WIFI)) { - assertTrue(mCm.requestRouteToHost(n.getType(), HOST_ADDRESS)); + if (n.isConnected() && exceptionFreeTypes.contains(n.getType())) { + assertTrue("Network type: " + n.getType(), mCm.requestRouteToHost(n.getType(), + HOST_ADDRESS)); } }