[Modularization] Create javatests target in signin.ui module

This CL creates javatests target in signin.ui module and moves confirm
sync data integration tests to the target.

Bug: 1158307
Change-Id: If139ed6453f41189d49ff5640d3f7bfcb91c88e8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2587733Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#837009}

chrome/android/BUILD.gn

@@ -1088,6 +1088,7 @@ android_library("chrome_test_java") {
     "//chrome/browser/signin/services/android:java",
     "//chrome/browser/signin/services/android:javatests",
     "//chrome/browser/signin/ui/android:java",
+    "//chrome/browser/signin/ui/android:javatests",
     "//chrome/browser/tab:java",
     "//chrome/browser/tabmodel:java",
     "//chrome/browser/tabmodel/internal:java",

chrome/android/chrome_test_java_sources.gni

@@ -501,8 +501,6 @@ chrome_test_java_sources = [
   "javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetRenderTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/AccountPickerBottomSheetTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/AccountPickerDialogFragmentTest.java",
-  "javatests/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialogIntegrationTest.java",
-  "javatests/src/org/chromium/chrome/browser/signin/ConfirmSyncDataIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/DummyAccountPickerTargetFragment.java",
   "javatests/src/org/chromium/chrome/browser/signin/IdentityManagerIntegrationTest.java",
   "javatests/src/org/chromium/chrome/browser/signin/SignOutDialogRenderTest.java",

chrome/browser/signin/ui/android/BUILD.gn

@@ -79,3 +79,27 @@ android_library("junit") {
     "//third_party/mockito:mockito_java",
   ]
 }
+
+android_library("javatests") {
+  testonly = true
+  sources = [
+    "java/src/org/chromium/chrome/browser/signin/ui/ConfirmManagedSyncDataDialogIntegrationTest.java",
+    "java/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataIntegrationTest.java",
+  ]
+  deps = [
+    ":java",
+    "//base:base_java",
+    "//base:base_java_test_support",
+    "//chrome/browser/flags:java",
+    "//chrome/browser/profiles/android:java",
+    "//chrome/browser/signin/services/android:java",
+    "//chrome/test/android:chrome_java_test_support",
+    "//content/public/test/android:content_java_test_support",
+    "//third_party/android_deps:androidx_test_runner_java",
+    "//third_party/android_deps:espresso_java",
+    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
+    "//ui/android:ui_java_test_support",
+  ]
+}

chrome/android/javatests/src/org/chromium/chrome/browser/signin/ConfirmManagedSyncDataDialogIntegrationTest.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmManagedSyncDataDialogIntegrationTest.java

@@ -2,7 +2,7 @@
 // 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.signin;
+package org.chromium.chrome.browser.signin.ui;
 
 import static org.mockito.MockitoAnnotations.initMocks;
 
@@ -20,7 +20,6 @@ import org.chromium.base.test.util.ApplicationTestUtils;
 import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
-import org.chromium.chrome.browser.signin.ui.ConfirmManagedSyncDataDialog;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.ui.test.util.DummyUiActivity;
 import org.chromium.ui.test.util.DummyUiActivityTestCase;

chrome/android/javatests/src/org/chromium/chrome/browser/signin/ConfirmSyncDataIntegrationTest.java → chrome/browser/signin/ui/android/java/src/org/chromium/chrome/browser/signin/ui/ConfirmSyncDataIntegrationTest.java

@@ -2,7 +2,7 @@
 // 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.signin;
+package org.chromium.chrome.browser.signin.ui;
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.action.ViewActions.click;
@@ -25,7 +25,6 @@ import static org.mockito.MockitoAnnotations.initMocks;
 import androidx.test.filters.MediumTest;
 
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -33,14 +32,10 @@ import org.mockito.Mock;
 import org.chromium.base.Callback;
 import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CommandLineFlags;
-import org.chromium.base.test.util.JniMocker;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
 import org.chromium.chrome.browser.signin.services.SigninManager;
-import org.chromium.chrome.browser.signin.ui.ConfirmSyncDataStateMachine;
-import org.chromium.chrome.browser.signin.ui.ConfirmSyncDataStateMachineDelegate;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.ui.test.util.DummyUiActivityTestCase;
@@ -65,12 +60,6 @@ public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
     private static final String NEW_ACCOUNT_NAME = "test.account.new@gmail.com";
     private static final String MANAGED_DOMAIN = "managed-domain.com";
 
-    @Rule
-    public final JniMocker mocker = new JniMocker();
-
-    @Mock
-    private SigninManagerImpl.Natives mSigninManagerNativeMock;
-
     @Mock
     private SigninManager mSigninManagerMock;
 
@@ -88,7 +77,6 @@ public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
     @Before
     public void setUp() {
         initMocks(this);
-        mocker.mock(SigninManagerImplJni.TEST_HOOKS, mSigninManagerNativeMock);
         IdentityServicesProvider.setInstanceForTests(mIdentityServicesProviderMock);
         Profile.setLastUsedProfileForTesting(mProfile);
         when(IdentityServicesProvider.get().getSigninManager(any())).thenReturn(mSigninManagerMock);
@@ -123,7 +111,7 @@ public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
     public void testNonManagedAccountToManagedAccountFlow() {
         mockSigninManagerIsAccountManaged(true);
         String managedNewAccountName = "test.account@" + MANAGED_DOMAIN;
-        when(mSigninManagerNativeMock.extractDomainName(managedNewAccountName))
+        when(mSigninManagerMock.extractDomainName(managedNewAccountName))
                 .thenReturn(MANAGED_DOMAIN);
         startConfirmSyncFlow(OLD_ACCOUNT_NAME, managedNewAccountName);
         onView(withId(R.id.sync_confirm_import_choice)).inRoot(isDialog()).perform(click());
@@ -138,7 +126,7 @@ public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
     public void testNonManagedAccountToManagedAccountCancelledFlow() {
         mockSigninManagerIsAccountManaged(true);
         String managedNewAccountName = "test.account@" + MANAGED_DOMAIN;
-        when(mSigninManagerNativeMock.extractDomainName(managedNewAccountName))
+        when(mSigninManagerMock.extractDomainName(managedNewAccountName))
                 .thenReturn(MANAGED_DOMAIN);
         startConfirmSyncFlow(OLD_ACCOUNT_NAME, managedNewAccountName);
         onView(withId(R.id.sync_keep_separate_choice)).inRoot(isDialog()).perform(click());
@@ -164,7 +152,7 @@ public class ConfirmSyncDataIntegrationTest extends DummyUiActivityTestCase {
     public void testNoPreviousAccountToManagedAccountFlow() {
         mockSigninManagerIsAccountManaged(true);
         String managedNewAccountName = "test.account@" + MANAGED_DOMAIN;
-        when(mSigninManagerNativeMock.extractDomainName(managedNewAccountName))
+        when(mSigninManagerMock.extractDomainName(managedNewAccountName))
                 .thenReturn(MANAGED_DOMAIN);
         startConfirmSyncFlow("", managedNewAccountName);
         onView(withText(R.string.policy_dialog_proceed)).inRoot(isDialog()).perform(click());