[Home] Add BottomSheetObserverTest#testSheetContentChanged

chrome/test/android/javatests/src/org/chromium/chrome/test/BottomSheetTestCaseBase.java

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.test;
 
 import static org.chromium.chrome.test.util.ChromeRestriction.RESTRICTION_TYPE_PHONE;
 
 import android.support.v7.widget.RecyclerView;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.Restriction;
 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheet.BottomSheetContent;
+import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetContentController;
 import org.chromium.chrome.test.util.browser.RecyclerViewTestUtils;
 
 /**
  * Base class for instrumentation tests using the bottom sheet.
  */
 @CommandLineFlags.Add({"enable-features=ChromeHome"})
 @Restriction(RESTRICTION_TYPE_PHONE) // ChromeHome is only enabled on phones
 public abstract class BottomSheetTestCaseBase extends ChromeTabbedActivityTestBase {
     /** A handle to the bottom sheet. */
     protected BottomSheet mBottomSheet;
 
+    /** A handle to the bottom seet content controller. */

[gone, 2017/03/21 17:46:51]

sheet, or use the real class name

[Theresa, 2017/03/21 22:29:25]

Done.

+    protected BottomSheetContentController mBottomSheetContentController;
+
     private boolean mOldChromeHomeFlagValue;
     @Override
     protected void setUp() throws Exception {
         // TODO(dgn,mdjones): Chrome restarts when the ChromeHome feature flag value changes. That
         // crashes the test so we need to manually set the preference to match the flag before
         // Chrome initialises via super.setUp()
         ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance();
         mOldChromeHomeFlagValue = prefManager.isChromeHomeEnabled();
         prefManager.setChromeHomeEnabled(true);
 
         super.setUp();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 getActivity().getBottomSheet().setSheetState(
                         BottomSheet.SHEET_STATE_FULL, /* animate = */ false);
             }
         });
         // The default BottomSheetContent is SuggestionsBottomSheetContent, whose content view is a
         // RecyclerView.
         RecyclerViewTestUtils.waitForStableRecyclerView(
                 ((RecyclerView) getBottomSheetContent().getContentView()));
 
         mBottomSheet = getActivity().getBottomSheet();
+        mBottomSheetContentController = getActivity().getBottomSheetContentController();
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 
     @Override
     protected void tearDown() throws Exception {
         super.tearDown();
@@ skipping 23 matching lines @@
             @Override
             public void run() {
                 mBottomSheet.setSheetOffsetFromBottomForTesting(offset);
             }
         });
     }
 
     protected BottomSheetContent getBottomSheetContent() {
         return getActivity().getBottomSheet().getCurrentSheetContent();
     }
+
+    /**
+     * @param itemId The id of the MenuItem corresponding to the {@link BottomSheetContent} to
+     *               select.
+     */
+    protected void selectBottomSheetContent(final int itemId) {
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                mBottomSheetContentController.selectItem(itemId);
+            }
+        });
+    }
 }