isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make large-tests pass on API 23

Browse Source
This commit is contained in:
Alinson S. Xavier
2021-04-26 21:21:51 -05:00
parent 1feefe107c
commit a7845c9290
5 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@@ -96,6 +96,7 @@ android_test() {
log_info "Launching emulator..."
$EMULATOR -avd $AVDNAME -port 6${API}0 1>/dev/null 2>&1 &
log_info "Waiting for emulator to boot..."
export ADB="$ADB -s emulator-6${API}0"
$ADB wait-for-device shell 'while [[ -z "$(getprop sys.boot_completed)" ]]; do echo Waiting...; sleep 1; done; input keyevent 82' || return 1

19
uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt
View File

@@ -54,11 +54,22 @@ fun copyBackupToDownloadFolder() {
fun importBackupFromDownloadFolder() {
clickMenu(SETTINGS)
clickText("Import data")
if (SDK_INT >= 26) {
if (SDK_INT <= 23) {
while (!device.hasObject(By.textContains("Show file size"))) {
device.click(720, 100) // Click overflow menu
Thread.sleep(1000)
}
if (device.hasObject(By.textContains("Show SD card"))) {
device.findObject(UiSelector().textContains("Show SD card")).click()
Thread.sleep(1000)
} else {
device.pressBack()
}
device.click(50, 90) // Click menu button
device.findObject(UiSelector().textContains("Internal storage")).click()
device.findObject(UiSelector().textContains("Download")).click()
device.findObject(UiSelector().textContains("Loop")).click()
} else {
} else if (SDK_INT <= 25) {
while (!device.hasObject(By.textContains("Show file size"))) {
device.click(720, 100) // Click overflow menu
Thread.sleep(1000)
@@ -73,6 +84,10 @@ fun importBackupFromDownloadFolder() {
device.findObject(UiSelector().textContains("Android")).click()
device.findObject(UiSelector().textContains("Download")).click()
device.findObject(UiSelector().textContains("Loop")).click()
} else {
device.click(50, 90) // Click menu button
device.findObject(UiSelector().textContains("Download")).click()
device.findObject(UiSelector().textContains("Loop")).click()
}
}

2
uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.kt
View File

@@ -45,6 +45,7 @@ object CommonSteps : BaseUserInterfaceTest() {
fun clickText(text: String?) {
scrollToText(text)
Espresso.onView(ViewMatchers.withText(text)).perform(ViewActions.click())
device.waitForIdle()
}
fun clickText(@StringRes id: Int) {
@@ -62,6 +63,7 @@ object CommonSteps : BaseUserInterfaceTest() {
fun longClickText(text: String?) {
scrollToText(text)
Espresso.onView(ViewMatchers.withText(text)).perform(ViewActions.longClick())
device.waitForIdle()
}
fun pressHome() {

2
uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
View File

@@ -29,6 +29,7 @@ import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.endsWith
import org.hamcrest.Matcher
import org.isoron.uhabits.BaseUserInterfaceTest
import org.isoron.uhabits.BaseUserInterfaceTest.Companion.device
import org.isoron.uhabits.R
import org.isoron.uhabits.activities.habits.list.views.CheckmarkButtonView
import java.util.LinkedList
@@ -53,6 +54,7 @@ object ListHabitsSteps {
CommonSteps.clickText(R.string.hide_completed)
}
}
device.waitForIdle()
}
private fun clickTextInsideOverflowMenu(id: Int) {

3
uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsSelectionMenuBehavior.kt
View File

@@ -75,7 +75,8 @@ class ListHabitsSelectionMenuBehavior @Inject constructor(
}
fun onEditHabits() {
screen.showEditHabitsScreen(adapter.getSelected())
val selected = adapter.getSelected()
if (selected.isNotEmpty()) screen.showEditHabitsScreen(selected)
adapter.clearSelection()
}