From ffa4a765d75da9263d1fc255082f5966f5971dc2 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 17 Jan 2014 16:29:51 -0600 Subject: [PATCH] Set locale in gtasks api utilities test --- .../com/todoroo/andlib/utility/DateUtilitiesTest.java | 2 +- .../todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/astrid/src/test/java/com/todoroo/andlib/utility/DateUtilitiesTest.java b/astrid/src/test/java/com/todoroo/andlib/utility/DateUtilitiesTest.java index 050c7dc27..cd7d9cd27 100644 --- a/astrid/src/test/java/com/todoroo/andlib/utility/DateUtilitiesTest.java +++ b/astrid/src/test/java/com/todoroo/andlib/utility/DateUtilitiesTest.java @@ -37,7 +37,7 @@ import static org.tasks.date.DateTimeUtils.newDate; @RunWith(RobolectricTestRunner.class) public class DateUtilitiesTest { - private static Locale defaultLocale; + private Locale defaultLocale; @Before public void before() { diff --git a/astrid/src/test/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java b/astrid/src/test/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java index 5df496734..47d395630 100644 --- a/astrid/src/test/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/gtasks/api/GtasksApiUtilitiesTest.java @@ -8,6 +8,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; +import java.util.Locale; import java.util.TimeZone; import static com.todoroo.astrid.gtasks.api.GtasksApiUtilities.gtasksCompletedTimeToUnixTime; @@ -20,16 +21,19 @@ import static org.junit.Assert.assertNull; @RunWith(RobolectricTestRunner.class) public class GtasksApiUtilitiesTest { - private static final DateTimeZone defaultTimeZone = DateTimeZone.getDefault(); + private static final Locale defaultLocale = Locale.getDefault(); + private static final DateTimeZone defaultDateTimeZone = DateTimeZone.getDefault(); @Before public void before() { + Locale.setDefault(Locale.US); DateTimeZone.setDefault(DateTimeZone.forID("America/Chicago")); } @After public void after() { - DateTimeZone.setDefault(defaultTimeZone); + Locale.setDefault(defaultLocale); + DateTimeZone.setDefault(defaultDateTimeZone); } @Test