[Signin][Android] Convert AccountManagerFacadeTest to Robolectric

This CL changes AccountManagerFacadeTest to use
LocalRobolectricTestRunner instead of BaseJUnit4ClassRunner.

Bug: 779568
Change-Id: I2ed4af8c6ee239fbbb8c888cc41259f5ad643cfc
Reviewed-on: https://chromium-review.googlesource.com/846744Reviewed-by: John Budorick <jbudorick@chromium.org>
Reviewed-by: Ted Choc (back but slow, ping me) <tedchoc@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#526669}

BUILD.gn

@@ -290,6 +290,7 @@ group("gn_all") {
       "//chrome/test/vr/perf:motopho_latency_test",
       "//components/invalidation/impl:components_invalidation_impl_junit_tests",
       "//components/policy/android:components_policy_junit_tests",
+      "//components/signin/core/browser/android:components_signin_junit_tests",
       "//content/public/android:content_junit_tests",
       "//content/shell/android:content_shell_apk",
       "//device:device_junit_tests",

chrome/android/BUILD.gn

@@ -519,7 +519,6 @@ android_library("chrome_test_java") {
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
     "//components/signin/core/browser/android:java",
-    "//components/signin/core/browser/android:javatests",
     "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync:sync_java_test_support",
     "//components/sync/android:sync_java",

components/signin/core/browser/android/BUILD.gn

@@ -38,20 +38,16 @@ android_library("java") {
   ]
 }
 
-android_library("javatests") {
-  testonly = true
+junit_binary("components_signin_junit_tests") {
+  java_files = [ "junit/src/org/chromium/components/signin/test/AccountManagerFacadeTest.java" ]
   deps = [
     ":java",
     ":signin_java_test_support",
     "//base:base_java",
     "//base:base_java_test_support",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//third_party/junit",
   ]
-
-  java_files = [ "javatests/src/org/chromium/components/signin/test/AccountManagerFacadeTest.java" ]
 }
 
 android_library("signin_java_test_support") {

components/signin/core/browser/android/javatests/src/org/chromium/components/signin/test/AccountManagerFacadeTest.java → components/signin/core/browser/android/junit/src/org/chromium/components/signin/test/AccountManagerFacadeTest.java

@@ -13,17 +13,20 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
 
-import org.chromium.base.test.BaseJUnit4ClassRunner;
 import org.chromium.components.signin.AccountManagerFacade;
 import org.chromium.components.signin.ProfileDataSource;
 import org.chromium.components.signin.test.util.AccountHolder;
 import org.chromium.components.signin.test.util.FakeAccountManagerDelegate;
+import org.chromium.testing.local.CustomShadowAsyncTask;
+import org.chromium.testing.local.LocalRobolectricTestRunner;
 
 /**
  * Test class for {@link AccountManagerFacade}.
  */
-@RunWith(BaseJUnit4ClassRunner.class)
+@RunWith(LocalRobolectricTestRunner.class)
+@Config(manifest = Config.NONE, shadows = {CustomShadowAsyncTask.class})
 public class AccountManagerFacadeTest {
     @Rule
     public UiThreadTestRule mRule = new UiThreadTestRule();
@@ -89,7 +92,8 @@ public class AccountManagerFacadeTest {
     private Account addTestAccount(String accountName) {
         Account account = AccountManagerFacade.createAccountFromName(accountName);
         AccountHolder holder = AccountHolder.builder(account).alwaysAccept(true).build();
-        mDelegate.addAccountHolderBlocking(holder);
+        mDelegate.addAccountHolderExplicitly(holder);
+        Assert.assertFalse(AccountManagerFacade.get().isUpdatePending());
         return account;
     }
 }

testing/buildbot/chromium.android.json

@@ -2388,6 +2388,9 @@
       {
         "test": "components_policy_junit_tests"
       },
+      {
+        "test": "components_signin_junit_tests"
+      },
       {
         "test": "components_variations_junit_tests"
       },
@@ -4065,6 +4068,9 @@
       {
         "test": "components_policy_junit_tests"
       },
+      {
+        "test": "components_signin_junit_tests"
+      },
       {
         "test": "components_variations_junit_tests"
       },

testing/buildbot/gn_isolate_map.pyl

@@ -359,6 +359,10 @@
     "label": "//components/policy/android:components_policy_junit_tests",
     "type": "junit_test",
   },
+  "components_signin_junit_tests": {
+    "label": "//components/signin/core/browser/android:components_signin_junit_tests",
+    "type": "junit_test",
+  },
   "components_unittests": {
     "label": "//components:components_unittests",
     "type": "windowed_test_launcher",

testing/buildbot/test_suites.pyl

@@ -441,6 +441,7 @@
     'components_gcm_driver_junit_tests': {},
     'components_invalidation_impl_junit_tests': {},
     'components_policy_junit_tests': {},
+    'components_signin_junit_tests': {},
     'components_web_restrictions_junit_tests': {},
     'components_variations_junit_tests': {},
     'content_junit_tests': {},