Commit 804f0bbd authored by Tanmoy Mollik's avatar Tanmoy Mollik Committed by Commit Bot

[Test] Enable disabled test in BookmarkPromoRenderTest

This cl enables testPersonalizedSigninPromoInBookmarkPage test that was
flaky because force promo state update was removed.

Bug: 1133426
Change-Id: I3c859150e847a996cd5b025dfb0196d4259165ee
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2527134Reviewed-by: default avatarBoris Sazonov <bsazonov@chromium.org>
Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827230}
parent ba817249
...@@ -22,7 +22,6 @@ import org.chromium.base.test.params.ParameterAnnotations; ...@@ -22,7 +22,6 @@ import org.chromium.base.test.params.ParameterAnnotations;
import org.chromium.base.test.params.ParameterizedRunner; import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.CommandLineFlags; import org.chromium.base.test.util.CommandLineFlags;
import org.chromium.base.test.util.DisableIf; import org.chromium.base.test.util.DisableIf;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature; import org.chromium.base.test.util.Feature;
import org.chromium.chrome.R; import org.chromium.chrome.R;
import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.flags.ChromeSwitches;
...@@ -82,7 +81,6 @@ public class BookmarkPersonalizedPromoRenderTest { ...@@ -82,7 +81,6 @@ public class BookmarkPersonalizedPromoRenderTest {
public void setUp() { public void setUp() {
// Native side needs to loaded before signing in test account. // Native side needs to loaded before signing in test account.
mActivityTestRule.startMainActivityOnBlankPage(); mActivityTestRule.startMainActivityOnBlankPage();
mAccountManagerTestRule.addTestAccountThenSigninAndEnableSync();
TestThreadUtils.runOnUiThreadBlocking(() -> { TestThreadUtils.runOnUiThreadBlocking(() -> {
BookmarkModel bookmarkModel = new BookmarkModel(Profile.getLastUsedRegularProfile()); BookmarkModel bookmarkModel = new BookmarkModel(Profile.getLastUsedRegularProfile());
bookmarkModel.loadFakePartnerBookmarkShimForTesting(); bookmarkModel.loadFakePartnerBookmarkShimForTesting();
...@@ -102,11 +100,11 @@ public class BookmarkPersonalizedPromoRenderTest { ...@@ -102,11 +100,11 @@ public class BookmarkPersonalizedPromoRenderTest {
@Test @Test
@MediumTest @MediumTest
@DisabledTest(message = "crbug.com/1136534")
@Feature("RenderTest") @Feature("RenderTest")
@ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class) @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
public void testPersonalizedSigninPromoInBookmarkPage(boolean nightModeEnabled) public void testPersonalizedSigninPromoInBookmarkPage(boolean nightModeEnabled)
throws Exception { throws Exception {
mAccountManagerTestRule.addAccount(AccountManagerTestRule.TEST_ACCOUNT_EMAIL);
BookmarkPromoHeader.forcePromoStateForTests( BookmarkPromoHeader.forcePromoStateForTests(
BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED); BookmarkPromoHeader.PromoState.PROMO_SIGNIN_PERSONALIZED);
mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity()); mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity());
...@@ -118,6 +116,7 @@ public class BookmarkPersonalizedPromoRenderTest { ...@@ -118,6 +116,7 @@ public class BookmarkPersonalizedPromoRenderTest {
@Feature("RenderTest") @Feature("RenderTest")
@ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class) @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class)
public void testPersonalizedSyncPromoInBookmarkPage(boolean nightModeEnabled) throws Exception { public void testPersonalizedSyncPromoInBookmarkPage(boolean nightModeEnabled) throws Exception {
mAccountManagerTestRule.addTestAccountThenSignin();
BookmarkPromoHeader.forcePromoStateForTests( BookmarkPromoHeader.forcePromoStateForTests(
BookmarkPromoHeader.PromoState.PROMO_SYNC_PERSONALIZED); BookmarkPromoHeader.PromoState.PROMO_SYNC_PERSONALIZED);
mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity()); mBookmarkTestRule.showBookmarkManager(mActivityTestRule.getActivity());
......
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