bobc
/
jira-client
1
0
Fork 0
Code Releases Activity

Merge pull request #157 from Kreinoee/issue-156 

Made all the time fields in WorkLog include the time and not just the date
master
Bob Carroll 2016-05-30 10:27:00 -07:00
parent 800cb04ae9 77ba00abeb
commit e0b01cd8eb
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/rcarz/jiraclient/WorkLog.java
View File

@ -60,10 +60,10 @@ public class WorkLog extends Resource {
id = Field.getString(map.get("id"));
author = Field.getResource(User.class, map.get("author"), restclient);
comment = Field.getString(map.get("comment"));
created = Field.getDate(map.get("created"));
updated = Field.getDate(map.get("updated"));
created = Field.getDateTime(map.get("created"));
updated = Field.getDateTime(map.get("updated"));
updateAuthor = Field.getResource(User.class, map.get("updateAuthor"), restclient);
started = Field.getDate(map.get("started"));
started = Field.getDateTime(map.get("started"));
timeSpent = Field.getString(map.get("timeSpent"));
timeSpentSeconds = Field.getInteger(map.get("timeSpentSeconds"));
}

17
src/test/java/net/rcarz/jiraclient/WorklogTest.java
View File

@ -43,12 +43,8 @@ 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(parse.toString() + " by Joseph McCarthy",workLog.toString());
assertEquals(workLog.getCreatedDate() + " by Joseph McCarthy",workLog.toString());
}
@Test
@ -63,14 +59,13 @@ public class WorklogTest {
assertEquals("45517", workLog.getId());
String author = "joseph";
assertEquals(author, workLog.getAuthor().getName());
String started = "2015-08-17T00:00:00.000";
assertEquals(started, simpleDateFormat.format(workLog.getStarted()));
String created = "2015-08-20T00:00:00.000";
assertEquals(created, simpleDateFormat.format(workLog.getCreatedDate()));
final long expectedStartedUnixTimeStamp = 1439803140000L; //unix timestamp in millis of 2015-08-17T13:19:00.000+0400
assertEquals(expectedStartedUnixTimeStamp, workLog.getStarted().getTime());
final long expectedCreatedAndUpdatedUnitTimeStamp = 1440062384000L; //unix timestamp in millis of 2015-08-20T13:19:44.000+0400
assertEquals(expectedCreatedAndUpdatedUnitTimeStamp, workLog.getCreatedDate().getTime());
assertEquals(expectedCreatedAndUpdatedUnitTimeStamp, workLog.getUpdatedDate().getTime());
assertEquals(21600, workLog.getTimeSpentSeconds());
assertEquals(author, workLog.getUpdateAuthor().getName());
assertEquals(created, simpleDateFormat.format(workLog.getUpdatedDate()));
}
}