From 2fa6e7ce432764b477683b78f8a949509a975527 Mon Sep 17 00:00:00 2001 From: bohu Date: Wed, 16 Nov 2016 17:22:47 -0800 Subject: [PATCH] CTS: skip wifi related net test if no such feature When a device does not have wifi feature, we should skip wifi related net tests. BUG: 31806034 Change-Id: I9867342c47499efc855a50a67a04177fa94e83e5 --- .../src/android/net/cts/ConnectivityManagerTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index b8478d246b..185ebfa0fc 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -387,6 +387,10 @@ public class ConnectivityManagerTest extends AndroidTestCase { * Tests reporting of connectivity changed. */ public void testConnectivityChanged_manifestRequestOnly_shouldNotReceiveIntent() { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + Log.i(TAG, "testConnectivityChanged_manifestRequestOnly_shouldNotReceiveIntent cannot execute unless device supports WiFi"); + return; + } ConnectivityReceiver.prepare(); toggleWifi(); @@ -400,6 +404,10 @@ public class ConnectivityManagerTest extends AndroidTestCase { } public void testConnectivityChanged_whenRegistered_shouldReceiveIntent() { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + Log.i(TAG, "testConnectivityChanged_whenRegistered_shouldReceiveIntent cannot execute unless device supports WiFi"); + return; + } ConnectivityReceiver.prepare(); ConnectivityReceiver receiver = new ConnectivityReceiver(); IntentFilter filter = new IntentFilter(); @@ -416,6 +424,10 @@ public class ConnectivityManagerTest extends AndroidTestCase { public void testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent() throws InterruptedException { + if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + Log.i(TAG, "testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent cannot execute unless device supports WiFi"); + return; + } Intent startIntent = new Intent(); startIntent.setComponent(new ComponentName("android.net.cts.appForApi23", "android.net.cts.appForApi23.ConnectivityListeningActivity"));