Make all tests run successfully on Lollipop

2025-12-06 09:08:52 -06:00 · 2019-11-17 17:46:36 -06:00
parent 6d57ea0368
commit 1997d9491b
32 changed files with 83 additions and 76 deletions
--- a/android/build.sh
+++ b/android/build.sh
@@ -121,20 +121,15 @@ uninstall_apk() {
 install_test_butler() {
 	log_info "Installing Test Butler"
 	$ADB uninstall com.linkedin.android.testbutler
-	$ADB install tools/test-butler-app-1.3.1.apk
+	$ADB install tools/test-butler-app-2.0.2.apk
 }

 install_apk() {
-	if [ ! -z $UNINSTALL_FIRST ]; then
-		uninstall_apk
-	fi
-
 	log_info "Installing APK"
-
 	if [ ! -z $RELEASE ]; then
 		$ADB install -r ${OUTPUTS_DIR}/apk/release/uhabits-android-release.apk || fail
 	else
-		$ADB install -r ${OUTPUTS_DIR}/apk/debug/uhabits-android-debug.apk || fail
+		$ADB install -t -r ${OUTPUTS_DIR}/apk/debug/uhabits-android-debug.apk || fail
 	fi
 }

@@ -147,9 +142,10 @@ install_test_apk() {
 }

 run_instrumented_tests() {
+	SIZE=$1
 	log_info "Running instrumented tests"
 	$ADB shell am instrument \
-		-r -e coverage true -e size medium \
+		-r -e coverage true -e size $SIZE \
 		-w ${PACKAGE_NAME}.test/android.support.test.runner.AndroidJUnitRunner \
 		| tee ${OUTPUTS_DIR}/instrument.txt

@@ -180,7 +176,7 @@ fetch_artifacts() {
 }

 fetch_logcat() {
-	log_info "Fetching logcat"
+	log_info "Fetching logcat to ${OUTPUTS_DIR}/logcat.txt"
 	$ADB logcat -d > ${OUTPUTS_DIR}/logcat.txt
 }

@@ -215,13 +211,14 @@ accept_images() {
 	rsync -av tmp/test-screenshots/ uhabits-android/src/androidTest/assets/
 }

-run_local_tests() {
-	#clean_output_dir
+run_tests() {
+	SIZE=$1
 	run_adb_as_root
 	install_test_butler
+	uninstall_apk
 	install_apk
 	install_test_apk
-	run_instrumented_tests
+	run_instrumented_tests $SIZE
 	parse_instrumentation_results
 	fetch_artifacts
 	fetch_logcat
@@ -249,7 +246,7 @@ case "$1" in
 		build_apk
 		build_instrumentation_apk
 		run_jvm_tests
-		generate_coverage_badge
+		#generate_coverage_badge
 		;;

 	ci-tests)
@@ -274,16 +271,21 @@ case "$1" in
 		ADB="${ADB} -s emulator-${AVD_SERIAL}"

 		start_emulator
-		run_local_tests
+		run_tests medium
 		stop_emulator
 		stop_gradle_daemon
 		;;

-	local-tests)
+	medium-tests)
 		shift; parse_opts $*
-		run_local_tests
+		run_tests medium
 		;;

+	large-tests)
+		shift; parse_opts $*
+		run_tests large
+ 		;;
+
 	fetch-images)
 		fetch_images
 		;;
@@ -311,7 +313,6 @@ case "$1" in
 			    accept-images Copies fetched images to corresponding assets folder

 			Options:
-			    -u  --uninstall-first   Uninstall existing APK first
 			    -r  --release           Build and install release version, instead of debug
 		END
 		exit 1
--- a/android/tools/test-butler-app-1.3.1.apk
+++ b/android/tools/test-butler-app-1.3.1.apk
--- a/android/tools/test-butler-app-2.0.2.apk
+++ b/android/tools/test-butler-app-2.0.2.apk
--- a/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/HistoryCard/render.png
+++ b/android/uhabits-android/src/androidTest/assets/views-v26/habits/show/HistoryCard/render.png
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseUserInterfaceTest.java
@@ -54,6 +54,7 @@ public class BaseUserInterfaceTest
        Intent intent = new Intent();
        intent.setComponent(new ComponentName(PKG, cls.getCanonicalName()));
        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
        getContext().startActivity(intent);
    }

@@ -77,8 +78,6 @@ public class BaseUserInterfaceTest
    @After
    public void tearDown() throws Exception
    {
-        device.pressHome();
-        device.waitForIdle();
        TestButler.teardown(getTargetContext());
    }

--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitLoggerTest.java
@@ -20,8 +20,8 @@
 package org.isoron.uhabits;

 import android.os.*;
+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.androidbase.*;
 import org.isoron.uhabits.core.models.*;
@@ -30,8 +30,8 @@ import org.junit.runner.*;

 import java.io.*;

-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;

@RunWith(AndroidJUnit4.class)
@MediumTest
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/HabitsApplicationTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.androidbase.*;
 import org.junit.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/AboutTest.java
@@ -35,15 +35,17 @@ import static org.isoron.uhabits.acceptance.steps.ListHabitsSteps.*;
 public class AboutTest extends BaseUserInterfaceTest
 {
    @Test
-    public void shouldDisplayAboutScreen()
-    {
+    public void shouldDisplayAboutScreen() {
        launchApp();
        clickMenu(ABOUT);
        verifyDisplaysText("Loop Habit Tracker");
        verifyDisplaysText("Rate this app on Google Play");
        verifyDisplaysText("Developers");
        verifyDisplaysText("Translators");
+    }

+    @Test
+    public void shouldDisplayAboutScreenFromSettings() {
        launchApp();
        clickMenu(SETTINGS);
        clickText("About");
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/HabitsTest.java
@@ -43,6 +43,7 @@ public class HabitsTest extends BaseUserInterfaceTest

        verifyShowsScreen(LIST_HABITS);
        clickMenu(ADD);
+        clickText("Yes or No");

        verifyShowsScreen(EDIT_HABIT);
        typeName("Hello world");
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/LinksTest.java
@@ -43,14 +43,14 @@ public class LinksTest extends BaseUserInterfaceTest
        verifyOpensWebsite("https://github.com/iSoron/uhabits");
    }

-    @Test
-    public void shouldLinkToTranslationWebsite() throws Exception
-    {
-        launchApp();
-        clickMenu(ABOUT);
-        clickText("Help translate this app");
-        verifyOpensWebsite("translate.loophabits.org");
-    }
+//    @Test
+//    public void shouldLinkToTranslationWebsite() throws Exception
+//    {
+//        launchApp();
+//        clickMenu(ABOUT);
+//        clickText("Help translate this app");
+//        verifyOpensWebsite("translate.loophabits.org");
+//    }

    @Test
    public void shouldLinkToHelp() throws Exception
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/WidgetTest.java
@@ -19,6 +19,8 @@

 package org.isoron.uhabits.acceptance;

+import android.support.test.filters.*;
+
 import org.isoron.uhabits.*;
 import org.junit.*;

@@ -26,16 +28,15 @@ import static org.isoron.uhabits.acceptance.steps.CommonSteps.*;
 import static org.isoron.uhabits.acceptance.steps.WidgetSteps.*;
 import static org.isoron.uhabits.acceptance.steps.WidgetSteps.clickText;

+@LargeTest
 public class WidgetTest extends BaseUserInterfaceTest
 {
    @Test
    public void shouldCreateAndToggleCheckmarkWidget() throws Exception
    {
-        longPressHomeScreen();
-        clickWidgets();
-        scrollToHabits();
-        dragWidgetToHomescreen();
+        dragCheckmarkWidgetToHomescreen();
        clickText("Wake up early");
+        clickText("Save");
        verifyCheckmarkWidgetIsShown();
        clickCheckmarkWidget();

--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/CommonSteps.java
@@ -19,6 +19,7 @@

 package org.isoron.uhabits.acceptance.steps;

+import android.os.*;
 import android.support.annotation.*;
 import android.support.test.espresso.*;
 import android.support.test.espresso.contrib.*;
@@ -29,6 +30,8 @@ import org.isoron.uhabits.*;
 import org.isoron.uhabits.R;
 import org.isoron.uhabits.activities.habits.list.*;

+import static android.os.Build.VERSION.SDK_INT;
+import static android.os.Build.VERSION_CODES.LOLLIPOP;
 import static android.support.test.espresso.Espresso.*;
 import static android.support.test.espresso.action.ViewActions.*;
 import static android.support.test.espresso.assertion.PositionAssertions.*;
@@ -136,8 +139,11 @@ public class CommonSteps extends BaseUserInterfaceTest

    public static void verifyOpensWebsite(String url) throws Exception
    {
-        assertTrue(
-            device.wait(Until.hasObject(By.pkg("com.android.chrome")), 5000));
+        if(SDK_INT <= LOLLIPOP) {
+            assertTrue(device.wait(Until.hasObject(By.pkg("com.android.browser")), 5000));
+        } else {
+            assertTrue(device.wait(Until.hasObject(By.pkg("com.android.chrome")), 5000));
+        }
        device.waitForIdle();
        assertTrue(device.findObject(new UiSelector().text(url)).exists());
    }
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.java
@@ -91,11 +91,8 @@ public abstract class ListHabitsSteps
        }
    }

-    private static void clickTextInsideOverflowMenu(int id)
-    {
-        onView(allOf(withContentDescription("More options"), withParent(
-            withParent(withClassName(endsWith("Toolbar")))))).perform(click());
-
+    private static void clickTextInsideOverflowMenu(int id) {
+        onView(allOf(withContentDescription("More options"), withParent(withParent(withClassName(endsWith("Toolbar")))))).perform(click());
        onView(withText(id)).perform(click());
    }

--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/WidgetSteps.java
@@ -63,6 +63,19 @@ public class WidgetSteps
            .longClick();
    }

+    public static void dragCheckmarkWidgetToHomescreen() throws Exception {
+        int height = device.getDisplayHeight();
+        int width = device.getDisplayWidth();
+        device.pressHome();
+        device.waitForIdle();
+        device.findObject(new UiSelector().description("Apps")).click();
+        device.findObject(new UiSelector().description("Apps")).click();
+        device.findObject(new UiSelector().description("Widgets")).click();
+        device.drag(width/2, height/2, 0, height/2, 8);
+        device.findObject(new UiSelector().text("Checkmark"))
+                .dragTo(width / 2, height / 2, 8);
+    }
+
    public static void scrollToHabits() throws Exception
    {
        new UiScrollable(new UiSelector().resourceId(
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/RingViewTest.java
@@ -20,8 +20,8 @@
 package org.isoron.uhabits.activities.common.views;

 import android.graphics.*;
+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.utils.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/ScoreChartTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.common.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/StreakChartTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.common.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/list/views/HintViewTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.list.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.ui.screens.habits.list.*;
@@ -28,7 +28,7 @@ import org.junit.*;
 import org.junit.runner.*;

 import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.MatcherAssert.*;
 import static org.mockito.Mockito.*;

@RunWith(AndroidJUnit4.class)
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/FrequencyCardTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.show.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.view.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/HistoryCardTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.show.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.view.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/OverviewCardTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.show.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.view.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/ScoreCardTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.show.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.view.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/StreakCardTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.show.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.view.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/habits/show/views/SubtitleCardTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.activities.habits.show.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.view.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportCSVTaskTest.java
@@ -19,23 +19,13 @@

 package org.isoron.uhabits.tasks;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

-import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.core.models.*;
-import org.isoron.uhabits.core.tasks.*;
 import org.junit.*;
 import org.junit.runner.*;

-import java.io.*;
-import java.util.*;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.MatcherAssert.*;
-import static org.hamcrest.core.IsNot.not;
-
@RunWith(AndroidJUnit4.class)
@MediumTest
 public class ExportCSVTaskTest extends BaseAndroidTest
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/tasks/ExportDBTaskTest.java
@@ -19,16 +19,13 @@

 package org.isoron.uhabits.tasks;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

-import org.isoron.androidbase.*;
 import org.isoron.uhabits.*;
 import org.junit.*;
 import org.junit.runner.*;

-import java.io.*;
-
@RunWith(AndroidJUnit4.class)
@MediumTest
 public class ExportDBTaskTest extends BaseAndroidTest
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/CheckmarkWidgetTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.widgets;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.widget.*;

 import org.isoron.uhabits.*;
@@ -28,8 +28,8 @@ import org.isoron.uhabits.core.models.*;
 import org.junit.*;
 import org.junit.runner.*;

-import static org.hamcrest.MatcherAssert.*;
 import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.MatcherAssert.*;
 import static org.isoron.uhabits.core.models.Checkmark.*;

@RunWith(AndroidJUnit4.class)
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/FrequencyWidgetTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.widgets;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.widget.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/HistoryWidgetTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.widgets;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.widget.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/ScoreWidgetTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.widgets;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.widget.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/StreakWidgetTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.widgets;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;
 import android.widget.*;

 import org.isoron.uhabits.*;
--- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
+++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.java
@@ -19,8 +19,8 @@

 package org.isoron.uhabits.widgets.views;

+import android.support.test.filters.*;
 import android.support.test.runner.*;
-import android.test.suitebuilder.annotation.*;

 import org.isoron.uhabits.*;
 import org.isoron.uhabits.core.models.*;