From 43c5e1f916e065e1b7b11a462997545edbd85192 Mon Sep 17 00:00:00 2001 From: jcwhisman Date: Tue, 1 Sep 2020 11:16:59 -0500 Subject: [PATCH] ElapsedTimer: Display time in mm:ss format --- .../client/plugins/timers/ElapsedTimer.java | 2 +- .../client/plugins/timers/ElapsedTimerTest.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/timers/ElapsedTimer.java b/runelite-client/src/main/java/net/runelite/client/plugins/timers/ElapsedTimer.java index 0b4ec17517..55a06025d4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/timers/ElapsedTimer.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/timers/ElapsedTimer.java @@ -55,7 +55,7 @@ class ElapsedTimer extends InfoBox } 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); } diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/timers/ElapsedTimerTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/timers/ElapsedTimerTest.java index fddb31beb6..2b3c1e4613 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/timers/ElapsedTimerTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/timers/ElapsedTimerTest.java @@ -48,13 +48,13 @@ public class ElapsedTimerTest assertEquals("05:00", timerText(fiveMinutesAgo, null)); assertEquals("55:00", timerText(oneHourAgo, fiveMinutesAgo)); assertEquals("59:55", timerText(oneHourAgo, fiveSecondsAgo)); - assertEquals("01:00", timerText(oneHourAgo, now)); - assertEquals("01:00", timerText(oneHourAgo, null)); - assertEquals("04:00", timerText(fiveHoursAgo, oneHourAgo)); - assertEquals("04:55", timerText(fiveHoursAgo, fiveMinutesAgo)); - assertEquals("04:59", timerText(fiveHoursAgo, fiveSecondsAgo)); - assertEquals("05:00", timerText(fiveHoursAgo, now)); - assertEquals("05:00", timerText(fiveHoursAgo, null)); + assertEquals("60:00", timerText(oneHourAgo, now)); + assertEquals("60:00", timerText(oneHourAgo, null)); + assertEquals("240:00", timerText(fiveHoursAgo, oneHourAgo)); + assertEquals("295:00", timerText(fiveHoursAgo, fiveMinutesAgo)); + assertEquals("299:55", timerText(fiveHoursAgo, fiveSecondsAgo)); + assertEquals("300:00", timerText(fiveHoursAgo, now)); + assertEquals("300:00", timerText(fiveHoursAgo, null)); } private static String timerText(final Instant startTime, final Instant lastTime)