Commit e8c75029 authored by Alice Wang's avatar Alice Wang Committed by Chromium LUCI CQ

[Android][Test] Test SigninStartAccessPoint logging

This CL adds tests to check SigninStartAccessPoint logging.

Bug: 1163476
Change-Id: I35ff0b27780d537e97109dc3f0fa71c2785a6ad1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611716Reviewed-by: default avatarTanmoy Mollik <triploblastic@chromium.org>
Commit-Queue: Alice Wang <aliceywang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#840665}
parent 52ae34fe
...@@ -44,6 +44,7 @@ import org.chromium.base.test.util.CommandLineFlags; ...@@ -44,6 +44,7 @@ import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.CriteriaHelper; import org.chromium.base.test.util.CriteriaHelper;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.Matchers; import org.chromium.base.test.util.Matchers;
import org.chromium.base.test.util.MetricsUtils.HistogramDelta;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.firstrun.FirstRunPageDelegate; import org.chromium.chrome.browser.firstrun.FirstRunPageDelegate;
import org.chromium.chrome.browser.firstrun.SigninFirstRunFragment; import org.chromium.chrome.browser.firstrun.SigninFirstRunFragment;
...@@ -183,6 +184,8 @@ public class SigninFragmentTest { ...@@ -183,6 +184,8 @@ public class SigninFragmentTest {
@LargeTest @LargeTest
@Feature("RenderTest") @Feature("RenderTest")
public void testSigninFragmentForcedSigninWithRegularChild() throws IOException { public void testSigninFragmentForcedSigninWithRegularChild() throws IOException {
HistogramDelta startPageHistogram =
new HistogramDelta("Signin.SigninStartedAccessPoint", SigninAccessPoint.START_PAGE);
CoreAccountInfo accountInfo = mSyncTestRule.addTestAccount(); CoreAccountInfo accountInfo = mSyncTestRule.addTestAccount();
CustomSigninFirstRunFragment fragment = new CustomSigninFirstRunFragment(); CustomSigninFirstRunFragment fragment = new CustomSigninFirstRunFragment();
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
...@@ -201,7 +204,7 @@ public class SigninFragmentTest { ...@@ -201,7 +204,7 @@ public class SigninFragmentTest {
.commit(); .commit();
}); });
ApplicationTestUtils.waitForActivityState(mActivityTestRule.getActivity(), Stage.RESUMED); ApplicationTestUtils.waitForActivityState(mActivityTestRule.getActivity(), Stage.RESUMED);
Assert.assertEquals(1, startPageHistogram.getDelta());
mRenderTestRule.render(mActivityTestRule.getActivity().findViewById(android.R.id.content), mRenderTestRule.render(mActivityTestRule.getActivity().findViewById(android.R.id.content),
"signin_fragment_forced_signin_with_regular_child"); "signin_fragment_forced_signin_with_regular_child");
} }
...@@ -235,6 +238,8 @@ public class SigninFragmentTest { ...@@ -235,6 +238,8 @@ public class SigninFragmentTest {
@Test @Test
@MediumTest @MediumTest
public void testSigninFragmentWithDefaultFlow() { public void testSigninFragmentWithDefaultFlow() {
HistogramDelta settingsHistogram =
new HistogramDelta("Signin.SigninStartedAccessPoint", SigninAccessPoint.SETTINGS);
mSigninActivity = ActivityUtils.waitForActivity( mSigninActivity = ActivityUtils.waitForActivity(
InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> { InstrumentationRegistry.getInstrumentation(), SigninActivity.class, () -> {
SigninActivityLauncherImpl.get().launchActivity( SigninActivityLauncherImpl.get().launchActivity(
...@@ -242,11 +247,14 @@ public class SigninFragmentTest { ...@@ -242,11 +247,14 @@ public class SigninFragmentTest {
}); });
onView(withId(R.id.positive_button)).check(matches(withText(R.string.signin_add_account))); onView(withId(R.id.positive_button)).check(matches(withText(R.string.signin_add_account)));
onView(withId(R.id.negative_button)).check(matches(withText(R.string.cancel))); onView(withId(R.id.negative_button)).check(matches(withText(R.string.cancel)));
Assert.assertEquals(1, settingsHistogram.getDelta());
} }
@Test @Test
@MediumTest @MediumTest
public void testSelectNonDefaultAccountInAccountPickerDialog() { public void testSelectNonDefaultAccountInAccountPickerDialog() {
HistogramDelta bookmarkHistogram = new HistogramDelta(
"Signin.SigninStartedAccessPoint", SigninAccessPoint.BOOKMARK_MANAGER);
CoreAccountInfo defaultAccountInfo = mSyncTestRule.addTestAccount(); CoreAccountInfo defaultAccountInfo = mSyncTestRule.addTestAccount();
String nonDefaultAccountName = "test.account.nondefault@gmail.com"; String nonDefaultAccountName = "test.account.nondefault@gmail.com";
mSyncTestRule.addAccount(nonDefaultAccountName); mSyncTestRule.addAccount(nonDefaultAccountName);
...@@ -264,6 +272,7 @@ public class SigninFragmentTest { ...@@ -264,6 +272,7 @@ public class SigninFragmentTest {
// not shown anymore. // not shown anymore.
onView(withText(defaultAccountInfo.getEmail())).check(doesNotExist()); onView(withText(defaultAccountInfo.getEmail())).check(doesNotExist());
onView(withText(nonDefaultAccountName)).check(matches(isDisplayed())); onView(withText(nonDefaultAccountName)).check(matches(isDisplayed()));
Assert.assertEquals(1, bookmarkHistogram.getDelta());
} }
private ViewAction clickOnClickableSpan() { private ViewAction clickOnClickableSpan() {
......
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