commit 3c3279583b0355d89fa67f82105c98d148197969
author Leslie Watkins <lesliewatkins@google.com> Tue Jan 25 16:14:37 2022 -0800
committer Leslie Watkins <lesliewatkins@google.com> Wed Jan 26 13:34:58 2022 -0800
tree beb7494b55028df88996c92e4933492c5adf85f1
parent 8413b64a4e395ef84ea4f2f61712be0772ddeef4

CTS tests for getChipIds->getChipInfos change

Test: atest CtsUwbTestCases
Bug: 215395362
Change-Id: Id76b238119faaaef96343ee5e19a00ec6bb2b08a

tests/cts/tests/Android.bp

diff --git a/tests/cts/tests/Android.bp b/tests/cts/tests/Android.bp
index 33b8441..7f793d9 100644
--- a/tests/cts/tests/Android.bp
+++ b/tests/cts/tests/Android.bp
@@ -18,7 +18,10 @@
 
 android_test {
     name: "CtsUwbTestCases",
-    defaults: ["cts_defaults", "framework-uwb-cts-defaults"],
+    defaults: [
+        "cts_defaults",
+        "framework-uwb-cts-defaults",
+    ],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
@@ -31,6 +34,7 @@
         "ctstestrunner-axt",
         "compatibility-device-util-axt",
         "mockito-target-minus-junit4",
+        "com.uwb.support.multichip",
     ],
     srcs: ["src/**/*.java"],
     platform_apis: true,

tests/cts/tests/src/android/uwb/cts/UwbManagerTest.java

diff --git a/tests/cts/tests/src/android/uwb/cts/UwbManagerTest.java b/tests/cts/tests/src/android/uwb/cts/UwbManagerTest.java
index 303e2c2..614db70 100644
--- a/tests/cts/tests/src/android/uwb/cts/UwbManagerTest.java
+++ b/tests/cts/tests/src/android/uwb/cts/UwbManagerTest.java
@@ -51,6 +51,8 @@
 
 import com.android.compatibility.common.util.ShellIdentityUtils;
 
+import com.google.uwb.support.multichip.ChipInfoParams;
+
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
@@ -142,14 +144,15 @@
     }
 
     @Test
-    public void testGetChipIds() {
+    public void testGetChipInfos() {
         UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
         try {
             // Needs UWB_PRIVILEGED permission which is held by shell.
             uiAutomation.adoptShellPermissionIdentity();
-            List<String> chipIds = mUwbManager.getChipIds();
-            assertThat(chipIds).isNotEmpty();
-            assertThat(chipIds).contains(mDefaultChipId);
+            List<PersistableBundle> chipInfos = mUwbManager.getChipInfos();
+            assertThat(chipInfos).hasSize(1);
+            ChipInfoParams chipInfoParams = ChipInfoParams.fromBundle(chipInfos.get(0));
+            assertThat(chipInfoParams.getChipId()).isEqualTo(mDefaultChipId);
         } finally {
             uiAutomation.dropShellPermissionIdentity();
         }
@@ -317,9 +320,9 @@
     }
 
     @Test
-    public void testChipIdsWithoutUwbPrivileged() {
+    public void testGetChipInfosWithoutUwbPrivileged() {
         try {
-            mUwbManager.getChipIds();
+            mUwbManager.getChipInfos();
             // should fail if the call was successful without UWB_PRIVILEGED permission.
             fail();
         } catch (SecurityException e) {