diff --git a/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicBuilder.java b/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicBuilder.java index 446260b..914b87b 100644 --- a/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicBuilder.java +++ b/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicBuilder.java @@ -23,7 +23,7 @@ public class AnatomicBuilder { public interface CategoryBuilder { String getContextUID(); - String getTIdentifier(); + String getIdentifier(); String getTitle(); } @@ -48,7 +48,7 @@ public String getContextUID() { return ContextUID; } - public String getTIdentifier() { + public String getIdentifier() { return identifier; } @@ -98,7 +98,7 @@ public String getContextUID() { } @Override - public String getTIdentifier() { + public String getIdentifier() { return identifier; } diff --git a/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicRegion.java b/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicRegion.java index ac699b5..61804a2 100644 --- a/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicRegion.java +++ b/weasis-dicom-tools/src/main/java/org/weasis/dicom/ref/AnatomicRegion.java @@ -119,7 +119,7 @@ public static void write(Attributes dcm, AnatomicRegion region) { private static void writeRegionContext(Code code, CategoryBuilder category) { if (category != null) { code.setContextUID(category.getContextUID()); - code.setContextIdentifier(category.getTIdentifier()); + code.setContextIdentifier(category.getIdentifier()); } } 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 index 3c4ead7..0720fe4 100644 --- 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 @@ -24,6 +24,7 @@ import java.util.TimeZone; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.DefaultTimeZone; class DateTimeUtilsTest { @Test @@ -60,6 +61,7 @@ void testGetDicomTime() { @Test @DisplayName("Convert Date to LocalDate") + @DefaultTimeZone("UTC") void testGetDateToLocalDate() { assertNull(DateTimeUtils.toLocalDate(null)); @@ -75,6 +77,7 @@ void testGetDateToLocalDate() { @Test @DisplayName("Convert Date to LocalTime") + @DefaultTimeZone("UTC") void testGetDateToLocalTime() { assertNull(DateTimeUtils.toLocalTime(null)); @@ -90,6 +93,7 @@ void testGetDateToLocalTime() { @Test @DisplayName("Convert date to LocalDateTime") + @DefaultTimeZone("UTC") void testGetDateToLocalDateTime() { assertNull(DateTimeUtils.toLocalDateTime(null)); @@ -105,6 +109,7 @@ void testGetDateToLocalDateTime() { @Test @DisplayName("Get DateTime") + @DefaultTimeZone("UTC") 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 index ff8a1a5..e574623 100644 --- 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 @@ -29,24 +29,14 @@ 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.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.DefaultLocale; +import org.junitpioneer.jupiter.DefaultTimeZone; +@DefaultLocale(language = "en", country = "US") class DicomUtilsTest { - static final Locale defaultLocale = Locale.getDefault(); - - @BeforeAll - static void setUp() { - Locale.setDefault(Locale.US); // Force Locale for testing date format - } - - @AfterAll - static void tearDown() { - Locale.setDefault(defaultLocale); - } @Test @DisplayName("Get Period with different dates") @@ -254,6 +244,7 @@ void testGetStringArrayFromDicomElement() { @Test @DisplayName("Get Date from Dicom Element") + @DefaultTimeZone("Europe/Paris") void testGetDateFromDicomElement() { TimeZone timeZone = TimeZone.getDefault(); Attributes attributes = new Attributes(); @@ -277,6 +268,7 @@ void testGetDateFromDicomElement() { @Test @DisplayName("Get date array from Dicom Element with default value") + @DefaultTimeZone("Europe/Paris") 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 index 82dc0e1..eb51cc6 100644 --- 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 @@ -15,25 +15,13 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -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.Test; +import org.junitpioneer.jupiter.DefaultLocale; import org.weasis.dicom.ref.AnatomicBuilder.Category; +@DefaultLocale(language = "en", country = "US") class AnatomicBuilderTest { - static final Locale defaultLocale = Locale.getDefault(); - - @BeforeAll - static void setUp() { - Locale.setDefault(Locale.FRENCH); // Force Locale for testing date format - } - - @AfterAll - static void tearDown() { - Locale.setDefault(defaultLocale); - } @Test void getAllBodyParts_returnsAllBodyParts() { @@ -56,8 +44,8 @@ void getBodyPartFromCode() { BodyPart.values()[0], BodyPart.getBodyPartFromCode(BodyPart.values()[0].getCodeValue())); BodyPart bodyPart = BodyPart.getBodyPartFromCode("128559007"); - assertEquals("Artère géniculaire", bodyPart.getCodeMeaning()); - assertEquals("Artère géniculaire", bodyPart.toString()); + assertEquals("Genicular artery", bodyPart.getCodeMeaning()); + assertEquals("Genicular artery", bodyPart.toString()); assertEquals(CodingScheme.SCT, bodyPart.getCodingScheme()); assertTrue(bodyPart.isPaired()); assertFalse(bodyPart.isCommon()); @@ -74,7 +62,7 @@ void getBodyPartFromLegacyCode() { AnatomicBuilder.getBodyPartFromLegacyCode(BodyPart.values()[0].getLegacyCode())); BodyPart bodyPart = AnatomicBuilder.getBodyPartFromLegacyCode("PANCREATICDUCT"); assertNotNull(bodyPart); - assertEquals("Canal pancréatique", bodyPart.toString()); + assertEquals("Pancreatic duct", bodyPart.toString()); assertEquals(CodingScheme.SCT, bodyPart.getCodingScheme()); assertFalse(bodyPart.isPaired()); assertTrue(bodyPart.isCommon()); @@ -110,7 +98,7 @@ void getAnatomicModifierFromCode() { AnatomicModifier modifier = AnatomicModifier.getAnatomicModifierFromCode("49370004"); assertNotNull(modifier); - assertEquals("Latéral", modifier.toString()); + assertEquals("Lateral", modifier.toString()); assertEquals(CodingScheme.SCT, modifier.getCodingScheme()); String key = "nonExistentKey"; @@ -125,7 +113,7 @@ void getSurfacePartFromCode() { SurfacePart surfacePart = SurfacePart.getSurfacePartFromCode("130319"); assertNotNull(surfacePart); - assertEquals("Peau de l'hélix postérieur supérieur de l'oreille", surfacePart.toString()); + assertEquals("Skin of superior posterior helix of ear", surfacePart.toString()); assertEquals(CodingScheme.DCM, surfacePart.getCodingScheme()); assertTrue(surfacePart.isPaired()); assertNull(surfacePart.getLegacyCode()); @@ -157,7 +145,7 @@ void getCodingScheme() { @Test void category() { - assertEquals("Sites anatomiques dermatologiques", Category.SURFACE.toString()); + assertEquals("Dermatology Anatomic Site", Category.SURFACE.toString()); String key = "nonExistentKey"; assertEquals('!' + key + '!', MesCategory.getString(key)); diff --git a/weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicRegionTest.java b/weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicRegionTest.java index 72ccce1..6a2c4c4 100644 --- a/weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicRegionTest.java +++ b/weasis-dicom-tools/src/test/java/org/weasis/dicom/ref/AnatomicRegionTest.java @@ -20,9 +20,11 @@ import org.dcm4che3.data.Tag; import org.dcm4che3.data.VR; import org.junit.jupiter.api.Test; +import org.junitpioneer.jupiter.DefaultLocale; import org.weasis.dicom.ref.AnatomicBuilder.Category; import org.weasis.dicom.ref.AnatomicBuilder.OtherCategory; +@DefaultLocale(language = "en", country = "US") class AnatomicRegionTest { @Test