From ce7576e4590aee54662c72fd783bad5baff510e3 Mon Sep 17 00:00:00 2001
From: Tim Holloway <timh@mousetech.com>
Date: Mon, 10 Jan 2022 16:55:52 -0500
Subject: [PATCH] Timeformat Test formatting

---
 .../com/mousetech/gourmetj/utils/TimeFormatter.java   |  6 +++++-
 .../mousetech/gourmetj/utils/TimeFormatterTest.java   | 11 ++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/mousetech/gourmetj/utils/TimeFormatter.java b/src/main/java/com/mousetech/gourmetj/utils/TimeFormatter.java
index 08ed05c..7348e80 100644
--- a/src/main/java/com/mousetech/gourmetj/utils/TimeFormatter.java
+++ b/src/main/java/com/mousetech/gourmetj/utils/TimeFormatter.java
@@ -48,7 +48,11 @@ public class TimeFormatter {
 		if (mm > 0) {
 			sb.append(mm);
 			if ((ss == 0) && (hh == 0)) {
-				sb.append(" minutes");
+				if ( mm == 1 ) {
+					sb.append(" minute");					
+				} else {
+					sb.append(" minutes");
+				}
 			} else {
 				sb.append("min. ");
 			}
diff --git a/src/test/java/com/mousetech/gourmetj/utils/TimeFormatterTest.java b/src/test/java/com/mousetech/gourmetj/utils/TimeFormatterTest.java
index d9a413d..5c3e9fd 100644
--- a/src/test/java/com/mousetech/gourmetj/utils/TimeFormatterTest.java
+++ b/src/test/java/com/mousetech/gourmetj/utils/TimeFormatterTest.java
@@ -25,7 +25,7 @@ class TimeFormatterTest {
 	}
 
 	@Test
-	void test() {
+	void testParse() {
 		assertEquals(5000,
 			TimeFormatter.parseTime("5s").longValue());
 		assertEquals(5000 * 60,
@@ -48,4 +48,13 @@ class TimeFormatterTest {
 		assertNull(TimeFormatter.parseTime("1 week"));
 	}
 
+	@Test
+	void testFormat() {
+		assertEquals("1 minute",
+			TimeFormatter.formatTime(60_000L));
+		assertEquals("1h 30min.",
+			TimeFormatter.formatTime(90*60_000L));
+		assertEquals("1d 1h 20min.",
+			TimeFormatter.formatTime(24*3600_000L + 3600_000L + 20*60_000L));
+	}
 }