| Index: chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
|
| diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
|
| index 6f5535fe27269423275236ddf4da18d007bc6609..3f41df398fa845f7d62290a91ef11f372d419348 100644
|
| --- a/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
|
| +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/bookmarks/BookmarkTest.java
|
| @@ -21,6 +21,7 @@ import org.chromium.chrome.R;
|
| import org.chromium.chrome.browser.ChromeActivity;
|
| import org.chromium.chrome.browser.UrlConstants;
|
| import org.chromium.chrome.browser.bookmarks.BookmarkBridge.BookmarkItem;
|
| +import org.chromium.chrome.browser.widget.selection.SelectableListToolbar;
|
| import org.chromium.chrome.test.ChromeActivityTestCaseBase;
|
| import org.chromium.chrome.test.util.ActivityUtils;
|
| import org.chromium.chrome.test.util.BookmarkTestUtil;
|
| @@ -172,12 +173,47 @@ public class BookmarkTest extends ChromeActivityTestCaseBase<ChromeActivity> {
|
| openBookmarkManager();
|
| BookmarkDelegate delegate =
|
| ((BookmarkItemsAdapter) mItemsContainer.getAdapter()).getDelegateForTesting();
|
| + final BookmarkActionBar toolbar = ((BookmarkManager) delegate).getToolbarForTests();
|
| assertEquals(BookmarkUIState.STATE_FOLDER, delegate.getCurrentState());
|
| assertEquals("chrome-native://bookmarks/folder/3",
|
| BookmarkUtils.getLastUsedUrl(getActivity()));
|
| }
|
|
|
| @MediumTest
|
| + public void testTopLevelFolders() throws InterruptedException {
|
| + openBookmarkManager();
|
| + final BookmarkDelegate delegate =
|
| + ((BookmarkItemsAdapter) mItemsContainer.getAdapter()).getDelegateForTesting();
|
| + final BookmarkActionBar toolbar = ((BookmarkManager) delegate).getToolbarForTests();
|
| +
|
| + // Open the "Mobile bookmarks" folder.
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + delegate.openFolder(mBookmarkModel.getMobileFolderId());
|
| + }
|
| + });
|
| +
|
| + assertEquals(SelectableListToolbar.NAVIGATION_BUTTON_BACK,
|
| + toolbar.getNavigationButtonForTests());
|
| + assertFalse(toolbar.getMenu().findItem(R.id.edit_menu_id).isVisible());
|
| +
|
| + // Call BookmarkActionBar#onClick() to activate the navigation button.
|
| + ThreadUtils.runOnUiThreadBlocking(new Runnable() {
|
| + @Override
|
| + public void run() {
|
| + toolbar.onClick(toolbar);
|
| + }
|
| + });
|
| +
|
| + // Check that we are in the root folder.
|
| + assertEquals("Bookmarks", toolbar.getTitle());
|
| + assertEquals(SelectableListToolbar.NAVIGATION_BUTTON_NONE,
|
| + toolbar.getNavigationButtonForTests());
|
| + assertFalse(toolbar.getMenu().findItem(R.id.edit_menu_id).isVisible());
|
| + }
|
| +
|
| + @MediumTest
|
| public void testSearchBookmarks() throws Exception {
|
| BookmarkPromoHeader.setShouldShowForTests();
|
| addBookmark(TEST_PAGE_TITLE_GOOGLE, mTestPage);
|
|
|