Fix locale for tests

nroduit · Jul 26, 2024 · 81566f2 · 81566f2
1 parent 40dad2c
commit 81566f2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/weasis-dicom-tools/src/test/java/org/dcm4che3/img/util/DicomUtilsTest.java b/weasis-dicom-tools/src/test/java/org/dcm4che3/img/util/DicomUtilsTest.java
@@ -45,10 +45,10 @@ class DicomUtilsTest {
 
   @BeforeAll
   public void setUpAll() {
-    System.setProperty("user.language", "fr");
-    System.setProperty("user.country", "FR");
+    System.setProperty("user.language", "en");
+    System.setProperty("user.country", "US");
     // Clear the Locale cache
-    Locale.setDefault(Locale.FRANCE);
+    Locale.setDefault(Locale.US);
   }
 
   @AfterAll

diff --git a/weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicBuilderTest.java b/weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicBuilderTest.java
@@ -26,17 +26,23 @@
 @TestInstance(
     TestInstance.Lifecycle.PER_CLASS) // To enable BeforeAll and AfterAll for Locale.setDefault()
 class AnatomicBuilderTest {
-  private Locale defaultLocale;
+  private static final String ORIGINAL_LANGUAGE = System.getProperty("user.language");
+  private static final String ORIGINAL_COUNTRY = System.getProperty("user.country");
 
   @BeforeAll
-  void setUp() {
-    defaultLocale = Locale.getDefault();
-    Locale.setDefault(Locale.FRENCH); // Force Locale for testing translation
+  public void setUpAll() {
+    System.setProperty("user.language", "fr");
+    System.setProperty("user.country", "FR");
+    // Clear the Locale cache
+    Locale.setDefault(Locale.FRANCE);
   }
 
   @AfterAll
-  void tearDown() {
-    Locale.setDefault(defaultLocale);
+  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));
   }
 
   @Test