Fix locale for tests

Author: nroduit

weasis-dicom-tools/src/test/java/org/dcm4che3/img/util/DicomUtilsTest.java

@@ -29,34 +29,26 @@
 import org.dcm4che3.data.Attributes;
 import org.dcm4che3.data.Tag;
 import org.dcm4che3.data.VR;
-import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 
-@TestInstance(
-    TestInstance.Lifecycle.PER_CLASS) // To enable BeforeAll and AfterAll for Locale.setDefault()
 class DicomUtilsTest {
 
-  private static final String ORIGINAL_LANGUAGE = System.getProperty("user.language", "en");
-  private static final String ORIGINAL_COUNTRY = System.getProperty("user.country", "US");
+  private Locale defaultLocale;
 
-  @BeforeAll
-  public void setUpAll() {
-    System.setProperty("user.language", "en");
-    System.setProperty("user.country", "US");
-    // Clear the Locale cache
+  @BeforeEach
+  public void setUp() {
+    // Save the default locale to restore it after the test
+    defaultLocale = Locale.getDefault();
     Locale.setDefault(Locale.US);
   }
 
-  @AfterAll
-  public void tearDownAll() {
-    System.setProperty("user.language", ORIGINAL_LANGUAGE);
-    System.setProperty("user.country", ORIGINAL_COUNTRY);
-    // Clear the Locale cache
-    Locale.setDefault(new Locale(ORIGINAL_LANGUAGE, ORIGINAL_COUNTRY));
+  @AfterEach
+  public void tearDown() {
+    Locale.setDefault(defaultLocale);
   }
 
   @Test

weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicBuilderTest.java

@@ -17,32 +17,24 @@
 
 import java.util.Locale;
 import java.util.Objects;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.TestInstance;
 import org.weasis.dicom.ref.AnatomicBuilder.Category;
 
-@TestInstance(
-    TestInstance.Lifecycle.PER_CLASS) // To enable BeforeAll and AfterAll for Locale.setDefault()
 class AnatomicBuilderTest {
-  private static final String ORIGINAL_LANGUAGE = System.getProperty("user.language", "en");
-  private static final String ORIGINAL_COUNTRY = System.getProperty("user.country", "US");
-
-  @BeforeAll
-  public void setUpAll() {
-    System.setProperty("user.language", "fr");
-    System.setProperty("user.country", "FR");
-    // Clear the Locale cache
+  private Locale defaultLocale;
+
+  @BeforeEach
+  public void setUp() {
+    // Save the default locale to restore it after the test
+    defaultLocale = Locale.getDefault();
     Locale.setDefault(Locale.FRANCE);
   }
 
-  @AfterAll
-  public void tearDownAll() {
-    System.setProperty("user.language", ORIGINAL_LANGUAGE);
-    System.setProperty("user.country", ORIGINAL_COUNTRY);
-    // Clear the Locale cache
-    Locale.setDefault(new Locale(ORIGINAL_LANGUAGE, ORIGINAL_COUNTRY));
+  @AfterEach
+  public void tearDown() {
+    Locale.setDefault(defaultLocale);
   }
 
   @Test