Fix Locale and TimeZone in tests

nroduit · Jul 26, 2024 · 58f5584 · 58f5584
1 parent 04a8c67
commit 58f5584
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/weasis-dicom-tools/src/test/java/org/dcm4che3/img/util/DateTimeUtilsTest.java b/weasis-dicom-tools/src/test/java/org/dcm4che3/img/util/DateTimeUtilsTest.java
@@ -25,6 +25,7 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.DefaultTimeZone;
+import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
 
 class DateTimeUtilsTest {
   @Test
@@ -62,6 +63,7 @@ void testGetDicomTime() {
   @Test
   @DisplayName("Convert Date to LocalDate")
   @DefaultTimeZone("UTC")
+  @ReadsDefaultTimeZone
   void testGetDateToLocalDate() {
     assertNull(DateTimeUtils.toLocalDate(null));
 
@@ -78,6 +80,7 @@ void testGetDateToLocalDate() {
   @Test
   @DisplayName("Convert Date to LocalTime")
   @DefaultTimeZone("UTC")
+  @ReadsDefaultTimeZone
   void testGetDateToLocalTime() {
     assertNull(DateTimeUtils.toLocalTime(null));
 
@@ -94,6 +97,7 @@ void testGetDateToLocalTime() {
   @Test
   @DisplayName("Convert date to LocalDateTime")
   @DefaultTimeZone("UTC")
+  @ReadsDefaultTimeZone
   void testGetDateToLocalDateTime() {
     assertNull(DateTimeUtils.toLocalDateTime(null));
 
@@ -110,6 +114,7 @@ void testGetDateToLocalDateTime() {
   @Test
   @DisplayName("Get DateTime")
   @DefaultTimeZone("UTC")
+  @ReadsDefaultTimeZone
   void testGetDateTime() {
     assertNull(DateTimeUtils.dateTime((LocalDate) null, null));
 

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
@@ -34,6 +34,8 @@
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.DefaultLocale;
 import org.junitpioneer.jupiter.DefaultTimeZone;
+import org.junitpioneer.jupiter.ReadsDefaultLocale;
+import org.junitpioneer.jupiter.ReadsDefaultTimeZone;
 
 class DicomUtilsTest {
 
@@ -145,6 +147,7 @@ void testIsNative() {
   @Test
   @DisplayName("Format text with different values and formats")
   @DefaultLocale(language = "en", country = "US")
+  @ReadsDefaultLocale
   void testGetFormattedText() {
     assertEquals("Value", DicomUtils.getFormattedText("Value", "Format"));
     assertEquals("", DicomUtils.getFormattedText(null, "foo"));
@@ -196,6 +199,7 @@ void shouldFormatNonStringValue() {
   @Test
   @DisplayName("Format value with decimal and pattern")
   @DefaultLocale(language = "en", country = "US")
+  @ReadsDefaultLocale
   void shouldFormatValueWithDecimalAndPattern() {
     String result = DicomUtils.formatValue("1.2345", true, "$V:f$0.00$");
     assertEquals("1.23", result);
@@ -246,6 +250,7 @@ void testGetStringArrayFromDicomElement() {
   @Test
   @DisplayName("Get Date from Dicom Element")
   @DefaultTimeZone("Europe/Paris")
+  @ReadsDefaultTimeZone
   void testGetDateFromDicomElement() {
     TimeZone timeZone = TimeZone.getDefault();
     Attributes attributes = new Attributes();
@@ -270,6 +275,7 @@ void testGetDateFromDicomElement() {
   @Test
   @DisplayName("Get date array from Dicom Element with default value")
   @DefaultTimeZone("Europe/Paris")
+  @ReadsDefaultTimeZone
   void testGetDatesFromDicomElement() {
     TimeZone timeZone = TimeZone.getDefault();
     Attributes dicom = new Attributes();

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
@@ -18,6 +18,7 @@
 import java.util.Objects;
 import org.junit.jupiter.api.Test;
 import org.junitpioneer.jupiter.DefaultLocale;
+import org.junitpioneer.jupiter.ReadsDefaultLocale;
 import org.weasis.dicom.ref.AnatomicBuilder.Category;
 
 class AnatomicBuilderTest {
@@ -39,6 +40,7 @@ void getBodyPartsFromPredicate_returnsFilteredBodyParts() {
 
   @Test
   @DefaultLocale(language = "fr", country = "CH")
+  @ReadsDefaultLocale
   void getBodyPartFromCode() {
     assertEquals(
         BodyPart.values()[0], BodyPart.getBodyPartFromCode(BodyPart.values()[0].getCodeValue()));
@@ -57,6 +59,7 @@ void getBodyPartFromCode() {
 
   @Test
   @DefaultLocale(language = "fr", country = "CH")
+  @ReadsDefaultLocale
   void getBodyPartFromLegacyCode() {
     assertEquals(
         BodyPart.values()[0],
@@ -93,6 +96,7 @@ void getBodyPartFromCodeMeaning() {
 
   @Test
   @DefaultLocale(language = "fr", country = "CH")
+  @ReadsDefaultLocale
   void getAnatomicModifierFromCode() {
     assertEquals(
         AnatomicModifier.values()[0],
@@ -109,6 +113,7 @@ void getAnatomicModifierFromCode() {
 
   @Test
   @DefaultLocale(language = "fr", country = "CH")
+  @ReadsDefaultLocale
   void getSurfacePartFromCode() {
     assertEquals(
         SurfacePart.values()[0],
@@ -148,6 +153,7 @@ void getCodingScheme() {
 
   @Test
   @DefaultLocale(language = "fr", country = "CH")
+  @ReadsDefaultLocale
   void category() {
     assertEquals("Sites anatomiques dermatologiques", Category.SURFACE.toString());