commit 41033a65d4949848097161bcecc9b36145e3c83d
author Robin Lee <rgl@google.com> Sat Jun 06 21:41:42 2020 +0000
committer Robin Lee <rgl@google.com> Mon Jun 08 23:40:02 2020 +0200
tree 58733e4d1361a1756972f262e8364b8139f2ca7a
parent dd6e7fffce37867dba429b4884e2d30273d1657e

Gate CompanionDeviceManagerTest behind an assumeTrue

Change-Id: I7214a075b0f28d2f4e3e6c0df353099f5df40e18
Test: atest CompanionDeviceManagerTest
Bug: 158100917

tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt

diff --git a/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt b/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt
index 4517327..773551b 100644
--- a/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt
+++ b/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt
@@ -17,23 +17,31 @@
 package android.os.cts
 
 import android.companion.CompanionDeviceManager
+import android.content.pm.PackageManager.FEATURE_COMPANION_DEVICE_SETUP
 import android.net.MacAddress
 import android.platform.test.annotations.AppModeFull
 import android.test.InstrumentationTestCase
+import androidx.test.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
 import com.android.compatibility.common.util.SystemUtil.runShellCommand
 import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
 import com.android.compatibility.common.util.ThrowingSupplier
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
 
 const val COMPANION_APPROVE_WIFI_CONNECTIONS =
         "android.permission.COMPANION_APPROVE_WIFI_CONNECTIONS"
 const val DUMMY_MAC_ADDRESS = "00:00:00:00:00:10"
 const val MANAGE_COMPANION_DEVICES = "android.permission.MANAGE_COMPANION_DEVICES"
 const val SHELL_PACKAGE_NAME = "com.android.shell"
-val InstrumentationTestCase.context get() = instrumentation.context
+val InstrumentationTestCase.context get() = InstrumentationRegistry.getTargetContext()
 
 /**
  * Test for [CompanionDeviceManager]
  */
+@RunWith(AndroidJUnit4::class)
 class CompanionDeviceManagerTest : InstrumentationTestCase() {
 
     val cdm by lazy { context.getSystemService(CompanionDeviceManager::class.java) }
@@ -58,7 +66,13 @@
         }, *permissions)
     }
 
+    @Before
+    fun assumeHasFeature() {
+        assumeTrue(context.packageManager.hasSystemFeature(FEATURE_COMPANION_DEVICE_SETUP))
+    }
+
     @AppModeFull(reason = "Companion API for non-instant apps only")
+    @Test
     fun testIsDeviceAssociated() {
         val userId = context.userId
         val packageName = context.packageName
@@ -78,6 +92,7 @@
     }
 
     @AppModeFull(reason = "Companion API for non-instant apps only")
+    @Test
     fun testIsDeviceAssociatedWithCompanionApproveWifiConnectionsPermission() {
         assertTrue(isCdmAssociated(
             DUMMY_MAC_ADDRESS, SHELL_PACKAGE_NAME, MANAGE_COMPANION_DEVICES,