[fenix] For https://github.com/mozilla-mobile/fenix/issues/10343: Updates UI tests accordingly to 'Library' removal
parent
bdc8299a36
commit
e6e1a79358
@ -1,90 +0,0 @@
|
|||||||
package org.mozilla.fenix.ui
|
|
||||||
|
|
||||||
import okhttp3.mockwebserver.MockWebServer
|
|
||||||
import org.junit.After
|
|
||||||
import org.junit.Before
|
|
||||||
import org.junit.Rule
|
|
||||||
import org.junit.Test
|
|
||||||
import org.mozilla.fenix.helpers.AndroidAssetDispatcher
|
|
||||||
import org.mozilla.fenix.helpers.HomeActivityTestRule
|
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper
|
|
||||||
import org.mozilla.fenix.ui.robots.navigationToolbar
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Tests for verifying basic functionality of Library accessed from browser screen
|
|
||||||
*/
|
|
||||||
class LibraryMenuTest {
|
|
||||||
|
|
||||||
private lateinit var mockWebServer: MockWebServer
|
|
||||||
private lateinit var defaultWebPage: TestAssetHelper.TestAsset
|
|
||||||
|
|
||||||
@get:Rule
|
|
||||||
val activityTestRule = HomeActivityTestRule()
|
|
||||||
|
|
||||||
@Before
|
|
||||||
fun setUp() {
|
|
||||||
mockWebServer = MockWebServer().apply {
|
|
||||||
setDispatcher(AndroidAssetDispatcher())
|
|
||||||
start()
|
|
||||||
}
|
|
||||||
defaultWebPage = TestAssetHelper.getGenericAsset(mockWebServer, 1)
|
|
||||||
}
|
|
||||||
|
|
||||||
@After
|
|
||||||
fun tearDown() {
|
|
||||||
mockWebServer.shutdown()
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun libraryMenuItemsTest() {
|
|
||||||
navigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
|
||||||
verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyLibraryButton()
|
|
||||||
}.openLibrary {
|
|
||||||
verifyLibraryView()
|
|
||||||
verifyHistoryButton()
|
|
||||||
verifyBookmarksButton()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun backButtonTest() {
|
|
||||||
navigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
|
||||||
verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyLibraryButton()
|
|
||||||
}.openLibrary {
|
|
||||||
}.goBack {
|
|
||||||
verifyBrowserScreen()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun bookmarksButtonTest() {
|
|
||||||
navigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
|
||||||
verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyLibraryButton()
|
|
||||||
}.openLibrary {
|
|
||||||
}.openBookmarks {
|
|
||||||
verifyBookmarksMenuView()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun historyButtonTest() {
|
|
||||||
navigationToolbar {
|
|
||||||
}.enterURLAndEnterToBrowser(defaultWebPage.url) {
|
|
||||||
verifyPageContent(defaultWebPage.content)
|
|
||||||
}.openThreeDotMenu {
|
|
||||||
verifyLibraryButton()
|
|
||||||
}.openLibrary {
|
|
||||||
}.openHistory {
|
|
||||||
verifyHistoryMenuView()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,93 +0,0 @@
|
|||||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
||||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
||||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
||||||
|
|
||||||
@file:Suppress("TooManyFunctions")
|
|
||||||
|
|
||||||
package org.mozilla.fenix.ui.robots
|
|
||||||
|
|
||||||
import androidx.test.espresso.Espresso.onView
|
|
||||||
import androidx.test.espresso.action.ViewActions.click
|
|
||||||
import androidx.test.espresso.assertion.ViewAssertions
|
|
||||||
import androidx.test.espresso.matcher.ViewMatchers
|
|
||||||
import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
|
|
||||||
import androidx.test.espresso.matcher.ViewMatchers.withId
|
|
||||||
import androidx.test.espresso.matcher.ViewMatchers.withText
|
|
||||||
import androidx.test.platform.app.InstrumentationRegistry
|
|
||||||
import androidx.test.uiautomator.By
|
|
||||||
import androidx.test.uiautomator.UiDevice
|
|
||||||
import androidx.test.uiautomator.Until
|
|
||||||
import org.hamcrest.CoreMatchers.allOf
|
|
||||||
import org.mozilla.fenix.R
|
|
||||||
import org.mozilla.fenix.helpers.TestAssetHelper
|
|
||||||
import org.mozilla.fenix.helpers.click
|
|
||||||
import org.mozilla.fenix.helpers.ext.waitNotNull
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Implementation of Robot Pattern for the your library menu.
|
|
||||||
*/
|
|
||||||
class LibraryRobot {
|
|
||||||
fun verifyLibraryView() = assertLibraryView()
|
|
||||||
fun verifyBookmarksButton() = assertBookmarksButton()
|
|
||||||
fun verifyHistoryButton() = assertHistoryButton()
|
|
||||||
|
|
||||||
class Transition {
|
|
||||||
|
|
||||||
val mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
|
|
||||||
|
|
||||||
fun goBack(interact: BrowserRobot.() -> Unit): BrowserRobot.Transition {
|
|
||||||
|
|
||||||
mDevice.waitForIdle()
|
|
||||||
goBackButton().perform(click())
|
|
||||||
|
|
||||||
BrowserRobot().interact()
|
|
||||||
return BrowserRobot.Transition()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun openBookmarks(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition {
|
|
||||||
mDevice.waitNotNull(Until.findObject(By.text("Bookmarks")), TestAssetHelper.waitingTime)
|
|
||||||
bookmarksButton().click()
|
|
||||||
|
|
||||||
BookmarksRobot().interact()
|
|
||||||
return BookmarksRobot.Transition()
|
|
||||||
}
|
|
||||||
|
|
||||||
fun openHistory(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
|
|
||||||
mDevice.waitNotNull(Until.findObject(By.text("History")), TestAssetHelper.waitingTime)
|
|
||||||
historyButton().click()
|
|
||||||
|
|
||||||
HistoryRobot().interact()
|
|
||||||
return HistoryRobot.Transition()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun goBackButton() = onView(allOf(withContentDescription("Navigate up")))
|
|
||||||
private fun bookmarksButton() = onView(allOf(withText("Bookmarks")))
|
|
||||||
private fun historyButton() = onView(allOf(withText("History")))
|
|
||||||
|
|
||||||
private fun assertLibraryView() {
|
|
||||||
onView(
|
|
||||||
allOf(
|
|
||||||
withText("Library"),
|
|
||||||
ViewMatchers.withParent(withId(R.id.navigationToolbar))
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun assertBookmarksButton() = bookmarksButton().check(
|
|
||||||
ViewAssertions.matches(
|
|
||||||
ViewMatchers.withEffectiveVisibility(
|
|
||||||
ViewMatchers.Visibility.VISIBLE
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
private fun assertHistoryButton() = historyButton().check(
|
|
||||||
ViewAssertions.matches(
|
|
||||||
ViewMatchers.withEffectiveVisibility(
|
|
||||||
ViewMatchers.Visibility.VISIBLE
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
Loading…
Reference in New Issue