From 1feefe107c0c634a26ac5c9a1feebe80bf82b1a2 Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Mon, 26 Apr 2021 18:28:37 -0500 Subject: [PATCH] Make large-tests pass on API 25 --- .../uhabits/acceptance/steps/BackupSteps.kt | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt index 77b253407..aa6e60309 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/BackupSteps.kt @@ -20,6 +20,7 @@ package org.isoron.uhabits.acceptance.steps import android.os.Build.VERSION.SDK_INT +import androidx.test.uiautomator.By import androidx.test.uiautomator.UiSelector import org.isoron.uhabits.BaseUserInterfaceTest.Companion.device import org.isoron.uhabits.acceptance.steps.CommonSteps.clickText @@ -53,9 +54,26 @@ fun copyBackupToDownloadFolder() { fun importBackupFromDownloadFolder() { clickMenu(SETTINGS) clickText("Import data") - device.click(50, 90) // Click menu button - device.findObject(UiSelector().textContains("Download")).click() - device.findObject(UiSelector().textContains("Loop")).click() + if (SDK_INT >= 26) { + device.click(50, 90) // Click menu button + device.findObject(UiSelector().textContains("Download")).click() + device.findObject(UiSelector().textContains("Loop")).click() + } else { + while (!device.hasObject(By.textContains("Show file size"))) { + device.click(720, 100) // Click overflow menu + Thread.sleep(1000) + } + if (device.hasObject(By.textContains("Show internal"))) { + device.findObject(UiSelector().textContains("Show internal")).click() + Thread.sleep(1000) + } else { + device.pressBack() + } + device.click(50, 90) // Click menu button + device.findObject(UiSelector().textContains("Android")).click() + device.findObject(UiSelector().textContains("Download")).click() + device.findObject(UiSelector().textContains("Loop")).click() + } } fun openLauncher() {