|
|
@ -4,6 +4,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
package org.mozilla.fenix.ui
|
|
|
|
package org.mozilla.fenix.ui
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
|
|
|
|
import kotlinx.coroutines.runBlocking
|
|
|
|
import kotlinx.coroutines.runBlocking
|
|
|
|
import mozilla.appservices.places.BookmarkRoot
|
|
|
|
import mozilla.appservices.places.BookmarkRoot
|
|
|
|
import okhttp3.mockwebserver.MockWebServer
|
|
|
|
import okhttp3.mockwebserver.MockWebServer
|
|
|
@ -15,8 +16,11 @@ import org.mozilla.fenix.ext.bookmarkStorage
|
|
|
|
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
|
|
|
|
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
|
|
|
|
import org.mozilla.fenix.helpers.HomeActivityTestRule
|
|
|
|
import org.mozilla.fenix.helpers.HomeActivityTestRule
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper
|
|
|
|
import org.mozilla.fenix.helpers.TestAssetHelper
|
|
|
|
|
|
|
|
import org.mozilla.fenix.helpers.TestHelper.longTapSelectItem
|
|
|
|
|
|
|
|
import org.mozilla.fenix.ui.robots.bookmarksMenu
|
|
|
|
import org.mozilla.fenix.ui.robots.browserScreen
|
|
|
|
import org.mozilla.fenix.ui.robots.browserScreen
|
|
|
|
import org.mozilla.fenix.ui.robots.homeScreen
|
|
|
|
import org.mozilla.fenix.ui.robots.homeScreen
|
|
|
|
|
|
|
|
import org.mozilla.fenix.ui.robots.multipleSelectionToolbar
|
|
|
|
import org.mozilla.fenix.ui.robots.navigationToolbar
|
|
|
|
import org.mozilla.fenix.ui.robots.navigationToolbar
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
@ -199,6 +203,116 @@ class BookmarksTest {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
fun multiSelectionToolbarItemsTest() {
|
|
|
|
|
|
|
|
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
browserScreen {
|
|
|
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
|
|
|
}.openLibrary {
|
|
|
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
|
|
|
|
verifyMultiSelectionCheckmark()
|
|
|
|
|
|
|
|
verifyMultiSelectionCounter()
|
|
|
|
|
|
|
|
verifyShareBookmarksButton()
|
|
|
|
|
|
|
|
verifyCloseToolbarButton()
|
|
|
|
|
|
|
|
}.closeToolbarReturnToBookmarks {
|
|
|
|
|
|
|
|
verifyBookmarksMenuView()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
fun openSelectionInNewTabTest() {
|
|
|
|
|
|
|
|
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
browserScreen {
|
|
|
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
|
|
|
}.openHomeScreen {
|
|
|
|
|
|
|
|
closeTab()
|
|
|
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
|
|
|
}.openLibrary {
|
|
|
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
|
|
|
|
}.clickOpenNewTab {
|
|
|
|
|
|
|
|
verifyExistingTabList()
|
|
|
|
|
|
|
|
verifyOpenTabsHeader()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
fun openSelectionInPrivateTabTest() {
|
|
|
|
|
|
|
|
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
browserScreen {
|
|
|
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
|
|
|
}.openLibrary {
|
|
|
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
|
|
|
|
}.clickOpenPrivateTab {
|
|
|
|
|
|
|
|
verifyExistingTabList()
|
|
|
|
|
|
|
|
verifyPrivateSessionHeader()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
fun deleteMultipleSelectionTest() {
|
|
|
|
|
|
|
|
val firstWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
val secondWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
browserScreen {
|
|
|
|
|
|
|
|
createBookmark(firstWebPage.url)
|
|
|
|
|
|
|
|
createBookmark(secondWebPage.url)
|
|
|
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
|
|
|
}.openLibrary {
|
|
|
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
|
|
|
longTapSelectItem(firstWebPage.url)
|
|
|
|
|
|
|
|
longTapSelectItem(secondWebPage.url)
|
|
|
|
|
|
|
|
openActionBarOverflowOrOptionsMenu(activityTestRule.activity)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
|
|
|
|
clickMultiSelectionDelete()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
bookmarksMenu {
|
|
|
|
|
|
|
|
verifyEmptyBookmarksList()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
|
|
|
|
fun shareButtonTest() {
|
|
|
|
|
|
|
|
val defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
browserScreen {
|
|
|
|
|
|
|
|
createBookmark(defaultWebPage.url)
|
|
|
|
|
|
|
|
}.openThreeDotMenu {
|
|
|
|
|
|
|
|
}.openLibrary {
|
|
|
|
|
|
|
|
}.openBookmarks {
|
|
|
|
|
|
|
|
longTapSelectItem(defaultWebPage.url)
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
multipleSelectionToolbar {
|
|
|
|
|
|
|
|
clickShareBookmarksButton()
|
|
|
|
|
|
|
|
verifyShareOverlay()
|
|
|
|
|
|
|
|
verifyShareTabFavicon()
|
|
|
|
|
|
|
|
verifyShareTabTitle()
|
|
|
|
|
|
|
|
verifyShareTabUrl()
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Test
|
|
|
|
@Test
|
|
|
|
fun multipleBookmarkDeletions() {
|
|
|
|
fun multipleBookmarkDeletions() {
|
|
|
|
homeScreen {
|
|
|
|
homeScreen {
|
|
|
|