Telecomm: Fix PhoneAccountRegistrarTest
Fix state comparison in PhoneAccountRegistrarTest to actually do
something (and not compare nulls).
Found by Errorprone.
(cherry picked from commit fb7a391bacb1dd12fa38ebe35ecf6891e166e018)
Bug: PhoneAccountRegistrarTest
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest PhoneAccountRegistrarTest
Merged-In: Ied3b3b3e38e3b73a37479dd2bdbac8a3e3fc3228
Change-Id: Ied3b3b3e38e3b73a37479dd2bdbac8a3e3fc3228
diff --git a/tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java b/tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
index 7d9cf88..e688416 100644
--- a/tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
+++ b/tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java
@@ -59,6 +59,7 @@
import java.io.File;
import java.util.Arrays;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import static org.junit.Assert.assertEquals;
@@ -1036,9 +1037,10 @@
PhoneAccountRegistrar.State a, PhoneAccountRegistrar.State b) {
assertEquals(a.defaultOutgoingAccountHandles.size(),
b.defaultOutgoingAccountHandles.size());
- for (int i = 0; i < a.defaultOutgoingAccountHandles.size(); i++) {
- assertDefaultPhoneAccountHandleEquals(a.defaultOutgoingAccountHandles.get(i),
- b.defaultOutgoingAccountHandles.get(i));
+ for (Map.Entry<UserHandle, DefaultPhoneAccountHandle> e :
+ a.defaultOutgoingAccountHandles.entrySet()) {
+ assertDefaultPhoneAccountHandleEquals(e.getValue(),
+ b.defaultOutgoingAccountHandles.get(e.getKey()));
}
assertEquals(a.accounts.size(), b.accounts.size());
for (int i = 0; i < a.accounts.size(); i++) {