Import of Volley from GitHub to AOSP.android-o-mr1-iot-release-1.0.1

Adds android-support-annotations as a runtime dependency in Android.mk.

  - 28588322fa4eca3c1a7922b8a2f7b4a97d5c099a Fix concurrent modification errors in ImageContainer. (#1... by Jeff Davidson <jpd236@cornell.edu>
  - ba3b40457a97b3b3812cb00191b41cb0af4149df Fix unchecked operations in Volley build. (#178) by Jeff Davidson <jpd236@cornell.edu>
  - 62c19019e43a76ba4a084b25548e7fb1cfd4a457 Always close HttpURLConnections in HurlStack. (#176) by Jeff Davidson <jpd236@cornell.edu>
  - 36c80f25a78cf2ba2feb2d697f12f9bbca96bf43 Port dispatcher tests to mockito. (#172) by Jeff Davidson <jpd236@cornell.edu>
  - 15b55093fc8ac86902a745f46a2bdea825e797a3 Cleaning up parameter comments + unnecessary generics. (#... by Jeff Davidson <jpd236@cornell.edu>
  - 6b341755e522f23de149544536b9b69c7b7b8305 Remove all wildcard imports. (#170) by Jeff Davidson <jpd236@cornell.edu>
  - a8424005b3ba6d17fc9e123a2176da702f3ead10 Use actual annotations instead of comments. (#169) by Jeff Davidson <jpd236@cornell.edu>
  - bdc80555aee738235bd33c26878bbe8ce382d795 Apply google-java-format to all code. (#165) by Jeff Davidson <jpd236@cornell.edu>
  - 5307293b15dd0c32f53b8f1fd8c198caa443982e Integrate Volley builds with errorprone. (#162) by Jeff Davidson <jpd236@cornell.edu>
  - fa586029500e6813d654f1b454cd3345b0a43897 Fail Travis builds if snapshot uploading fails. (#163) by Jeff Davidson <jpd236@cornell.edu>
  - 0ebb97e9b0192e879088b38b5992158e99364dc6 Stop publishing bintray-info.json. (#141) by Jeff Davidson <jpd236@cornell.edu>
  - b89dfbd2e6964acfe5561e268300611a83957a15 fix: request time contains RequestQueue blocking time. (#... by dezng <dezng123@gmail.com>
  - c2bfd86596e588c924c2c7e0ae0940053800af5c Guard against illegal argument and OOM exceptions in read... by Joe Bowbeer <joe.bowbeer@gmail.com>
  - fc8ff0423fe9a3af6595088b34f912fb2d920ffb Log fix (#112) by Navid Ht <navid.htb@gmail.com>
  - 47586f0fd42acd5ce09dfc767387df685edfa547 Bump version to 1.1.1-SNAPSHOT. (#123) by Jeff Davidson <jpd236@cornell.edu>
  - 1392f961af17d0f5ba367d8d199a18e5325b882e Update deploy credentials. (#122) by Jeff Davidson <jpd236@cornell.edu>
  - ffe9281709f38f84492ce898603d3ec084326a57 Set project group and version. (#120) by Jeff Davidson <jpd236@cornell.edu>

GitOrigin-RevId: 28588322fa4eca3c1a7922b8a2f7b4a97d5c099a
Change-Id: Ifeea069df2f0a5fd10bc3d4686601c88906ee653

1 files changed, 15 insertions, 11 deletions

diff --git a/src/test/java/com/android/volley/toolbox/AndroidAuthenticatorTest.java b/src/test/java/com/android/volley/toolbox/AndroidAuthenticatorTest.java
index e878658..982eda2 100644
--- a/src/test/java/com/android/volley/toolbox/AndroidAuthenticatorTest.java
+++ b/src/test/java/com/android/volley/toolbox/AndroidAuthenticatorTest.java
@@ -16,6 +16,10 @@
 
 package com.android.volley.toolbox;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AccountManagerFuture;
@@ -26,33 +30,30 @@ import android.os.Bundle;
 import com.android.volley.AuthFailureError;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
 
-import static org.mockito.Mockito.*;
-
 @RunWith(RobolectricTestRunner.class)
 public class AndroidAuthenticatorTest {
-    private AccountManager mAccountManager;
+    @Mock private AccountManager mAccountManager;
+    @Mock private AccountManagerFuture<Bundle> mFuture;
     private Account mAccount;
-    private AccountManagerFuture<Bundle> mFuture;
     private AndroidAuthenticator mAuthenticator;
 
     @Before
     public void setUp() {
-        mAccountManager = mock(AccountManager.class);
-        mFuture = mock(AccountManagerFuture.class);
+        MockitoAnnotations.initMocks(this);
         mAccount = new Account("coolperson", "cooltype");
         mAuthenticator = new AndroidAuthenticator(mAccountManager, mAccount, "cooltype", false);
     }
 
     @Test(expected = AuthFailureError.class)
     public void failedGetAuthToken() throws Exception {
-        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null)).thenReturn(mFuture);
+        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null))
+                .thenReturn(mFuture);
         when(mFuture.getResult()).thenThrow(new AuthenticatorException("sadness!"));
         mAuthenticator.getAuthToken();
     }
@@ -62,7 +63,8 @@ public class AndroidAuthenticatorTest {
         Intent intent = new Intent();
         Bundle bundle = new Bundle();
         bundle.putParcelable(AccountManager.KEY_INTENT, intent);
-        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null)).thenReturn(mFuture);
+        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null))
+                .thenReturn(mFuture);
         when(mFuture.getResult()).thenReturn(bundle);
         when(mFuture.isDone()).thenReturn(true);
         when(mFuture.isCancelled()).thenReturn(false);
@@ -72,7 +74,8 @@ public class AndroidAuthenticatorTest {
     @Test(expected = AuthFailureError.class)
     public void missingAuthToken() throws Exception {
         Bundle bundle = new Bundle();
-        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null)).thenReturn(mFuture);
+        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null))
+                .thenReturn(mFuture);
         when(mFuture.getResult()).thenReturn(bundle);
         when(mFuture.isDone()).thenReturn(true);
         when(mFuture.isCancelled()).thenReturn(false);
@@ -89,7 +92,8 @@ public class AndroidAuthenticatorTest {
     public void goodToken() throws Exception {
         Bundle bundle = new Bundle();
         bundle.putString(AccountManager.KEY_AUTHTOKEN, "monkey");
-        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null)).thenReturn(mFuture);
+        when(mAccountManager.getAuthToken(mAccount, "cooltype", false, null, null))
+                .thenReturn(mFuture);
         when(mFuture.getResult()).thenReturn(bundle);
         when(mFuture.isDone()).thenReturn(true);
         when(mFuture.isCancelled()).thenReturn(false);