archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix tests

Browse Source
pull/1663/head
Alex Baker 3 years ago
parent 1320ad2e7d
commit e496ce1594
2 changed files with 51 additions and 34 deletions
Show Stats Download Patch File Download Diff File

3
app/src/androidTest/java/com/todoroo/andlib/utility/DateUtilitiesTest.kt
Unescape Escape View File

@ -451,5 +451,6 @@ class DateUtilitiesTest {
} }
} }
private fun assertMatches(regex: String, actual: String) = assertTrue(actual.matches(Regex(regex))) private fun assertMatches(regex: String, actual: String) =
assertTrue("expected=$regex\nactual=$actual", actual.matches(Regex(regex)))
} }

82
app/src/androidTest/java/com/todoroo/astrid/reminders/ReminderServiceTest.kt
Unescape Escape View File

@ -10,10 +10,10 @@ import org.junit.Assert.assertEquals
import org.junit.Assert.assertTrue import org.junit.Assert.assertTrue
import org.junit.Before import org.junit.Before
import org.junit.Test import org.junit.Test
import org.tasks.Freeze import org.tasks.Freeze.Companion.freezeClock
import org.tasks.R import org.tasks.R
import org.tasks.data.TaskDao import org.tasks.data.TaskDao
import org.tasks.date.DateTimeUtils import org.tasks.date.DateTimeUtils.newDateTime
import org.tasks.injection.InjectingTestCase import org.tasks.injection.InjectingTestCase
import org.tasks.injection.ProductionModule import org.tasks.injection.ProductionModule
import org.tasks.jobs.NotificationQueue import org.tasks.jobs.NotificationQueue
@ -60,7 +60,7 @@ class ReminderServiceTest : InjectingTestCase() {
newTask( newTask(
with(ID, 1L), with(ID, 1L),
with(HIDE_TYPE, Task.HIDE_UNTIL_DUE), with(HIDE_TYPE, Task.HIDE_UNTIL_DUE),
with(DUE_TIME, DateTimeUtils.newDateTime()) with(DUE_TIME, newDateTime())
) )
) )
@ -69,7 +69,7 @@ class ReminderServiceTest : InjectingTestCase() {
@Test @Test
fun dontScheduleDueDateReminderWhenFlagNotSet() { fun dontScheduleDueDateReminderWhenFlagNotSet() {
service.scheduleAlarm(newTask(with(ID, 1L), with(DUE_TIME, DateTimeUtils.newDateTime()))) service.scheduleAlarm(newTask(with(ID, 1L), with(DUE_TIME, newDateTime())))
assertTrue(jobs.isEmpty()) assertTrue(jobs.isEmpty())
} }
@ -83,37 +83,53 @@ class ReminderServiceTest : InjectingTestCase() {
@Test @Test
fun schedulePastStartDate() { fun schedulePastStartDate() {
val task = newTask( freezeClock {
with(ID, 1L), val dueDate = newDateTime().minusDays(1)
with(DUE_TIME, DateTimeUtils.newDateTime().minusDays(1)), val task = newTask(
with(HIDE_TYPE, HIDE_UNTIL_DUE), with(ID, 1L),
with(REMINDERS, Task.NOTIFY_AT_START) with(DUE_TIME, dueDate),
) with(HIDE_TYPE, HIDE_UNTIL_DUE),
with(REMINDERS, Task.NOTIFY_AT_START)
)
service.scheduleAlarm(task) service.scheduleAlarm(task)
verify(ReminderEntry(1, task.hideUntil, ReminderService.TYPE_START)) verify(
ReminderEntry(
1,
dueDate.startOfDay().withHourOfDay(18).millis,
ReminderService.TYPE_START
)
)
}
} }
@Test @Test
fun scheduleFutureStartDate() { fun scheduleFutureStartDate() {
val dueDate = newDateTime().plusDays(1)
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)), with(DUE_TIME, dueDate),
with(HIDE_TYPE, HIDE_UNTIL_DUE), with(HIDE_TYPE, HIDE_UNTIL_DUE),
with(REMINDERS, Task.NOTIFY_AT_START) with(REMINDERS, Task.NOTIFY_AT_START)
) )
service.scheduleAlarm(task) service.scheduleAlarm(task)
verify(ReminderEntry(1, task.hideUntil, ReminderService.TYPE_START)) verify(
ReminderEntry(
1,
dueDate.startOfDay().withHourOfDay(18).millis,
ReminderService.TYPE_START
)
)
} }
@Test @Test
fun schedulePastDueDate() { fun schedulePastDueDate() {
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, DateTimeUtils.newDateTime().minusDays(1)), with(DUE_TIME, newDateTime().minusDays(1)),
with(REMINDERS, Task.NOTIFY_AT_DEADLINE)) with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
service.scheduleAlarm(task) service.scheduleAlarm(task)
@ -125,7 +141,7 @@ class ReminderServiceTest : InjectingTestCase() {
fun scheduleFutureDueDate() { fun scheduleFutureDueDate() {
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)), with(DUE_TIME, newDateTime().plusDays(1)),
with(REMINDERS, Task.NOTIFY_AT_DEADLINE)) with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
service.scheduleAlarm(task) service.scheduleAlarm(task)
@ -135,7 +151,7 @@ class ReminderServiceTest : InjectingTestCase() {
@Test @Test
fun scheduleReminderAtDefaultDueTime() { fun scheduleReminderAtDefaultDueTime() {
val now = DateTimeUtils.newDateTime() val now = newDateTime()
val task = newTask(with(ID, 1L), with(DUE_DATE, now), with(REMINDERS, Task.NOTIFY_AT_DEADLINE)) val task = newTask(with(ID, 1L), with(DUE_DATE, now), with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
service.scheduleAlarm(task) service.scheduleAlarm(task)
@ -147,8 +163,8 @@ class ReminderServiceTest : InjectingTestCase() {
fun dontScheduleReminderForCompletedTask() { fun dontScheduleReminderForCompletedTask() {
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)), with(DUE_TIME, newDateTime().plusDays(1)),
with(COMPLETION_TIME, DateTimeUtils.newDateTime()), with(COMPLETION_TIME, newDateTime()),
with(REMINDERS, Task.NOTIFY_AT_DEADLINE)) with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
service.scheduleAlarm(task) service.scheduleAlarm(task)
@ -160,8 +176,8 @@ class ReminderServiceTest : InjectingTestCase() {
fun dontScheduleReminderForDeletedTask() { fun dontScheduleReminderForDeletedTask() {
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, DateTimeUtils.newDateTime().plusDays(1)), with(DUE_TIME, newDateTime().plusDays(1)),
with(DELETION_TIME, DateTimeUtils.newDateTime()), with(DELETION_TIME, newDateTime()),
with(REMINDERS, Task.NOTIFY_AT_DEADLINE)) with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
service.scheduleAlarm(task) service.scheduleAlarm(task)
@ -171,7 +187,7 @@ class ReminderServiceTest : InjectingTestCase() {
@Test @Test
fun dontScheduleDueDateReminderWhenAlreadyReminded() { fun dontScheduleDueDateReminderWhenAlreadyReminded() {
val now = DateTimeUtils.newDateTime() val now = newDateTime()
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, now), with(DUE_TIME, now),
@ -187,9 +203,9 @@ class ReminderServiceTest : InjectingTestCase() {
fun ignoreStaleSnoozeTime() { fun ignoreStaleSnoozeTime() {
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, DateTimeUtils.newDateTime()), with(DUE_TIME, newDateTime()),
with(SNOOZE_TIME, DateTimeUtils.newDateTime().minusMinutes(5)), with(SNOOZE_TIME, newDateTime().minusMinutes(5)),
with(REMINDER_LAST, DateTimeUtils.newDateTime().minusMinutes(4)), with(REMINDER_LAST, newDateTime().minusMinutes(4)),
with(REMINDERS, Task.NOTIFY_AT_DEADLINE)) with(REMINDERS, Task.NOTIFY_AT_DEADLINE))
service.scheduleAlarm(task) service.scheduleAlarm(task)
@ -199,7 +215,7 @@ class ReminderServiceTest : InjectingTestCase() {
@Test @Test
fun dontIgnoreMissedSnoozeTime() { fun dontIgnoreMissedSnoozeTime() {
val dueDate = DateTimeUtils.newDateTime() val dueDate = newDateTime()
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, dueDate), with(DUE_TIME, dueDate),
@ -216,8 +232,8 @@ class ReminderServiceTest : InjectingTestCase() {
fun scheduleInitialRandomReminder() { fun scheduleInitialRandomReminder() {
random.seed = 0.3865f random.seed = 0.3865f
Freeze.freezeClock { freezeClock {
val now = DateTimeUtils.newDateTime() val now = newDateTime()
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(REMINDER_LAST, null as DateTime?), with(REMINDER_LAST, null as DateTime?),
@ -234,8 +250,8 @@ class ReminderServiceTest : InjectingTestCase() {
fun scheduleNextRandomReminder() { fun scheduleNextRandomReminder() {
random.seed = 0.3865f random.seed = 0.3865f
Freeze.freezeClock { freezeClock {
val now = DateTimeUtils.newDateTime() val now = newDateTime()
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(REMINDER_LAST, now.minusDays(1)), with(REMINDER_LAST, now.minusDays(1)),
@ -252,8 +268,8 @@ class ReminderServiceTest : InjectingTestCase() {
fun scheduleOverdueRandomReminder() { fun scheduleOverdueRandomReminder() {
random.seed = 0.3865f random.seed = 0.3865f
Freeze.freezeClock { freezeClock {
val now = DateTimeUtils.newDateTime() val now = newDateTime()
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(REMINDER_LAST, now.minusDays(14)), with(REMINDER_LAST, now.minusDays(14)),
@ -347,7 +363,7 @@ class ReminderServiceTest : InjectingTestCase() {
@Test @Test
fun snoozeOverridesAll() { fun snoozeOverridesAll() {
val now = DateTimeUtils.newDateTime() val now = newDateTime()
val task = newTask( val task = newTask(
with(ID, 1L), with(ID, 1L),
with(DUE_TIME, now), with(DUE_TIME, now),

Write Preview
Loading…
Cancel
Save