Commit b057629f authored by Alice Wang's avatar Alice Wang Committed by Commit Bot

[Android][Test] Fix SigninSignoutIntegrationTest on test-go-phone

This CL fixes SigninSignoutIntegrationTest#testSignIn on test-go-phone.
The test fails in test-go-phone bot because this bot has a small
screen and the positive button is not visible for clicking with
espresso. The fix replaces the espresso click by direct view click.

Bug: 1096806
Change-Id: I30fc423d0fb89fbbed83b6779e9114bf2f4223f0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2322707Reviewed-by: default avatarTanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793067}
parent 9bd653e8
...@@ -48,6 +48,7 @@ import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule; ...@@ -48,6 +48,7 @@ import org.chromium.chrome.test.util.browser.signin.AccountManagerTestRule;
import org.chromium.components.signin.GAIAServiceType; import org.chromium.components.signin.GAIAServiceType;
import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.signin.identitymanager.ConsentLevel;
import org.chromium.components.signin.metrics.SigninAccessPoint; import org.chromium.components.signin.metrics.SigninAccessPoint;
import org.chromium.content_public.browser.test.util.CriteriaHelper;
import org.chromium.content_public.browser.test.util.TestThreadUtils; import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.test.util.DisableAnimationsTestRule; import org.chromium.ui.test.util.DisableAnimationsTestRule;
...@@ -110,16 +111,17 @@ public class SigninSignoutIntegrationTest { ...@@ -110,16 +111,17 @@ public class SigninSignoutIntegrationTest {
public void testSignIn() { public void testSignIn() {
Account account = mAccountManagerTestRule.addAccountAndWaitForSeeding( Account account = mAccountManagerTestRule.addAccountAndWaitForSeeding(
AccountManagerTestRule.TEST_ACCOUNT_EMAIL); AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
ActivityUtils.waitForActivity( SigninActivity signinActivity = ActivityUtils.waitForActivity(
InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> { InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
SigninActivityLauncher.get().launchActivity( SigninActivityLauncher.get().launchActivity(
mActivityTestRule.getActivity(), SigninAccessPoint.SETTINGS); mActivityTestRule.getActivity(), SigninAccessPoint.SETTINGS);
}); });
assertSignedOut(); assertSignedOut();
onView(withId(R.id.positive_button)).perform(click()); TestThreadUtils.runOnUiThreadBlocking(
() -> { signinActivity.findViewById(R.id.positive_button).performClick(); });
CriteriaHelper.pollUiThread(this::assertSignedIn);
verify(mSignInStateObserverMock).onSignedIn(); verify(mSignInStateObserverMock).onSignedIn();
verify(mSignInStateObserverMock, never()).onSignedOut(); verify(mSignInStateObserverMock, never()).onSignedOut();
assertSignedIn();
TestThreadUtils.runOnUiThreadBlocking(() -> { TestThreadUtils.runOnUiThreadBlocking(() -> {
Assert.assertEquals(account.name, Assert.assertEquals(account.name,
mSigninManager.getIdentityManager() mSigninManager.getIdentityManager()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment