From b674d14b49a361130220e05e09454db9fe95868b Mon Sep 17 00:00:00 2001 From: "Alinson S. Xavier" Date: Wed, 18 Nov 2020 22:26:45 -0600 Subject: [PATCH] Opt-in skips: Update tests --- .../uhabits/activities/common/views/HistoryChartTest.java | 1 + .../org/isoron/uhabits/widgets/CheckmarkWidgetTest.java | 1 + .../org/isoron/uhabits/receivers/WidgetControllerTest.java | 6 +++++- .../org/isoron/uhabits/core/preferences/Preferences.java | 5 +++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java index 1c88ed265..8fa4da1d2 100644 --- a/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java +++ b/android/uhabits-android/src/androidTest/java/org/isoron/uhabits/activities/common/views/HistoryChartTest.java @@ -56,6 +56,7 @@ public class HistoryChartTest extends BaseViewTest today = new Timestamp(DateUtils.getStartOfToday()); chart = new HistoryChart(targetContext); + chart.setSkipEnabled(true); chart.setCheckmarks(habit.getCheckmarks().getAllValues()); chart.setColor(PaletteUtils.getAndroidTestColor(habit.getColor())); measureView(chart, dpToPixels(400), dpToPixels(200)); diff --git 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 index 7b5cd30c5..f697b5021 100644 --- 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 @@ -52,6 +52,7 @@ public class CheckmarkWidgetTest extends BaseViewTest super.setUp(); setTheme(R.style.WidgetTheme); prefs.setWidgetOpacity(255); + prefs.setSkipEnabled(true); habit = fixtures.createVeryLongHabit(); checkmarks = habit.getCheckmarks(); diff --git a/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java b/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java index 8ab95144d..0a0fd7690 100644 --- a/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java +++ b/android/uhabits-android/src/test/java/org/isoron/uhabits/receivers/WidgetControllerTest.java @@ -22,6 +22,7 @@ package org.isoron.uhabits.receivers; import org.isoron.uhabits.*; import org.isoron.uhabits.core.commands.*; import org.isoron.uhabits.core.models.*; +import org.isoron.uhabits.core.preferences.*; import org.isoron.uhabits.core.ui.*; import org.isoron.uhabits.core.ui.widgets.*; import org.isoron.uhabits.core.utils.*; @@ -44,6 +45,8 @@ public class WidgetControllerTest extends BaseAndroidJVMTest private NotificationTray notificationTray; + private Preferences preferences; + @Override public void setUp() { @@ -53,8 +56,9 @@ public class WidgetControllerTest extends BaseAndroidJVMTest habit = fixtures.createEmptyHabit(); commandRunner = mock(CommandRunner.class); notificationTray = mock(NotificationTray.class); + preferences = mock(Preferences.class); controller = - new WidgetBehavior(habitList, commandRunner, notificationTray); + new WidgetBehavior(habitList, commandRunner, notificationTray, preferences); } @Test diff --git a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java index ed5416040..6cca0ae24 100644 --- a/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java +++ b/android/uhabits-core/src/main/java/org/isoron/uhabits/core/preferences/Preferences.java @@ -343,6 +343,11 @@ public class Preferences return storage.getBoolean("pref_skip_enabled", false); } + public void setSkipEnabled(boolean value) + { + storage.putBoolean("pref_skip_enabled", value); + } + /** * @return An integer representing the first day of the week. Sunday