From feb5461bf5b399c96c34b68ba1947865f60431f7 Mon Sep 17 00:00:00 2001
From: hdsdi3g <admin@hd3g.tv>
Date: Sat, 15 Jun 2024 19:32:17 +0200
Subject: [PATCH] Correct test after #168

---
 .../version/mod/EnvVersionConfigurer.java     |  9 ++++++-
 .../NotificationMailTemplateToolkitTest.java  | 24 ++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/env-version/src/main/java/tv/hd3g/commons/version/mod/EnvVersionConfigurer.java b/env-version/src/main/java/tv/hd3g/commons/version/mod/EnvVersionConfigurer.java
index 64ada4d3..32b2f74f 100644
--- a/env-version/src/main/java/tv/hd3g/commons/version/mod/EnvVersionConfigurer.java
+++ b/env-version/src/main/java/tv/hd3g/commons/version/mod/EnvVersionConfigurer.java
@@ -23,6 +23,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.function.Predicate;
@@ -114,7 +115,13 @@ private static Optional<String> getMavenVersion() {
 			log.debug("Run {}", mvnCmdLine);
 			Process r;
 			if (System.getProperty("os.name", "").toLowerCase().contains("windows")) {
-				r = Runtime.getRuntime().exec("cmd /c " + mvnCmdLine);
+				final var cmd = Stream.concat(
+						Stream.of("cmd", "/c"),
+						Arrays.asList(mvnCmdLine.split(" ")).stream())
+						.toList()
+						.toArray(new String[] {});
+
+				r = Runtime.getRuntime().exec(cmd);
 			} else {
 				r = Runtime.getRuntime().exec(new String[] { "/bin/sh", "-c", mvnCmdLine });
 			}
diff --git a/mailkit/src/test/java/tv/hd3g/mailkit/notification/implmail/NotificationMailTemplateToolkitTest.java b/mailkit/src/test/java/tv/hd3g/mailkit/notification/implmail/NotificationMailTemplateToolkitTest.java
index 0b958569..c56a1e10 100644
--- a/mailkit/src/test/java/tv/hd3g/mailkit/notification/implmail/NotificationMailTemplateToolkitTest.java
+++ b/mailkit/src/test/java/tv/hd3g/mailkit/notification/implmail/NotificationMailTemplateToolkitTest.java
@@ -16,6 +16,8 @@
  */
 package tv.hd3g.mailkit.notification.implmail;
 
+import static java.util.TimeZone.getTimeZone;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -31,7 +33,9 @@
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -66,6 +70,18 @@ class NotificationMailTemplateToolkitTest {
 	@Mock
 	Translate translate;
 
+	private static final TimeZone previous = TimeZone.getDefault();
+
+	@BeforeAll
+	static void load() {
+		TimeZone.setDefault(getTimeZone("GMT"));
+	}
+
+	@BeforeAll
+	static void free() {
+		TimeZone.setDefault(previous);
+	}
+
 	@BeforeEach
 	void init() throws Exception {
 		openMocks(this).close();
@@ -94,6 +110,8 @@ public boolean isSendAsSimpleNotificationThisContextEntry(final String contextKe
 				.thenReturn(faker.numerify("translate###"));
 		when(translate.i18n(eq(lang), eq(event.typeName()), any(), any(), any()))
 				.thenReturn(faker.numerify("translate###"));
+		when(translate.i18n(eq(lang), eq(event), any(), any(), any(), any()))
+				.thenReturn(faker.numerify("translate###"));
 	}
 
 	String checkStr(final String result) {
@@ -131,19 +149,19 @@ void testSpanWrapp() {
 	@Test
 	void testFormatLongDate() {
 		final var result = t.formatLongDate(new Date(2_000_000_000_000l), Locale.ENGLISH);
-		assertTrue(result.startsWith("Wednesday, May 18, 2033, ") && result.endsWith(":33:20 AM"), result);
+		assertThat(result).isEqualTo("Wednesday, May 18, 2033, 3:33:20 AM");
 	}
 
 	@Test
 	void testFormatShortDate() {
 		final var result = t.formatShortDate(new Date(2_000_000_000_000l), Locale.ENGLISH);
-		assertTrue(result.startsWith("5/18/33, ") && result.endsWith(":33:20 AM"), result);
+		assertThat(result).isEqualTo("5/18/33, 3:33:20 AM");
 	}
 
 	@Test
 	void testFormatShortTime() {
 		final var result = t.formatShortTime(new Date(2_000_000_000_000l), Locale.ENGLISH);
-		assertTrue(result.endsWith(":33:20 AM"), result);
+		assertThat(result).isEqualTo("3:33:20 AM");
 	}
 
 	@Test