diff --git a/.travis.yml b/.travis.yml index 166425a..b2168ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,3 @@ jdk: - oraclejdk8 - oraclejdk7 - openjdk7 - -before_install: -- export TZ=Europe/London \ No newline at end of file diff --git a/src/main/java/net/rcarz/jiraclient/WorkLog.java b/src/main/java/net/rcarz/jiraclient/WorkLog.java index 1a828f7..4c4d3f2 100644 --- a/src/main/java/net/rcarz/jiraclient/WorkLog.java +++ b/src/main/java/net/rcarz/jiraclient/WorkLog.java @@ -19,6 +19,7 @@ package net.rcarz.jiraclient; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; diff --git a/src/test/java/net/rcarz/jiraclient/WorklogTest.java b/src/test/java/net/rcarz/jiraclient/WorklogTest.java index c2a3b3e..ab610ad 100644 --- a/src/test/java/net/rcarz/jiraclient/WorklogTest.java +++ b/src/test/java/net/rcarz/jiraclient/WorklogTest.java @@ -6,7 +6,9 @@ import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; import org.powermock.modules.junit4.PowerMockRunner; +import java.text.ParsePosition; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import static junit.framework.Assert.assertEquals; @@ -41,10 +43,12 @@ public class WorklogTest { userJSON.put("name","Joseph McCarthy"); mockJSONObject.put("author", userJSON); - + String DATE_FORMAT = "yyyy-MM-dd"; + SimpleDateFormat df = new SimpleDateFormat(DATE_FORMAT); + final Date parse = df.parse(dateString, new ParsePosition(0)); WorkLog workLog = new WorkLog(mockRestClient,mockJSONObject); - assertEquals("Thu Dec 24 00:00:00 GMT 2015 by Joseph McCarthy",workLog.toString()); + assertEquals(parse.toString() + " by Joseph McCarthy",workLog.toString()); } @Test