diff --git a/build.sh b/build.sh index f565365ac..b865429de 100755 --- a/build.sh +++ b/build.sh @@ -133,6 +133,9 @@ android_test() { log_error "Some $size instrumented tests failed." log_error "Saving logcat: $OUT_LOGCAT..." $ADB logcat -d > $OUT_LOGCAT + log_error "Fetching test screenshots..." + $ADB pull /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots ${ANDROID_OUTPUTS_DIR}/ + $ADB shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/ return 1 fi log_info "$size tests passed." @@ -198,13 +201,6 @@ android_build() { return 0 } -android_fetch_images() { - log_info "Fetching images" - rm -rf ${ANDROID_OUTPUTS_DIR}/test-screenshots - $ADB pull /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots ${ANDROID_OUTPUTS_DIR}/ - $ADB shell rm -r /sdcard/Android/data/${PACKAGE_NAME}/files/test-screenshots/ -} - android_accept_images() { find ${ANDROID_OUTPUTS_DIR}/test-screenshots -name '*.expected*' -delete rsync -av ${ANDROID_OUTPUTS_DIR}/test-screenshots/ uhabits-android/src/androidTest/assets/ @@ -233,18 +229,14 @@ CI/CD script for Loop Habit Tracker. Usage: build.sh build [options] - build.sh clean [options] build.sh android-tests [options] build.sh android-tests-parallel ... [options] - build.sh android-fetch-images [options] build.sh android-accept-images [options] Commands: build Build the app and run small tests - clean Remove all build directories android-tests Run medium and large Android tests on an emulator android-tests-parallel Tests multiple API levels simultaneously - android-fetch-images Fetch failed view test images from device android-accept-images Copy fetched images to corresponding assets folder Options: @@ -274,12 +266,10 @@ main() { case "$1" in build) shift; _parse_opts "$@" + clean core_build android_build ;; - clean) - clean - ;; android-tests) shift; _parse_opts "$@" if [ -z $1 ]; then @@ -297,9 +287,6 @@ main() { shift; _parse_opts "$@" android_test_parallel $* ;; - android-fetch-images) - android_fetch_images - ;; android-accept-images) android_accept_images ;; diff --git a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png index 42147c832..561cf25f8 100644 Binary files a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png and b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidget/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png index 46ac8fd03..9548f9994 100644 Binary files a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png and b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/checked.png differ diff --git a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png index 68b695bca..5d29f56c8 100644 Binary files a/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png and b/uhabits-android/src/androidTest/assets/views/widgets/CheckmarkWidgetView/large_size.png differ diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt index 37538e758..f3a842f04 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/widgets/views/CheckmarkWidgetViewTest.kt @@ -50,7 +50,7 @@ class CheckmarkWidgetViewTest : BaseViewTest() { name = habit.name } view.refresh() - measureView(view, dpToPixels(100), dpToPixels(200)) + measureView(view, dpToPixels(100), dpToPixels(125)) } @Test