commit a760f21f3a8ce066b444f79d730a11ee86bdc1e9
author Fred Quintana <fredq@google.com> Thu Apr 21 13:21:48 2011 -0700
committer Fred Quintana <fredq@google.com> Thu Apr 21 13:21:48 2011 -0700
tree 0b1025ef6e6addd5884984aedadefbf39dff97ae
parent 518e6f3e932563d8a3ead37d04703ca4e5b0191a

Enhance the options check so that if we expect to see a null
options bundle we accept a non-null but empty bundle as well.

Bug: 4182396
Change-Id: Ic10dc9aa33df01565fcacb8b3aef2852e2b3535b

tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java

diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
index e72e4db..c306c79 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -150,7 +150,9 @@
 
     private void validateOptions(Bundle expectedOptions, Bundle actualOptions) {
         if (expectedOptions == null) {
-            assertNull(actualOptions);
+            if (actualOptions != null) {
+              assertTrue(actualOptions.isEmpty());
+            }
         } else {
             assertNotNull(actualOptions);
             assertEquals(expectedOptions.get(OPTION_NAME_1), actualOptions.get(OPTION_NAME_1));