|
|
|
@ -5,7 +5,6 @@
|
|
|
|
|
package org.mozilla.fenix.ui
|
|
|
|
|
|
|
|
|
|
import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
|
|
|
|
|
import androidx.test.espresso.IdlingRegistry
|
|
|
|
|
import androidx.test.platform.app.InstrumentationRegistry
|
|
|
|
|
import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
|
|
|
|
|
import androidx.test.uiautomator.UiDevice
|
|
|
|
@ -27,6 +26,7 @@ import org.mozilla.fenix.helpers.RetryTestRule
|
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper
|
|
|
|
|
import org.mozilla.fenix.helpers.TestHelper
|
|
|
|
|
import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
|
|
|
|
|
import org.mozilla.fenix.helpers.TestHelper.registerAndCleanupIdlingResources
|
|
|
|
|
import org.mozilla.fenix.ui.robots.bookmarksMenu
|
|
|
|
|
import org.mozilla.fenix.ui.robots.browserScreen
|
|
|
|
|
import org.mozilla.fenix.ui.robots.homeScreen
|
|
|
|
@ -46,7 +46,6 @@ class BookmarksTest {
|
|
|
|
|
var title: String = "Bookmark title"
|
|
|
|
|
var url: String = "https://www.test.com"
|
|
|
|
|
}
|
|
|
|
|
private var bookmarksListIdlingResource: RecyclerViewIdlingResource? = null
|
|
|
|
|
|
|
|
|
|
@get:Rule
|
|
|
|
|
val activityTestRule = HomeActivityTestRule()
|
|
|
|
@ -76,10 +75,6 @@ class BookmarksTest {
|
|
|
|
|
val bookmarks = bookmarksStorage?.getTree(BookmarkRoot.Mobile.id)?.children
|
|
|
|
|
bookmarks?.forEach { bookmarksStorage.deleteNode(it.guid) }
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bookmarksListIdlingResource != null) {
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@ -87,17 +82,14 @@ class BookmarksTest {
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(
|
|
|
|
|
activityTestRule.activity.findViewById(R.id.bookmark_list),
|
|
|
|
|
1,
|
|
|
|
|
)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
verifyBookmarksMenuView()
|
|
|
|
|
verifyAddFolderButton()
|
|
|
|
|
verifyCloseButton()
|
|
|
|
|
verifyBookmarkTitle("Desktop Bookmarks")
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
|
|
|
|
|
) {
|
|
|
|
|
verifyBookmarksMenuView()
|
|
|
|
|
verifyAddFolderButton()
|
|
|
|
|
verifyCloseButton()
|
|
|
|
|
verifyBookmarkTitle("Desktop Bookmarks")
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -106,15 +98,15 @@ class BookmarksTest {
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
selectFolder("Desktop Bookmarks")
|
|
|
|
|
verifyFolderTitle("Bookmarks Menu")
|
|
|
|
|
verifyFolderTitle("Bookmarks Toolbar")
|
|
|
|
|
verifyFolderTitle("Other Bookmarks")
|
|
|
|
|
verifySignInToSyncButton()
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
|
|
|
|
|
) {
|
|
|
|
|
selectFolder("Desktop Bookmarks")
|
|
|
|
|
verifyFolderTitle("Bookmarks Menu")
|
|
|
|
|
verifyFolderTitle("Bookmarks Toolbar")
|
|
|
|
|
verifyFolderTitle("Other Bookmarks")
|
|
|
|
|
verifySignInToSyncButton()
|
|
|
|
|
}
|
|
|
|
|
}.clickSingInToSyncButton {
|
|
|
|
|
verifyTurnOnSyncToolbarTitle()
|
|
|
|
|
}
|
|
|
|
@ -141,12 +133,12 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
verifyBookmarkedURL(defaultWebPage.url.toString())
|
|
|
|
|
verifyBookmarkFavicon(defaultWebPage.url)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
verifyBookmarkedURL(defaultWebPage.url.toString())
|
|
|
|
|
verifyBookmarkFavicon(defaultWebPage.url)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -155,16 +147,16 @@ class BookmarksTest {
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
clickAddFolderButton()
|
|
|
|
|
verifyKeyboardVisible()
|
|
|
|
|
addNewFolderName(bookmarksFolderName)
|
|
|
|
|
saveNewFolder()
|
|
|
|
|
verifyFolderTitle(bookmarksFolderName)
|
|
|
|
|
verifyKeyboardHidden()
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
|
|
|
|
|
) {
|
|
|
|
|
clickAddFolderButton()
|
|
|
|
|
verifyKeyboardVisible()
|
|
|
|
|
addNewFolderName(bookmarksFolderName)
|
|
|
|
|
saveNewFolder()
|
|
|
|
|
verifyFolderTitle(bookmarksFolderName)
|
|
|
|
|
verifyKeyboardHidden()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -190,9 +182,9 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
}.clickEdit {
|
|
|
|
|
verifyEditBookmarksView()
|
|
|
|
@ -216,9 +208,9 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
}.clickCopy {
|
|
|
|
|
verifyCopySnackBarText()
|
|
|
|
@ -242,9 +234,9 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
}.clickShare {
|
|
|
|
|
verifyShareOverlay()
|
|
|
|
@ -262,9 +254,9 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
}.clickOpenInNewTab {
|
|
|
|
|
verifyTabTrayIsOpened()
|
|
|
|
@ -280,9 +272,9 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
}.clickOpenInPrivateTab {
|
|
|
|
|
verifyTabTrayIsOpened()
|
|
|
|
@ -299,11 +291,10 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
}.clickDelete {
|
|
|
|
|
verifyDeleteSnackBarText()
|
|
|
|
|
verifyUndoDeleteSnackBarButton()
|
|
|
|
@ -319,19 +310,19 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
}.clickDelete {
|
|
|
|
|
verifyUndoDeleteSnackBarButton()
|
|
|
|
|
clickUndoDeleteButton()
|
|
|
|
|
verifySnackBarHidden()
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
verifyBookmarkedURL(defaultWebPage.url.toString())
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
verifyBookmarkedURL(defaultWebPage.url.toString())
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -344,11 +335,11 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
@ -376,12 +367,12 @@ class BookmarksTest {
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
@ -401,12 +392,12 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
@ -427,13 +418,12 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(secondWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapSelectItem(firstWebPage.url)
|
|
|
|
|
longTapSelectItem(secondWebPage.url)
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3),
|
|
|
|
|
) {
|
|
|
|
|
longTapSelectItem(firstWebPage.url)
|
|
|
|
|
longTapSelectItem(secondWebPage.url)
|
|
|
|
|
}
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -457,13 +447,12 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(secondWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapSelectItem(firstWebPage.url)
|
|
|
|
|
longTapSelectItem(secondWebPage.url)
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 3),
|
|
|
|
|
) {
|
|
|
|
|
longTapSelectItem(firstWebPage.url)
|
|
|
|
|
longTapSelectItem(secondWebPage.url)
|
|
|
|
|
}
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -487,11 +476,11 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
@ -546,27 +535,19 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
createFolder(bookmarksFolderName)
|
|
|
|
|
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {
|
|
|
|
|
createFolder(bookmarksFolderName)
|
|
|
|
|
}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.title) {
|
|
|
|
|
}.clickEdit {
|
|
|
|
|
clickParentFolderSelector()
|
|
|
|
|
selectFolder(bookmarksFolderName)
|
|
|
|
|
navigateUp()
|
|
|
|
|
saveEditBookmark()
|
|
|
|
|
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
selectFolder(bookmarksFolderName)
|
|
|
|
|
verifyBookmarkedURL(defaultWebPage.url.toString())
|
|
|
|
|
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -598,12 +579,12 @@ class BookmarksTest {
|
|
|
|
|
homeScreen {
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list))
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
|
|
|
|
|
longTapDesktopFolder("Desktop Bookmarks")
|
|
|
|
|
verifySelectDefaultFolderSnackBarText()
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list)),
|
|
|
|
|
) {
|
|
|
|
|
longTapDesktopFolder("Desktop Bookmarks")
|
|
|
|
|
verifySelectDefaultFolderSnackBarText()
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
@ -625,11 +606,10 @@ class BookmarksTest {
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 2),
|
|
|
|
|
) {}
|
|
|
|
|
}.openThreeDotMenu(defaultWebPage.url) {
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
}.clickEdit {
|
|
|
|
|
clickDeleteInEditModeButton()
|
|
|
|
|
cancelDeletion()
|
|
|
|
@ -646,12 +626,12 @@ class BookmarksTest {
|
|
|
|
|
browserScreen {
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
bookmarksListIdlingResource =
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1)
|
|
|
|
|
IdlingRegistry.getInstance().register(bookmarksListIdlingResource!!)
|
|
|
|
|
createFolder("My Folder")
|
|
|
|
|
verifyFolderTitle("My Folder")
|
|
|
|
|
IdlingRegistry.getInstance().unregister(bookmarksListIdlingResource!!)
|
|
|
|
|
registerAndCleanupIdlingResources(
|
|
|
|
|
RecyclerViewIdlingResource(activityTestRule.activity.findViewById(R.id.bookmark_list), 1),
|
|
|
|
|
) {
|
|
|
|
|
createFolder("My Folder")
|
|
|
|
|
verifyFolderTitle("My Folder")
|
|
|
|
|
}
|
|
|
|
|
}.openThreeDotMenu("My Folder") {
|
|
|
|
|
}.clickDelete {
|
|
|
|
|
cancelFolderDeletion()
|
|
|
|
|