ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

ElapsedTimer: Display time in mm:ss format

Browse Source
This commit is contained in:
jcwhisman
2020-09-01 11:16:59 -05:00
committed by Jordan Atwood
parent 01447e52a7
commit 43c5e1f916
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/plugins/timers/ElapsedTimer.java
View File

@@ -55,7 +55,7 @@ class ElapsedTimer extends InfoBox
} }
Duration time = Duration.between(startTime, lastTime == null ? Instant.now() : lastTime); Duration time = Duration.between(startTime, lastTime == null ? Instant.now() : lastTime);
final String formatString = time.toHours() > 0 ? "HH:mm" : "mm:ss"; final String formatString = "mm:ss";
return DurationFormatUtils.formatDuration(time.toMillis(), formatString, true); return DurationFormatUtils.formatDuration(time.toMillis(), formatString, true);
} }

14
runelite-client/src/test/java/net/runelite/client/plugins/timers/ElapsedTimerTest.java
View File

@@ -48,13 +48,13 @@ public class ElapsedTimerTest
assertEquals("05:00", timerText(fiveMinutesAgo, null)); assertEquals("05:00", timerText(fiveMinutesAgo, null));
assertEquals("55:00", timerText(oneHourAgo, fiveMinutesAgo)); assertEquals("55:00", timerText(oneHourAgo, fiveMinutesAgo));
assertEquals("59:55", timerText(oneHourAgo, fiveSecondsAgo)); assertEquals("59:55", timerText(oneHourAgo, fiveSecondsAgo));
assertEquals("01:00", timerText(oneHourAgo, now)); assertEquals("60:00", timerText(oneHourAgo, now));
assertEquals("01:00", timerText(oneHourAgo, null)); assertEquals("60:00", timerText(oneHourAgo, null));
assertEquals("04:00", timerText(fiveHoursAgo, oneHourAgo)); assertEquals("240:00", timerText(fiveHoursAgo, oneHourAgo));
assertEquals("04:55", timerText(fiveHoursAgo, fiveMinutesAgo)); assertEquals("295:00", timerText(fiveHoursAgo, fiveMinutesAgo));
assertEquals("04:59", timerText(fiveHoursAgo, fiveSecondsAgo)); assertEquals("299:55", timerText(fiveHoursAgo, fiveSecondsAgo));
assertEquals("05:00", timerText(fiveHoursAgo, now)); assertEquals("300:00", timerText(fiveHoursAgo, now));
assertEquals("05:00", timerText(fiveHoursAgo, null)); assertEquals("300:00", timerText(fiveHoursAgo, null));
} }
private static String timerText(final Instant startTime, final Instant lastTime) private static String timerText(final Instant startTime, final Instant lastTime)