Update Robolectric to 3.2.2

chrome/android/junit/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFinderTest.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.payments;
 
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.ResolveInfo;
@@ skipping 20 matching lines @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 /** Tests for the native Android payment app finder. */
 @RunWith(RobolectricTestRunner.class)
 @Config(sdk = 21, manifest = Config.NONE)
 public class AndroidPaymentAppFinderTest {
     public AndroidPaymentAppFinderTest() {}
 
+    /**
+     * Argument matcher that matches Intents using |filterEquals| method.
+     */
+    private static class IntentArgumentMatcher implements ArgumentMatcher<Intent> {
+
+        private Intent mIntent;

[nyquist, 2017/03/16 15:29:50]

Nit: final

[mikecase (-- gone --), 2017/03/16 16:30:40]

Done

+
+        public IntentArgumentMatcher(Intent intent) {
+            this.mIntent = intent;

[nyquist, 2017/03/16 15:29:51]

Nit: Remove |this|

[mikecase (-- gone --), 2017/03/16 16:30:40]

Done.

Also added @Override to matches() and equals() method that I forgot >_<

+        }
+
+        public boolean matches(Intent other) {
+            return mIntent.filterEquals(other);
+        }
+
+        public String toString() {
+            return mIntent.toString();
+        }
+    }
+
     @Test
     public void testNoValidPaymentMethodNames() {
         Set<String> methodNames = new HashSet<>();
         methodNames.add("unknown-payment-method-name");
         methodNames.add("http://not.secure.payment.method.name.com");
         methodNames.add("https://"); // Invalid URI.
         PaymentAppCreatedCallback callback = Mockito.mock(PaymentAppCreatedCallback.class);
 
         AndroidPaymentAppFinder.find(Mockito.mock(WebContents.class), methodNames, false,
                 Mockito.mock(PaymentManifestDownloader.class),
                 Mockito.mock(PaymentManifestParser.class),
                 Mockito.mock(PackageManagerDelegate.class), callback);
 
         Mockito.verify(callback, Mockito.never())
                 .onPaymentAppCreated(Mockito.any(PaymentApp.class));
         Mockito.verify(callback).onAllPaymentAppsCreated();
     }
 
     @Test
     public void testQueryBasicCardsWithoutApps() {
         PackageManagerDelegate packageManagerDelegate = Mockito.mock(PackageManagerDelegate.class);
         Mockito.when(packageManagerDelegate.getActivitiesThatCanRespondToIntent(
-                             new Intent(AndroidPaymentAppFinder.ACTION_PAY_BASIC_CARD)))
+                ArgumentMatchers.argThat(new IntentArgumentMatcher(
+                        new Intent(AndroidPaymentAppFinder.ACTION_PAY_BASIC_CARD)))))
                 .thenReturn(new ArrayList<ResolveInfo>());
         Set<String> methodNames = new HashSet<>();
         methodNames.add(AndroidPaymentAppFinder.BASIC_CARD_PAYMENT_METHOD);
         PaymentAppCreatedCallback callback = Mockito.mock(PaymentAppCreatedCallback.class);
 
         AndroidPaymentAppFinder.find(Mockito.mock(WebContents.class), methodNames, false,
                 Mockito.mock(PaymentManifestDownloader.class),
                 Mockito.mock(PaymentManifestParser.class), packageManagerDelegate, callback);
 
         Mockito.verify(callback, Mockito.never())
@@ skipping 11 matching lines @@
         activities.add(alicePay);
         ResolveInfo bobPay = new ResolveInfo();
         bobPay.activityInfo = new ActivityInfo();
         bobPay.activityInfo.packageName = "com.bobpay.app";
         bobPay.activityInfo.name = "com.bobpay.app.WebPaymentActivity";
         activities.add(bobPay);
         PackageManagerDelegate packageManagerDelegate = Mockito.mock(PackageManagerDelegate.class);
         Mockito.when(packageManagerDelegate.getAppLabel(Mockito.any(ResolveInfo.class)))
                 .thenReturn("A non-empty label");
         Mockito.when(packageManagerDelegate.getActivitiesThatCanRespondToIntent(
-                             new Intent(AndroidPaymentAppFinder.ACTION_PAY_BASIC_CARD)))
+                ArgumentMatchers.argThat(new IntentArgumentMatcher(
+                        new Intent(AndroidPaymentAppFinder.ACTION_PAY_BASIC_CARD)))))
                 .thenReturn(activities);
         Mockito.when(packageManagerDelegate.getServicesThatCanRespondToIntent(
-                             new Intent(AndroidPaymentAppFinder.ACTION_IS_READY_TO_PAY)))
+                ArgumentMatchers.argThat(new IntentArgumentMatcher(
+                        new Intent(AndroidPaymentAppFinder.ACTION_IS_READY_TO_PAY)))))
                 .thenReturn(new ArrayList<ResolveInfo>());
         Set<String> methodNames = new HashSet<>();
         methodNames.add(AndroidPaymentAppFinder.BASIC_CARD_PAYMENT_METHOD);
         PaymentAppCreatedCallback callback = Mockito.mock(PaymentAppCreatedCallback.class);
 
         AndroidPaymentAppFinder.find(Mockito.mock(WebContents.class), methodNames, false,
                 Mockito.mock(PaymentManifestDownloader.class),
                 Mockito.mock(PaymentManifestParser.class), packageManagerDelegate, callback);
 
         Mockito.verify(callback).onPaymentAppCreated(
@@ skipping 29 matching lines @@
         ResolveInfo bobPay = new ResolveInfo();
         bobPay.activityInfo = new ActivityInfo();
         bobPay.activityInfo.packageName = "com.bobpay.app";
         bobPay.activityInfo.name = "com.bobpay.app.WebPaymentActivity";
         activities.add(bobPay);
         Intent bobPayIntent = new Intent("org.chromium.intent.action.PAY");
         bobPayIntent.setData(Uri.parse("https://bobpay.com"));
         PackageManagerDelegate packageManagerDelegate = Mockito.mock(PackageManagerDelegate.class);
         Mockito.when(packageManagerDelegate.getAppLabel(Mockito.any(ResolveInfo.class)))
                 .thenReturn("A non-empty label");
-        Mockito.when(packageManagerDelegate.getActivitiesThatCanRespondToIntent(bobPayIntent))
+        Mockito.when(packageManagerDelegate.getActivitiesThatCanRespondToIntent(
+                ArgumentMatchers.argThat(new IntentArgumentMatcher(bobPayIntent))))
                 .thenReturn(activities);
 
         List<ResolveInfo> services = new ArrayList<>();
         ResolveInfo isBobPayReadyToPay = new ResolveInfo();
         isBobPayReadyToPay.serviceInfo = new ServiceInfo();
         isBobPayReadyToPay.serviceInfo.packageName = "com.bobpay.app";
         isBobPayReadyToPay.serviceInfo.name = "com.bobpay.app.IsReadyToWebPay";
         services.add(isBobPayReadyToPay);
         Intent isReadyToPayIntent = new Intent(AndroidPaymentAppFinder.ACTION_IS_READY_TO_PAY);
-        Mockito.when(packageManagerDelegate.getServicesThatCanRespondToIntent(isReadyToPayIntent))
+        Mockito.when(packageManagerDelegate.getServicesThatCanRespondToIntent(
+                ArgumentMatchers.argThat(new IntentArgumentMatcher(isReadyToPayIntent))))
                 .thenReturn(services);
 
         PackageInfo bobPayPackageInfo = new PackageInfo();
         bobPayPackageInfo.versionCode = 10;
         bobPayPackageInfo.signatures = new Signature[1];
         bobPayPackageInfo.signatures[0] = new Signature("01020304050607080900");
         Mockito.when(packageManagerDelegate.getPackageInfoWithSignatures("com.bobpay.app"))
                 .thenReturn(bobPayPackageInfo);
 
         PaymentManifestDownloader downloader = new PaymentManifestDownloader(null) {
@@ skipping 57 matching lines @@
                 String expectedAppIdentifier) {
             return new Matches(expectedAppIdentifier);
         }
 
         @Override
         public boolean matches(PaymentApp app) {
             return app.getAppIdentifier().equals(mExpectedAppIdentifier);
         }
     }
 }