diff options
author | Ficus Kirkpatrick <ficus@android.com> | 2015-02-18 18:14:45 -0800 |
---|---|---|
committer | Ficus Kirkpatrick <ficus@android.com> | 2015-02-19 19:11:34 -0800 |
commit | 6c9de79451d6f9410c006e4b17d3d07fae12b273 (patch) | |
tree | f16c5c7815bde80e4974a997ad9989a49dc7343b /src/main | |
parent | bc57e129fb55278b03503e1e4f61f3b51853f974 (diff) | |
download | volley-6c9de79451d6f9410c006e4b17d3d07fae12b273.tar.gz |
A little work on unit testing.
Add emma and mockito to the Maven build, and test a
couple random things.
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java b/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java index 371fd83..bdf7091 100644 --- a/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java +++ b/src/main/java/com/android/volley/toolbox/AndroidAuthenticator.java @@ -30,7 +30,7 @@ import android.os.Bundle; * tokens of a specified type for a specified account. */ public class AndroidAuthenticator implements Authenticator { - private final Context mContext; + private final AccountManager mAccountManager; private final Account mAccount; private final String mAuthTokenType; private final boolean mNotifyAuthFailure; @@ -54,7 +54,13 @@ public class AndroidAuthenticator implements Authenticator { */ public AndroidAuthenticator(Context context, Account account, String authTokenType, boolean notifyAuthFailure) { - mContext = context; + this(AccountManager.get(context), account, authTokenType, notifyAuthFailure); + } + + // Visible for testing. Allows injection of a mock AccountManager. + AndroidAuthenticator(AccountManager accountManager, Account account, + String authTokenType, boolean notifyAuthFailure) { + mAccountManager = accountManager; mAccount = account; mAuthTokenType = authTokenType; mNotifyAuthFailure = notifyAuthFailure; @@ -71,8 +77,7 @@ public class AndroidAuthenticator implements Authenticator { @SuppressWarnings("deprecation") @Override public String getAuthToken() throws AuthFailureError { - final AccountManager accountManager = AccountManager.get(mContext); - AccountManagerFuture<Bundle> future = accountManager.getAuthToken(mAccount, + AccountManagerFuture<Bundle> future = mAccountManager.getAuthToken(mAccount, mAuthTokenType, mNotifyAuthFailure, null, null); Bundle result; try { @@ -97,6 +102,6 @@ public class AndroidAuthenticator implements Authenticator { @Override public void invalidateAuthToken(String authToken) { - AccountManager.get(mContext).invalidateAuthToken(mAccount.type, authToken); + mAccountManager.invalidateAuthToken(mAccount.type, authToken); } } |