Revert "Batch BottomSheetControllerTests"

This reverts commit 3c8430ae.

Reason for revert:
https://ci.chromium.org/p/chromium/builders/ci/android-marshmallow-x86-rel/1133

Original change's description:
> Batch BottomSheetControllerTests
> 
> This patch batches all the tests in BottomSheetControllerTest.
> Consequently, some new methods to reset the sheet's state were added
> to the test support classes and BlankCTATabInitialState was updated to
> support any subclass of ChromeActivity.
> 
> Bug: 1122163
> Change-Id: I3fbb73431eff206010d93d8c5e26e4942b84adb8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2377664
> Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
> Commit-Queue: Matthew Jones <mdjones@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#803156}

TBR=mthiesse@chromium.org,mdjones@chromium.org

Change-Id: I41a36c86f34d947b69e00a92109f56f0bfcda760
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1122163
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386500Reviewed-by: Gang Wu <gangwu@chromium.org>
Commit-Queue: Gang Wu <gangwu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803346}

chrome/android/javatests/src/org/chromium/chrome/browser/widget/bottomsheet/BottomSheetControllerTest.java

@@ -15,15 +15,12 @@ import android.view.View;
 import androidx.test.filters.MediumTest;
 import androidx.test.filters.SmallTest;
 
-import org.junit.After;
 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.ThreadUtils;
-import org.chromium.base.test.util.Batch;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Feature;
@@ -38,7 +35,6 @@ import org.chromium.chrome.browser.tab.TabSelectionType;
 import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.chrome.test.ChromeTabbedActivityTestRule;
-import org.chromium.chrome.test.batch.BlankCTATabInitialStateRule;
 import org.chromium.chrome.test.util.ChromeTabUtils;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetContent;
 import org.chromium.components.browser_ui.bottomsheet.BottomSheetController;
@@ -61,17 +57,9 @@ import java.util.concurrent.TimeoutException;
 @RunWith(ChromeJUnit4ClassRunner.class)
 @CommandLineFlags.Add(ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE)
 @Restriction(UiRestriction.RESTRICTION_TYPE_PHONE) // TODO(mdjones): Remove this (crbug.com/837838).
-@Batch(Batch.PER_CLASS)
 public class BottomSheetControllerTest {
-    @ClassRule
-    public static final ChromeTabbedActivityTestRule sActivityTestRule =
-            new ChromeTabbedActivityTestRule();
-
     @Rule
-    public final BlankCTATabInitialStateRule mIninialStateRule =
-            new BlankCTATabInitialStateRule(sActivityTestRule, false);
-
-    private ChromeTabbedActivity mActivity;
+    public ChromeTabbedActivityTestRule mActivityTestRule = new ChromeTabbedActivityTestRule();
 
     private BottomSheetController mSheetController;
     private BottomSheetTestSupport mTestSupport;
@@ -84,42 +72,35 @@ public class BottomSheetControllerTest {
 
     @Before
     public void setUp() throws Exception {
-        mActivity = sActivityTestRule.getActivity();
+        mActivityTestRule.startMainActivityOnBlankPage();
+        final ChromeTabbedActivity activity = mActivityTestRule.getActivity();
 
         ThreadUtils.runOnUiThreadBlocking(() -> {
             BottomSheetTestSupport.setSmallScreen(false);
 
-            mScrimCoordinator =
-                    mActivity.getRootUiCoordinatorForTesting().getScrimCoordinatorForTesting();
+            mScrimCoordinator = mActivityTestRule.getActivity()
+                                        .getRootUiCoordinatorForTesting()
+                                        .getScrimCoordinatorForTesting();
             mScrimCoordinator.disableAnimationForTesting(true);
 
-            mSheetController =
-                    mActivity.getRootUiCoordinatorForTesting().getBottomSheetController();
+            mSheetController = activity.getRootUiCoordinatorForTesting().getBottomSheetController();
             mTestSupport = new BottomSheetTestSupport(mSheetController);
 
             mLowPriorityContent = new TestBottomSheetContent(
-                    mActivity, BottomSheetContent.ContentPriority.LOW, false);
-            mHighPriorityContent = new TestBottomSheetContent(
-                    mActivity, BottomSheetContent.ContentPriority.HIGH, false);
+                    mActivityTestRule.getActivity(), BottomSheetContent.ContentPriority.LOW, false);
+            mHighPriorityContent = new TestBottomSheetContent(mActivityTestRule.getActivity(),
+                    BottomSheetContent.ContentPriority.HIGH, false);
 
             mBackInterceptingContent = new TestBottomSheetContent(
-                    mActivity, BottomSheetContent.ContentPriority.LOW, false);
+                    mActivityTestRule.getActivity(), BottomSheetContent.ContentPriority.LOW, false);
             mBackInterceptingContent.setHandleBackPress(true);
 
-            mPeekableContent = new TestBottomSheetContent(mActivity);
-            mNonPeekableContent = new TestBottomSheetContent(mActivity);
+            mPeekableContent = new TestBottomSheetContent(mActivityTestRule.getActivity());
+            mNonPeekableContent = new TestBottomSheetContent(mActivityTestRule.getActivity());
             mNonPeekableContent.setPeekHeight(BottomSheetContent.HeightMode.DISABLED);
         });
     }
 
-    @After
-    public void tearDown() {
-        ThreadUtils.runOnUiThreadBlocking(() -> {
-            mTestSupport.forceDismissAllContent();
-            mTestSupport.endAllAnimations();
-        });
-    }
-
     @Test
     @SmallTest
     @Feature({"BottomSheetController"})
@@ -225,21 +206,22 @@ public class BottomSheetControllerTest {
     @Feature({"BottomSheetController"})
     public void testSheetHiddenAfterTabSwitcher() throws TimeoutException {
         // Open a second tab and then reselect the original activity tab.
-        Tab tab1 = mActivity.getActivityTab();
-        openNewTabInForeground();
-        Tab tab2 = mActivity.getActivityTab();
+        Tab tab1 = mActivityTestRule.getActivity().getActivityTab();
+        ChromeTabUtils.newTabFromMenu(
+                InstrumentationRegistry.getInstrumentation(), mActivityTestRule.getActivity());
+        Tab tab2 = mActivityTestRule.getActivity().getActivityTab();
 
         requestContentInSheet(mLowPriorityContent, true);
 
         // Enter the tab switcher and select a different tab.
         ThreadUtils.runOnUiThreadBlocking(() -> {
-            mActivity.getLayoutManager().showOverview(false);
+            mActivityTestRule.getActivity().getLayoutManager().showOverview(false);
             mTestSupport.endAllAnimations();
             assertEquals("The bottom sheet should be hidden.",
                     BottomSheetController.SheetState.HIDDEN, mSheetController.getSheetState());
-            mActivity.getTabModelSelector().getCurrentModel().setIndex(
+            mActivityTestRule.getActivity().getTabModelSelector().getCurrentModel().setIndex(
                     0, TabSelectionType.FROM_USER);
-            mActivity.getLayoutManager().hideOverview(false);
+            mActivityTestRule.getActivity().getLayoutManager().hideOverview(false);
             mTestSupport.endAllAnimations();
         });
 
@@ -304,8 +286,9 @@ public class BottomSheetControllerTest {
     @MediumTest
     @Feature({"BottomSheetController"})
     public void testSwitchTabsMultipleTimes() throws TimeoutException {
-        final int originalTabIndex = mActivity.getTabModelSelector().getCurrentModel().indexOf(
-                mActivity.getActivityTab());
+        ChromeTabbedActivity activity = mActivityTestRule.getActivity();
+        final int originalTabIndex =
+                activity.getTabModelSelector().getCurrentModel().indexOf(activity.getActivityTab());
         requestContentInSheet(mLowPriorityContent, true);
 
         assertEquals("The bottom sheet should be peeking.", BottomSheetController.SheetState.PEEK,
@@ -319,7 +302,7 @@ public class BottomSheetControllerTest {
                 mSheetController.getCurrentSheetContent());
 
         ThreadUtils.runOnUiThreadBlocking(() -> {
-            mActivity.getTabModelSelector().getCurrentModel().setIndex(
+            activity.getTabModelSelector().getCurrentModel().setIndex(
                     originalTabIndex, TabSelectionType.FROM_USER);
         });
 
@@ -341,14 +324,14 @@ public class BottomSheetControllerTest {
         requestContentInSheet(mHighPriorityContent, true);
         requestContentInSheet(mLowPriorityContent, false);
 
-        TestBottomSheetContent customLifecycleContent =
-                new TestBottomSheetContent(mActivity, BottomSheetContent.ContentPriority.LOW, true);
+        TestBottomSheetContent customLifecycleContent = new TestBottomSheetContent(
+                mActivityTestRule.getActivity(), BottomSheetContent.ContentPriority.LOW, true);
         requestContentInSheet(customLifecycleContent, false);
         assertEquals(mHighPriorityContent, mSheetController.getCurrentSheetContent());
 
         // Change URL and wait for PageLoadStarted event.
         CallbackHelper pageLoadStartedHelper = new CallbackHelper();
-        Tab tab = mActivity.getActivityTab();
+        Tab tab = mActivityTestRule.getActivity().getActivityTab();
         tab.addObserver(new EmptyTabObserver() {
             @Override
             public void onPageLoadStarted(Tab tab, String url) {
@@ -384,8 +367,8 @@ public class BottomSheetControllerTest {
     @Test
     @MediumTest
     public void testCustomScrimLifecycle() throws TimeoutException {
-        TestBottomSheetContent customScrimContent =
-                new TestBottomSheetContent(mActivity, BottomSheetContent.ContentPriority.LOW, true);
+        TestBottomSheetContent customScrimContent = new TestBottomSheetContent(
+                mActivityTestRule.getActivity(), BottomSheetContent.ContentPriority.LOW, true);
         customScrimContent.setHasCustomScrimLifecycle(true);
         requestContentInSheet(customScrimContent, true);
 
@@ -624,11 +607,11 @@ public class BottomSheetControllerTest {
      */
     private void enterAndExitTabSwitcher() {
         ThreadUtils.runOnUiThreadBlocking(() -> {
-            mActivity.getLayoutManager().showOverview(false);
+            mActivityTestRule.getActivity().getLayoutManager().showOverview(false);
             mTestSupport.endAllAnimations();
             assertEquals("The bottom sheet should be hidden.",
                     BottomSheetController.SheetState.HIDDEN, mSheetController.getSheetState());
-            mActivity.getLayoutManager().hideOverview(false);
+            mActivityTestRule.getActivity().getLayoutManager().hideOverview(false);
             mTestSupport.endAllAnimations();
         });
     }
@@ -638,18 +621,20 @@ public class BottomSheetControllerTest {
      */
     private void openNewTabInBackground() throws TimeoutException {
         CallbackHelper tabSelectedHelper = new CallbackHelper();
-        mActivity.getTabModelSelector().getCurrentModel().addObserver(new TabModelObserver() {
-            @Override
-            public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) {
-                tabSelectedHelper.notifyCalled();
-            }
-        });
+        mActivityTestRule.getActivity().getTabModelSelector().getCurrentModel().addObserver(
+                new TabModelObserver() {
+                    @Override
+                    public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) {
+                        tabSelectedHelper.notifyCalled();
+                    }
+                });
 
         int previousCallCount = tabSelectedHelper.getCallCount();
 
         ThreadUtils.runOnUiThreadBlocking(() -> {
-            mActivity.getTabCreator(false).createNewTab(new LoadUrlParams("about:blank"),
-                    TabLaunchType.FROM_LONGPRESS_BACKGROUND, null);
+            mActivityTestRule.getActivity().getTabCreator(false).createNewTab(
+                    new LoadUrlParams("about:blank"), TabLaunchType.FROM_LONGPRESS_BACKGROUND,
+                    null);
         });
 
         tabSelectedHelper.waitForCallback(previousCallCount, 1);
@@ -660,8 +645,8 @@ public class BottomSheetControllerTest {
      * Open a new tab in front of the active tab and wait for it to be completely loaded.
      */
     private void openNewTabInForeground() {
-        ChromeTabUtils.fullyLoadUrlInNewTab(
-                InstrumentationRegistry.getInstrumentation(), mActivity, "about:blank", false);
+        ChromeTabUtils.fullyLoadUrlInNewTab(InstrumentationRegistry.getInstrumentation(),
+                mActivityTestRule.getActivity(), "about:blank", false);
         ThreadUtils.runOnUiThreadBlocking(() -> mTestSupport.endAllAnimations());
     }
 }

chrome/test/android/javatests/src/org/chromium/chrome/test/batch/BlankCTATabInitialStateRule.java

@@ -22,13 +22,11 @@ import org.chromium.content_public.browser.test.util.TestThreadUtils;
  *
  * State is stored statically, and so the Activity may be reused across multiple test suites within
  * the same {@link Batch}.
- *
- * @param <T> The type of {@link ChromeActivity}.
  */
-public class BlankCTATabInitialStateRule<T extends ChromeActivity> implements TestRule {
+public class BlankCTATabInitialStateRule implements TestRule {
     private static ChromeActivity sActivity;
 
-    private final ChromeActivityTestRule<T> mActivityTestRule;
+    private final ChromeActivityTestRule<ChromeActivity> mActivityTestRule;
     private final boolean mClearAllTabState;
 
     /**
@@ -37,7 +35,7 @@ public class BlankCTATabInitialStateRule<T extends ChromeActivity> implements Te
      *     renderer process between each test.
      */
     public BlankCTATabInitialStateRule(
-            ChromeActivityTestRule<T> activityTestRule, boolean clearAllTabState) {
+            ChromeActivityTestRule<ChromeActivity> activityTestRule, boolean clearAllTabState) {
         super();
         mActivityTestRule = activityTestRule;
         mClearAllTabState = clearAllTabState;
@@ -54,7 +52,7 @@ public class BlankCTATabInitialStateRule<T extends ChromeActivity> implements Te
                     mActivityTestRule.startMainActivityOnBlankPage();
                     sActivity = mActivityTestRule.getActivity();
                 } else {
-                    mActivityTestRule.setActivity((T) sActivity);
+                    mActivityTestRule.setActivity(sActivity);
                     if (mClearAllTabState) {
                         resetTabStateThorough();
                     } else {

components/browser_ui/android/bottomsheet/internal/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetControllerImpl.java

@@ -367,14 +367,6 @@ class BottomSheetControllerImpl implements ManagedBottomSheetController {
         mBottomSheet.endAnimations();
     }
 
-    @VisibleForTesting
-    public void forceDismissAllContent() {
-        clearRequestsAndHide();
-
-        // Handle content that has a custom lifecycle.
-        hideContent(mBottomSheet.getCurrentSheetContent(), /* animate= */ true);
-    }
-
     @Override
     public boolean requestShowContent(BottomSheetContent content, boolean animate) {
         if (mBottomSheet == null) mSheetInitializer.run();

components/browser_ui/android/bottomsheet/test/java/src/org/chromium/components/browser_ui/bottomsheet/BottomSheetTestSupport.java

@@ -99,11 +99,6 @@ public class BottomSheetTestSupport {
         return getBottomSheet().forceScrollingStateForTesting(sheetHeight, yVelocity);
     }
 
-    /** Dismiss all content currently queued in the controller including custom lifecycles. */
-    public void forceDismissAllContent() {
-        mController.forceDismissAllContent();
-    }
-
     /** @return The bottom sheet view. */
     private BottomSheet getBottomSheet() {
         return (BottomSheet) mController.getBottomSheetViewForTesting();