diff --git a/build.sh b/build.sh index 149f165b7..74d4fc268 100755 --- a/build.sh +++ b/build.sh @@ -205,6 +205,7 @@ run_local_tests() { build_instrumentation_apk install_test_butler install_apk + uninstall_test_apk install_test_apk run_instrumented_tests parse_instrumentation_results diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png index 6b250de8c..8f450c76b 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png index b436db6c3..065542a55 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDataOffset.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png index 48fc4f7ed..5c5db36d9 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderDifferentSize.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png index 4ae316a4e..49e77eabf 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png and b/uhabits-android/src/androidTest/assets/views-v19/common/HistoryChart/renderTransparent.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png index e110acdd4..c8d3c0e97 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png index f2ae9ae5d..3b6c105a1 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDataOffset.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png index 946615f97..c58cb89c2 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderDifferentSize.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png index e7aca20ae..78385ea39 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderMonthly.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png index e8192ea76..f4ce5a6c5 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png and b/uhabits-android/src/androidTest/assets/views-v19/common/ScoreChart/renderTransparent.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png index ba05929d3..256e8f438 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png and b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png index ce7b1b575..1c23c4389 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png and b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderSmallSize.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png index ba05929d3..256e8f438 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png and b/uhabits-android/src/androidTest/assets/views-v19/common/StreakChart/renderTransparent.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png b/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png index aa876e064..f91e0fa37 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png and b/uhabits-android/src/androidTest/assets/views-v19/habits/show/HistoryCard/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png b/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png index b8435b1c4..10274dce1 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png and b/uhabits-android/src/androidTest/assets/views-v19/habits/show/ScoreCard/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png b/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png index e1139312e..724e62f4a 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png and b/uhabits-android/src/androidTest/assets/views-v19/habits/show/StreakCard/render.png differ diff --git a/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png b/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png index 05950b41d..c6c9faec7 100644 Binary files a/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png and b/uhabits-android/src/androidTest/assets/views-v19/widgets/StreakWidget/render.png differ diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java index b3d750ab6..a243ca870 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/BaseAndroidTest.java @@ -121,7 +121,7 @@ public class BaseAndroidTest extends TestCase protected void awaitLatch() throws InterruptedException { - assertTrue(latch.await(60, TimeUnit.SECONDS)); + assertTrue(latch.await(5, TimeUnit.SECONDS)); } protected void setLocale(@NonNull String language, @NonNull String country) diff --git a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java index a4157ee71..9eebeb7e3 100644 --- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java +++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/receivers/PebbleReceiverTest.java @@ -17,7 +17,7 @@ * with this program. If not, see . */ -package org.isoron.uhabits.pebble; +package org.isoron.uhabits.receivers; import android.content.*; import android.support.annotation.*; @@ -29,12 +29,13 @@ import com.getpebble.android.kit.util.*; import org.isoron.uhabits.*; import org.isoron.uhabits.core.models.*; -import org.isoron.uhabits.receivers.*; import org.json.*; import org.junit.*; import org.junit.runner.*; -import static com.getpebble.android.kit.Constants.*; +import static android.os.Build.VERSION.SDK_INT; +import static android.os.Build.VERSION_CODES.KITKAT; +import static com.getpebble.android.kit.Constants.MSG_DATA; import static org.hamcrest.MatcherAssert.*; import static org.hamcrest.core.IsEqual.*; @@ -63,6 +64,8 @@ public class PebbleReceiverTest extends BaseAndroidTest @Test public void testCount() throws Exception { + if(SDK_INT <= KITKAT) return; + onPebbleReceived((dict) -> { assertThat(dict.getString(0), equalTo("COUNT")); assertThat(dict.getInteger(1), equalTo(2L)); @@ -76,6 +79,8 @@ public class PebbleReceiverTest extends BaseAndroidTest @Test public void testFetch() throws Exception { + if(SDK_INT <= KITKAT) return; + onPebbleReceived((dict) -> { assertThat(dict.getString(0), equalTo("HABIT")); assertThat(dict.getInteger(1), equalTo(habit2.getId())); diff --git a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java index 594fd0600..21e33242c 100644 --- a/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java +++ b/uhabits-core/src/main/java/org/isoron/uhabits/core/models/CheckmarkList.java @@ -30,6 +30,7 @@ import java.util.*; import javax.annotation.concurrent.*; +import static java.lang.Math.min; import static org.isoron.uhabits.core.models.Checkmark.CHECKED_EXPLICITLY; import static org.isoron.uhabits.core.models.Checkmark.CHECKED_IMPLICITLY; import static org.isoron.uhabits.core.models.Checkmark.UNCHECKED; @@ -60,8 +61,7 @@ public abstract class CheckmarkList long today = DateUtils.getStartOfToday(); long begin = reps[0].getTimestamp(); - if (intervals.size() > 0) - begin = Long.min(begin, intervals.get(0).begin); + if (intervals.size() > 0) begin = min(begin, intervals.get(0).begin); int nDays = (int) ((today - begin) / day) + 1; @@ -295,7 +295,7 @@ public abstract class CheckmarkList final long today = DateUtils.getStartOfToday(); Checkmark newest = getNewestComputed(); - if(newest != null && newest.getTimestamp() == today) return; + if (newest != null && newest.getTimestamp() == today) return; invalidateNewerThan(0); Repetition oldestRep = habit.getRepetitions().getOldest();