added LibraryMenuTest, BookmarksRobot, HistoryRobot (#4769)
ran ktlint added the goBack()method in Transition added the goBack method in Transitionmaster
parent
5586b18c3e
commit
7402013126
|
@ -0,0 +1,63 @@
|
||||||
|
package org.mozilla.fenix.ui
|
||||||
|
|
||||||
|
import org.junit.Rule
|
||||||
|
import org.junit.Test
|
||||||
|
import org.mozilla.fenix.helpers.HomeActivityTestRule
|
||||||
|
import org.mozilla.fenix.ui.robots.homeScreen
|
||||||
|
|
||||||
|
class LibraryMenuTest {
|
||||||
|
|
||||||
|
@get:Rule
|
||||||
|
val activityTestRule = HomeActivityTestRule()
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun libraryMenuItemsTest() {
|
||||||
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openLibrary {
|
||||||
|
verifyLibraryView()
|
||||||
|
verifyHistoryButton()
|
||||||
|
verifyBookmarksButton()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun closeMenuButtonTest() {
|
||||||
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openLibrary {
|
||||||
|
}.closeMenu {
|
||||||
|
verifyHomeScreen()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun backButtonTest() {
|
||||||
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openLibrary {
|
||||||
|
}.goBack {
|
||||||
|
verifyHomeScreen()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun bookmarksButtonTest() {
|
||||||
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openLibrary {
|
||||||
|
}.openBookmarks {
|
||||||
|
verifyBookmarksMenuView()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun historyButtonTest() {
|
||||||
|
homeScreen {
|
||||||
|
}.openThreeDotMenu {
|
||||||
|
}.openLibrary {
|
||||||
|
}.openHistory {
|
||||||
|
verifyHistoryMenuView()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,41 @@
|
||||||
|
package org.mozilla.fenix.ui.robots
|
||||||
|
|
||||||
|
import androidx.test.espresso.Espresso.onView
|
||||||
|
import androidx.test.espresso.assertion.ViewAssertions
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withText
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withParent
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withId
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.Visibility
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
|
||||||
|
import org.hamcrest.Matchers.allOf
|
||||||
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.helpers.click
|
||||||
|
|
||||||
|
class BookmarksRobot {
|
||||||
|
|
||||||
|
fun verifyBookmarksMenuView() = assertBookmarksView()
|
||||||
|
|
||||||
|
class Transition {
|
||||||
|
fun goBack(interact: LibraryRobot.() -> Unit): LibraryRobot.Transition {
|
||||||
|
goBackButton().click()
|
||||||
|
|
||||||
|
LibraryRobot().interact()
|
||||||
|
return LibraryRobot.Transition()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun bookmarksMenu(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition {
|
||||||
|
BookmarksRobot().interact()
|
||||||
|
return BookmarksRobot.Transition()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun assertBookmarksView() {
|
||||||
|
onView(allOf(
|
||||||
|
withText("Bookmarks"),
|
||||||
|
withParent(withId(R.id.navigationToolbar))))
|
||||||
|
.check(ViewAssertions.matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun goBackButton() = onView(withContentDescription("Navigate up"))
|
|
@ -0,0 +1,39 @@
|
||||||
|
package org.mozilla.fenix.ui.robots
|
||||||
|
|
||||||
|
import androidx.test.espresso.Espresso.onView
|
||||||
|
import androidx.test.espresso.assertion.ViewAssertions
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withText
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withParent
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withId
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withEffectiveVisibility
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.Visibility
|
||||||
|
import androidx.test.espresso.matcher.ViewMatchers.withContentDescription
|
||||||
|
import org.hamcrest.Matchers.allOf
|
||||||
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.helpers.click
|
||||||
|
|
||||||
|
class HistoryRobot {
|
||||||
|
|
||||||
|
fun verifyHistoryMenuView() = assertHistoryView()
|
||||||
|
|
||||||
|
class Transition {
|
||||||
|
fun goBack(interact: LibraryRobot.() -> Unit): LibraryRobot.Transition {
|
||||||
|
goBackButton().click()
|
||||||
|
|
||||||
|
LibraryRobot().interact()
|
||||||
|
return LibraryRobot.Transition()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun historyMenu(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
|
||||||
|
HistoryRobot().interact()
|
||||||
|
return HistoryRobot.Transition()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun assertHistoryView() {
|
||||||
|
onView(allOf(withText("History"), withParent(withId(R.id.navigationToolbar))))
|
||||||
|
.check(ViewAssertions.matches(withEffectiveVisibility(Visibility.VISIBLE)))
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun goBackButton() = onView(withContentDescription("Navigate up"))
|
|
@ -8,6 +8,8 @@ package org.mozilla.fenix.ui.robots
|
||||||
|
|
||||||
import androidx.test.espresso.Espresso.onView
|
import androidx.test.espresso.Espresso.onView
|
||||||
import androidx.test.espresso.action.ViewActions.click
|
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.withContentDescription
|
||||||
import androidx.test.espresso.matcher.ViewMatchers.withId
|
import androidx.test.espresso.matcher.ViewMatchers.withId
|
||||||
import androidx.test.espresso.matcher.ViewMatchers.withText
|
import androidx.test.espresso.matcher.ViewMatchers.withText
|
||||||
|
@ -15,12 +17,15 @@ import androidx.test.uiautomator.UiDevice
|
||||||
import androidx.test.platform.app.InstrumentationRegistry
|
import androidx.test.platform.app.InstrumentationRegistry
|
||||||
import org.hamcrest.CoreMatchers.allOf
|
import org.hamcrest.CoreMatchers.allOf
|
||||||
import org.mozilla.fenix.R
|
import org.mozilla.fenix.R
|
||||||
|
import org.mozilla.fenix.helpers.click
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Implementation of Robot Pattern for the your library menu.
|
* Implementation of Robot Pattern for the your library menu.
|
||||||
*/
|
*/
|
||||||
class LibraryRobot {
|
class LibraryRobot {
|
||||||
fun verifyLibraryView() = assertLibraryView()
|
fun verifyLibraryView() = assertLibraryView()
|
||||||
|
fun verifyBookmarksButton() = assertBookmarksButton()
|
||||||
|
fun verifyHistoryButton() = assertHistoryButton()
|
||||||
|
|
||||||
class Transition {
|
class Transition {
|
||||||
|
|
||||||
|
@ -34,13 +39,53 @@ class LibraryRobot {
|
||||||
HomeScreenRobot().interact()
|
HomeScreenRobot().interact()
|
||||||
return HomeScreenRobot.Transition()
|
return HomeScreenRobot.Transition()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun closeMenu(interact: HomeScreenRobot.() -> Unit): HomeScreenRobot.Transition {
|
||||||
|
closeButton().click()
|
||||||
|
|
||||||
|
HomeScreenRobot().interact()
|
||||||
|
return HomeScreenRobot.Transition()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun openBookmarks(interact: BookmarksRobot.() -> Unit): BookmarksRobot.Transition {
|
||||||
|
bookmarksButton().click()
|
||||||
|
|
||||||
|
BookmarksRobot().interact()
|
||||||
|
return BookmarksRobot.Transition()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun openHistory(interact: HistoryRobot.() -> Unit): HistoryRobot.Transition {
|
||||||
|
historyButton().click()
|
||||||
|
|
||||||
|
HistoryRobot().interact()
|
||||||
|
return HistoryRobot.Transition()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private fun goBackButton() = onView(allOf(withContentDescription("Navigate up")))
|
||||||
|
private fun closeButton() = onView(withId(R.id.libraryClose))
|
||||||
|
private fun bookmarksButton() = onView(allOf(withText("Bookmarks")))
|
||||||
|
private fun historyButton() = onView(allOf(withText("History")))
|
||||||
|
|
||||||
private fun assertLibraryView() {
|
private fun assertLibraryView() {
|
||||||
// verify that we are in the correct library view
|
onView(allOf(
|
||||||
onView(allOf(withId(R.id.libraryItemTitle)))
|
withText("Library"),
|
||||||
onView(allOf(withText("Bookmarks")))
|
ViewMatchers.withParent(withId(R.id.navigationToolbar))))
|
||||||
|
.check(ViewAssertions.matches(ViewMatchers.withEffectiveVisibility(ViewMatchers.Visibility.VISIBLE)))
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun goBackButton() = onView(allOf(withContentDescription("Navigate up")))
|
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