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 all tests pass on Android 7.1.1 (Nougat)

Browse Source
This commit is contained in:
Alinson S. Xavier
2019-11-18 20:49:30 -06:00
parent 47dc26fea0
commit 7eafd92b2d
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
View File

@@ -78,6 +78,7 @@ public class BaseUserInterfaceTest
@After @After
public void tearDown() throws Exception public void tearDown() throws Exception
{ {
for (int i = 0; i < 10; i++) device.pressBack();
TestButler.teardown(getTargetContext()); TestButler.teardown(getTargetContext());
} }

6
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
View File

@@ -53,12 +53,14 @@ public class LinksTest extends BaseUserInterfaceTest
// } // }
@Test @Test
public void shouldLinkToHelp() throws Exception public void shouldLinkToHelp() throws Exception {
{
launchApp(); launchApp();
clickMenu(HELP); clickMenu(HELP);
verifyOpensWebsite("loophabits.org/faq.html"); verifyOpensWebsite("loophabits.org/faq.html");
}
@Test
public void shouldLinkToHelpFromSettings() throws Exception {
launchApp(); launchApp();
clickMenu(SETTINGS); clickMenu(SETTINGS);
clickText("Help & FAQ"); clickText("Help & FAQ");

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

@@ -139,13 +139,13 @@ public class CommonSteps extends BaseUserInterfaceTest
public static void verifyOpensWebsite(String url) throws Exception public static void verifyOpensWebsite(String url) throws Exception
{ {
String browser_pkg = "org.chromium.webview_shell";
if(SDK_INT <= 23) { if(SDK_INT <= 23) {
assertTrue(device.wait(Until.hasObject(By.pkg("com.android.browser")), 5000)); browser_pkg = "com.android.browser";
} else {
assertTrue(device.wait(Until.hasObject(By.pkg("com.android.chrome")), 5000));
} }
assertTrue(device.wait(Until.hasObject(By.pkg(browser_pkg)), 5000));
device.waitForIdle(); device.waitForIdle();
assertTrue(device.findObject(new UiSelector().text(url)).exists()); assertTrue(device.findObject(new UiSelector().textContains(url)).exists());
} }
public enum Screen public enum Screen

12
android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
View File

@@ -32,7 +32,11 @@ public class WidgetSteps {
} }
public static void clickText(String s) throws Exception { public static void clickText(String s) throws Exception {
device.findObject(new UiSelector().text(s)).click(); UiObject object = device.findObject(new UiSelector().text(s));
if (!object.waitForExists(1000)) {
object = device.findObject(new UiSelector().text(s.toUpperCase()));
}
object.click();
} }
public static void dragCheckmarkWidgetToHomeScreen() throws Exception { public static void dragCheckmarkWidgetToHomeScreen() throws Exception {
@@ -61,7 +65,11 @@ public class WidgetSteps {
device.pressHome(); device.pressHome();
device.waitForIdle(); device.waitForIdle();
device.drag(w / 2, h / 2, w / 2, h / 2, 8); device.drag(w / 2, h / 2, w / 2, h / 2, 8);
device.findObject(new UiSelector().text("Widgets")).click(); UiObject button = device.findObject(new UiSelector().text("WIDGETS"));
if(!button.waitForExists(1000)) {
button = device.findObject(new UiSelector().text("Widgets"));
}
button.click();
new UiScrollable(new UiSelector().resourceId(list_id)) new UiScrollable(new UiSelector().resourceId(list_id))
.scrollIntoView(new UiSelector().text("Checkmark")); .scrollIntoView(new UiSelector().text("Checkmark"));
} }