commit 922fca939412e1090bf8f240b51057793c9c7bb6
author Fred Quintana <fredq@google.com> Thu Apr 21 13:45:09 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 21 13:45:09 2011 -0700
tree 4cf6824922c030f3a7e64b3e3a081ce36d680ebf
parent 27090c92b75ffa7eef84fdffff81dadaffc8f668
parent a760f21f3a8ce066b444f79d730a11ee86bdc1e9

Merge "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." into gingerbread

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));