Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

adding retrying to the reaction long pressing and extra visibilty check for dialogs

Browse Source
This commit is contained in:
Adam Brown 2021-11-10 21:53:53 +00:00
parent 1b5868644a
commit 1c6b2ceb4b
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vector/src/androidTest/java/im/vector/app/EspressoExt.kt
View File

@ -68,6 +68,18 @@ object EspressoHelper {
}
}
fun withRetry(attempts: Int = 3, action: () -> Unit) {
runCatching { action() }.onFailure {
val remainingAttempts = attempts - 1
if (remainingAttempts <= 0) {
throw it
} else {
Thread.sleep(500)
withRetry(remainingAttempts, action)
}
}
}
fun getString(@StringRes id: Int): String {
return EspressoHelper.getCurrentActivity()!!.resources.getString(id)
}

2
vector/src/androidTest/java/im/vector/app/espresso/tools/WaitActivity.kt
View File

@ -26,6 +26,7 @@ import im.vector.app.activityIdlingResource
import im.vector.app.waitForView
import im.vector.app.withIdlingResource
import org.hamcrest.Matcher
import org.hamcrest.Matchers.not
inline fun <reified T : Activity> waitUntilActivityVisible(noinline block: (() -> Unit) = {}) {
withIdlingResource(activityIdlingResource(T::class.java), block)
@ -37,4 +38,5 @@ fun waitUntilViewVisible(viewMatcher: Matcher<View>) {
fun waitUntilDialogVisible(viewMatcher: Matcher<View>) {
onView(viewMatcher).inRoot(isDialog()).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
waitUntilViewVisible(viewMatcher)
}

9
vector/src/androidTest/java/im/vector/app/ui/robot/RoomDetailRobot.kt
View File

@ -38,6 +38,7 @@ import im.vector.app.features.home.room.detail.timeline.reactions.ViewReactionsB
import im.vector.app.features.reactions.data.EmojiDataSource
import im.vector.app.interactWithSheet
import im.vector.app.waitForView
import im.vector.app.withRetry
import java.lang.Thread.sleep
class RoomDetailRobot {
@ -71,7 +72,7 @@ class RoomDetailRobot {
addQuickReaction(quickReaction)
}
// Open reactions
longClickOn(quickReaction)
longClickReaction(quickReaction)
// wait for bottom sheet
interactWithSheet<ViewReactionsBottomSheet>(withText(R.string.reactions), openState = BottomSheetBehavior.STATE_COLLAPSED) {
pressBack()
@ -99,6 +100,12 @@ class RoomDetailRobot {
waitUntilViewVisible(withId(R.id.composerEditText))
}
private fun longClickReaction(quickReaction: String) {
withRetry {
longClickOn(quickReaction)
}
}
fun openMessageMenu(message: String, block: MessageMenuRobot.() -> Unit) {
onView(withId(R.id.timelineRecyclerView))
.perform(