commit bf144a88b65748fd3c9999eedf9890c8c293109b
author Hunter Knepshield <hknepshield@google.com> Thu Aug 12 16:22:27 2021 -0700
committer Hunter Knepshield <hknepshield@google.com> Thu Aug 12 16:24:57 2021 -0700
tree 9836e78ff62c6080413a32e57737ab1aefa251b5
parent 437d9141a11bd10a07ce639f5e5f53d209df323e

Fix collection assertions in carrierapi test.

For two subscription grouping tests, we had updated code to use the
wrong assertion for containers. The assertion works for containers with
just one element, but it fails when there are 2+ elements in the
expected iterable.

Bug: 196001870
Test: atest CtsCarrierApiTestCases:CarrierApiTest (on DSDS device
  with CTS-compatible eSIM + pSIM)
Change-Id: I2672080e3aac7bf3c01a62b29fd6d7558362e52b

tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java

diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
index 2472d48..bc813aa 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
@@ -1099,8 +1099,7 @@
                     (sm) -> getSubscriptionIdList(sm.getSubscriptionsInGroup(uuid)));
 
             activeSubGroup.add(subId);
-            assertThat(infoList).hasSize(activeSubGroup.size());
-            assertThat(infoList).containsExactly(activeSubGroup);
+            assertThat(infoList).containsExactlyElementsIn(activeSubGroup);
         } finally {
             removeSubscriptionsFromGroup(uuid);
         }
@@ -1132,8 +1131,7 @@
                 List<Integer> infoList =
                         getSubscriptionIdList(mSubscriptionManager.getSubscriptionsInGroup(uuid));
                 accessibleSubGroup.add(subId);
-                assertThat(infoList).hasSize(accessibleSubGroup.size());
-                assertThat(infoList).containsExactly(accessibleSubGroup);
+                assertThat(infoList).containsExactlyElementsIn(accessibleSubGroup);
             }
         } finally {
             removeSubscriptionsFromGroup(uuid);