Batch RepostFormWarningTest

Speedup: 28191ms -> 11164ms (60% speedup)

Bug: 1166842
Change-Id: Ifbc1584870be6effa7a47970499d4e1a96836fcf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2630298Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Commit-Queue: David Maunder <davidjm@chromium.org>
Cr-Commit-Position: refs/heads/master@{#844085}

chrome/android/javatests/src/org/chromium/chrome/browser/tab/RepostFormWarningTest.java

@@ -10,13 +10,14 @@ import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 
 import org.hamcrest.Matchers;
-import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Criteria;
 import org.chromium.base.test.util.CriteriaHelper;
@@ -25,6 +26,7 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.flags.ChromeSwitches;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
+import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.content_public.browser.test.util.TestCallbackHelperContainer;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -40,11 +42,17 @@ import java.util.concurrent.TimeoutException;
  */
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE})
+@Batch(Batch.PER_CLASS)
 public class RepostFormWarningTest {
     // Active tab.
 
+    @ClassRule
+    public static ChromeTabbedActivityTestRule sActivityTestRule =
+            new ChromeTabbedActivityTestRule();
+
     @Rule
-    public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
+    public BlankCTATabInitialStateRule mInitialStateRule =
+            new BlankCTATabInitialStateRule(sActivityTestRule, false);
 
     private Tab mTab;
     // Callback helper that manages waiting for pageloads to finish.
@@ -54,16 +62,9 @@ public class RepostFormWarningTest {
 
     @Before
     public void setUp() throws Exception {
-        mActivityTestRule.startMainActivityOnBlankPage();
-
-        mTab = mActivityTestRule.getActivity().getActivityTab();
+        mTab = sActivityTestRule.getActivity().getActivityTab();
         mCallbackHelper = new TestCallbackHelperContainer(mTab.getWebContents());
-        mTestServer = EmbeddedTestServer.createAndStartServer(InstrumentationRegistry.getContext());
-    }
-
-    @After
-    public void tearDown() {
-        mTestServer.stopAndDestroyServer();
+        mTestServer = sActivityTestRule.getTestServer();
     }
 
     /** Verifies that the form resubmission warning is not displayed upon first POST navigation. */
@@ -148,7 +149,8 @@ public class RepostFormWarningTest {
         waitForRepostFormWarningDialog();
 
         TestThreadUtils.runOnUiThreadBlocking(
-                (Runnable) () -> mActivityTestRule.getActivity().getCurrentTabModel().closeTab(mTab));
+                (Runnable) ()
+                        -> sActivityTestRule.getActivity().getCurrentTabModel().closeTab(mTab));
 
         waitForNoReportFormWarningDialog();
     }
@@ -156,7 +158,7 @@ public class RepostFormWarningTest {
     private PropertyModel getCurrentModalDialog() {
         return TestThreadUtils.runOnUiThreadBlockingNoException(
                 ()
-                        -> mActivityTestRule.getActivity()
+                        -> sActivityTestRule.getActivity()
                                    .getModalDialogManager()
                                    .getCurrentDialogForTest());
     }
@@ -174,7 +176,7 @@ public class RepostFormWarningTest {
             Criteria.checkThat("No modal dialog shown", dialogModel, Matchers.notNullValue());
             Criteria.checkThat("Modal dialog is not a HTTP post dialog",
                     dialogModel.get(ModalDialogProperties.TITLE),
-                    Matchers.is(mActivityTestRule.getActivity().getString(
+                    Matchers.is(sActivityTestRule.getActivity().getString(
                             R.string.http_post_warning_title)));
         });
         return getCurrentModalDialog();