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

Fix reminder tests

Browse Source
This commit is contained in:
Alinson S. Xavier
2017-12-06 22:23:28 -06:00
parent b46b7aae25
commit bf8c14fc03
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
uhabits-android/src/test/java/org/isoron/uhabits/receivers/ReminderControllerTest.java
View File

@@ -72,7 +72,7 @@ public class ReminderControllerTest extends BaseAndroidJVMTest
controller.onSnoozePressed(habit,null); controller.onSnoozePressed(habit,null);
verify(reminderScheduler).scheduleAtTime(habit, nowTz + 900000); verify(reminderScheduler).scheduleMinutesFromNow(habit, 15L);
verify(notificationTray).cancel(habit); verify(notificationTray).cancel(habit);
} }

6
uhabits-core/src/main/java/org/isoron/uhabits/core/reminders/ReminderScheduler.java
View File

@@ -52,19 +52,21 @@ public class ReminderScheduler implements CommandRunner.Listener
public void onCommandExecuted(@NonNull Command command, public void onCommandExecuted(@NonNull Command command,
@Nullable Long refreshKey) @Nullable Long refreshKey)
{ {
if(command instanceof ToggleRepetitionCommand) return; if (command instanceof ToggleRepetitionCommand) return;
if(command instanceof ChangeHabitColorCommand) return; if (command instanceof ChangeHabitColorCommand) return;
scheduleAll(); scheduleAll();
} }
public void schedule(@NonNull Habit habit) public void schedule(@NonNull Habit habit)
{ {
if (!habit.hasReminder()) return;
Long reminderTime = habit.getReminder().getTimeInMillis(); Long reminderTime = habit.getReminder().getTimeInMillis();
scheduleAtTime(habit, reminderTime); scheduleAtTime(habit, reminderTime);
} }
public void scheduleAtTime(@NonNull Habit habit, @NonNull Long reminderTime) public void scheduleAtTime(@NonNull Habit habit, @NonNull Long reminderTime)
{ {
if (reminderTime == null) throw new IllegalArgumentException();
if (!habit.hasReminder()) return; if (!habit.hasReminder()) return;
if (habit.isArchived()) return; if (habit.isArchived()) return;
long timestamp = getStartOfDay(removeTimezone(reminderTime)); long timestamp = getStartOfDay(removeTimezone(reminderTime));

5
uhabits-core/src/test/java/org/isoron/uhabits/core/reminders/ReminderSchedulerTest.java
View File

@@ -118,7 +118,7 @@ public class ReminderSchedulerTest extends BaseUnitTest
@Test @Test
public void testSchedule_withoutReminder() public void testSchedule_withoutReminder()
{ {
reminderScheduler.schedule(habit, null); reminderScheduler.schedule(habit);
Mockito.verifyZeroInteractions(sys); Mockito.verifyZeroInteractions(sys);
} }
@@ -133,7 +133,8 @@ public class ReminderSchedulerTest extends BaseUnitTest
long expectedCheckmarkTime, long expectedCheckmarkTime,
long expectedReminderTime) long expectedReminderTime)
{ {
reminderScheduler.schedule(habit, atTime); if(atTime == null) reminderScheduler.schedule(habit);
else reminderScheduler.scheduleAtTime(habit, atTime);
verify(sys).scheduleShowReminder(expectedReminderTime, habit, verify(sys).scheduleShowReminder(expectedReminderTime, habit,
expectedCheckmarkTime); expectedCheckmarkTime);
} }