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

Formatting

master
Marius Merkevicius 2016-10-17 08:10:06 +03:00
parent c0b9f1ae11
commit 46c1a0f4ae
3 changed files with 175 additions and 168 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/rcarz/utils/WorklogUtils.java
View File

@ -14,6 +14,7 @@ public class WorklogUtils {
/**
* Formats duration time into pretty string format
* Does not output seconds
*
* @param durationInSeconds provided duration to format
* @return formatted duration
*/
@ -31,8 +32,8 @@ public class WorklogUtils {
builder.append(period.getHours()).append("h").append(" ");
if (period.getMinutes() != 0)
builder.append(period.getMinutes()).append("m").append(" ");
if ((builder.length() > 0) && builder.charAt(builder.length()-1) == " ".charAt(0))
builder.deleteCharAt(builder.length()-1);
if ((builder.length() > 0) && builder.charAt(builder.length() - 1) == " ".charAt(0))
builder.deleteCharAt(builder.length() - 1);
return builder.toString();
}

9
src/test/java/net/rcarz/jiraclient/IssueWorklogTest.java
View File

@ -7,14 +7,11 @@ import org.joda.time.DateTime;
import org.junit.Test;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doCallRealMethod;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.*;
/**
* Created by mariusmerkevicius on 1/30/16.
@ -122,9 +119,9 @@ public class IssueWorklogTest {
//region Constants
// Mock response from jira
public static final String RESPONSE_WORKLOG_BODY = "{\"self\":\"https://jira.test.lt/rest/api/2/issue/32374/worklog/80720\",\"author\":{\"self\":\"https://jira.test.lt/rest/api/2/user?username=test%40test.lt\",\"name\":\"test@test.lt\",\"key\":\"test@test.lt\",\"emailAddress\":\"test@test.lt\",\"avatarUrls\":{\"48x48\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=48\",\"24x24\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=24\",\"16x16\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=16\",\"32x32\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=32\"},\"displayName\":\"Marius Merkevicius\",\"active\":true,\"timeZone\":\"Europe/Vilnius\"},\"updateAuthor\":{\"self\":\"https://jira.test.lt/rest/api/2/user?username=test%40test.lt\",\"name\":\"test@test.lt\",\"key\":\"test@test.lt\",\"emailAddress\":\"test@test.lt\",\"avatarUrls\":{\"48x48\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=48\",\"24x24\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=24\",\"16x16\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=16\",\"32x32\":\"https://secure.gravatar.com/avatar/e4dacfe8f27cb89341bf990e556a4be0?d=mm&s=32\"},\"displayName\":\"Marius Merkevicius\",\"active\":true,\"timeZone\":\"Europe/Vilnius\"},\"comment\":\"Test\",\"created\":\"2016-01-30T20:46:16.583+0200\",\"updated\":\"2016-01-30T20:46:16.583+0200\",\"started\":\"2016-01-27T09:30:53.201+0200\",\"timeSpent\":\"5m\",\"timeSpentSeconds\":300,\"id\":\"80720\"}";
//endregion
}

25
src/test/java/net/rcarz/utils/WorklogUtilsFormatDurationTest.java
View File

@ -8,6 +8,7 @@ import static org.junit.Assert.assertEquals;
* Created by mariusmerkevicius on 1/30/16.
*/
public class WorklogUtilsFormatDurationTest {
@Test
public void testEmpty() throws Exception {
assertEquals("0m", WorklogUtils.formatDurationFromSeconds(0));
@ -18,33 +19,39 @@ public class WorklogUtilsFormatDurationTest {
assertEquals("0m", WorklogUtils.formatDurationFromSeconds(-200));
}
@Test public void testLowSecond() throws Exception {
@Test
public void testLowSecond() throws Exception {
assertEquals("0m", WorklogUtils.formatDurationFromSeconds(1));
}
@Test public void testSeconds() throws Exception {
@Test
public void testSeconds() throws Exception {
assertEquals("0m", WorklogUtils.formatDurationFromSeconds(59));
}
@Test public void testMinutes() throws Exception {
@Test
public void testMinutes() throws Exception {
assertEquals("1m", WorklogUtils.formatDurationFromSeconds(60));
}
@Test public void testMinutesAndSeconds() throws Exception {
@Test
public void testMinutesAndSeconds() throws Exception {
assertEquals("1m", WorklogUtils.formatDurationFromSeconds(
60 // 1 minute
+ 2) // 2 seconds
);
}
@Test public void testMinutesAndSeconds2() throws Exception {
@Test
public void testMinutesAndSeconds2() throws Exception {
assertEquals("2m", WorklogUtils.formatDurationFromSeconds(
60 // 1 minute
+ 72) // 72 seconds
);
}
@Test public void testHours() throws Exception {
@Test
public void testHours() throws Exception {
assertEquals("1h 10m", WorklogUtils.formatDurationFromSeconds(
(60 * 60) // 1 hour
+ (10 * 60) // 10 minutes
@ -52,7 +59,8 @@ public class WorklogUtilsFormatDurationTest {
);
}
@Test public void testDays() throws Exception {
@Test
public void testDays() throws Exception {
assertEquals("50h 20m", WorklogUtils.formatDurationFromSeconds(
(60 * 60 * 50) // 50 hours
+ (60 * 20) // 20 minutes
@ -60,7 +68,8 @@ public class WorklogUtilsFormatDurationTest {
));
}
@Test public void testDays2() throws Exception {
@Test
public void testDays2() throws Exception {
assertEquals("50h 22m", WorklogUtils.formatDurationFromSeconds(
(60 * 60 * 50) // 50 hours
+ (60 * 20) // 20 minutes