Adjust options check based on the current API changes
b/5278759 API changes to pass package, options
Change-Id: Ib2794aefc14f13b9ca8648ebaef301f8b2839ef7
diff --git a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
index 4414617..5315cec 100644
--- a/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
+++ b/tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java
@@ -150,17 +150,21 @@
}
private void validateOptions(Bundle expectedOptions, Bundle actualOptions) {
- if (expectedOptions == null) {
- if (actualOptions != null) {
- assertTrue(actualOptions.isEmpty());
- }
- } else {
+ // In ICS AccountManager may add options to indicate the caller id.
+ // We only validate that the passed in options are present in the actual ones
+ if (expectedOptions != null) {
assertNotNull(actualOptions);
assertEquals(expectedOptions.get(OPTION_NAME_1), actualOptions.get(OPTION_NAME_1));
assertEquals(expectedOptions.get(OPTION_NAME_2), actualOptions.get(OPTION_NAME_2));
}
}
+ private void validateSystemOptions(Bundle options) {
+ assertNotNull(options.getString(AccountManager.KEY_ANDROID_PACKAGE_NAME));
+ assertTrue(options.containsKey(AccountManager.KEY_CALLER_UID));
+ assertTrue(options.containsKey(AccountManager.KEY_CALLER_PID));
+ }
+
private void validateCredentials() {
assertEquals(ACCOUNT, mockAuthenticator.getAccount());
}
@@ -271,6 +275,7 @@
validateAccountAndAuthTokenType();
validateFeatures();
validateOptions(OPTIONS_BUNDLE, mockAuthenticator.mOptionsAddAccount);
+ validateSystemOptions(mockAuthenticator.mOptionsAddAccount);
validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
validateOptions(null, mockAuthenticator.mOptionsGetAuthToken);
@@ -722,7 +727,7 @@
validateOptions(null, mockAuthenticator.mOptionsUpdateCredentials);
validateOptions(null, mockAuthenticator.mOptionsConfirmCredentials);
validateOptions(OPTIONS_BUNDLE, mockAuthenticator.mOptionsGetAuthToken);
-
+ validateSystemOptions(mockAuthenticator.mOptionsGetAuthToken);
}
/**