From b8ca9c34ed1c64b4764b267f3229a266a8ddafd2 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Wed, 1 Jan 2014 01:57:37 -0600 Subject: [PATCH] Update task tests --- .../com/todoroo/astrid/data/TaskTest.java | 20 +++++++++++++++++++ .../repeats/RepeatAfterCompleteTest.java | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/astrid/src/test/java/com/todoroo/astrid/data/TaskTest.java b/astrid/src/test/java/com/todoroo/astrid/data/TaskTest.java index a2f0c9959..915a19930 100644 --- a/astrid/src/test/java/com/todoroo/astrid/data/TaskTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/data/TaskTest.java @@ -1,8 +1,10 @@ package com.todoroo.astrid.data; import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; import org.junit.After; import org.junit.Before; +import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -17,7 +19,10 @@ import static com.todoroo.astrid.data.Task.URGENCY_SPECIFIC_DAY_TIME; import static com.todoroo.astrid.data.Task.URGENCY_TODAY; import static com.todoroo.astrid.data.Task.URGENCY_TOMORROW; import static com.todoroo.astrid.data.Task.createDueDate; +import static com.todoroo.astrid.data.Task.hasDueTime; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import static org.tasks.Freeze.freezeAt; import static org.tasks.Freeze.thaw; @@ -27,6 +32,11 @@ public class TaskTest { private static final DateTime now = new DateTime(2013, 12, 31, 16, 10, 53, 452); private static final DateTime specificDueDate = new DateTime(2014, 3, 17, 9, 54, 27, 959); + @BeforeClass + public static void beforeClass() { + DateTimeZone.setDefault(DateTimeZone.forID("America/Chicago")); + } + @Before public void before() { freezeAt(now); @@ -97,4 +107,14 @@ public class TaskTest { .getMillis(); assertEquals(expected, createDueDate(URGENCY_SPECIFIC_DAY_TIME, specificDueDate.getMillis())); } + + @Test + public void doesHaveDueTime() { + assertTrue(hasDueTime(1388516076000L)); + } + + @Test + public void doesNotHaveDueTime() { + assertFalse(hasDueTime(1388469600000L)); + } } diff --git a/astrid/src/test/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTest.java b/astrid/src/test/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTest.java index 1fe57dca3..d14a21666 100644 --- a/astrid/src/test/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/repeats/RepeatAfterCompleteTest.java @@ -49,7 +49,7 @@ public class RepeatAfterCompleteTest extends TodorooRobolectricTestCase { task.setValue(Task.DUE_DATE, DateUtilities.now() - DateUtilities.ONE_WEEK); for(Frequency freq : Frequency.values()) { - long interval = -1; + long interval; switch(freq) { case MINUTELY: interval = DateUtilities.ONE_MINUTE; break; @@ -135,7 +135,7 @@ public class RepeatAfterCompleteTest extends TodorooRobolectricTestCase { } private void setRRuleDays(RRule rrule, Weekday... weekdays) { - ArrayList days = new ArrayList(); + ArrayList days = new ArrayList<>(); for(Weekday wd : weekdays) days.add(new WeekdayNum(0, wd)); rrule.setByDay(days);