diff options
3 files changed, 41 insertions, 0 deletions
diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java index 10ccde01fa..8f1ad227f6 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java @@ -61,6 +61,8 @@ import org.apache.poi.xddf.usermodel.chart.XDDFBarChartData; import org.apache.poi.xddf.usermodel.chart.XDDFChartData; import org.apache.poi.xssf.XSSFITestDataProvider; import org.apache.poi.xssf.model.StylesTable; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTCalcPr; import org.openxmlformats.schemas.spreadsheetml.x2006.main.CTExternalLink; @@ -79,6 +81,7 @@ import java.nio.charset.StandardCharsets; import java.util.Date; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.zip.CRC32; import static org.apache.poi.hssf.HSSFTestDataSamples.openSampleFileStream; @@ -100,6 +103,16 @@ public final class TestXSSFWorkbook extends BaseTestXWorkbook { super(XSSFITestDataProvider.instance); } + @BeforeAll + static void setUp() { + LocaleUtil.setUserLocale(Locale.US); + } + + @AfterAll + static void tearDown() { + LocaleUtil.setUserLocale(null); + } + /** * Tests that we can save, and then re-load a new document */ diff --git a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDays.java b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDays.java index c3b804995a..fab91e1fd0 100644 --- a/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDays.java +++ b/poi/src/test/java/org/apache/poi/ss/formula/functions/TestDays.java @@ -23,10 +23,14 @@ import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.ss.usermodel.FormulaError; +import org.apache.poi.util.LocaleUtil; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import java.io.IOException; import java.time.LocalDate; +import java.util.Locale; import static org.apache.poi.ss.util.Utils.addRow; import static org.apache.poi.ss.util.Utils.assertDouble; @@ -37,6 +41,16 @@ import static org.apache.poi.ss.util.Utils.assertError; */ public class TestDays { + @BeforeAll + static void setUp() { + LocaleUtil.setUserLocale(Locale.US); + } + + @AfterAll + static void tearDown() { + LocaleUtil.setUserLocale(null); + } + //https://support.microsoft.com/en-us/office/days-function-57740535-d549-4395-8728-0f07bff0b9df @Test void testMicrosoftExample1() throws IOException { diff --git a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java index 65ee8ffa49..eed2fd3cc3 100644 --- a/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java +++ b/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestDataFormat.java @@ -22,8 +22,12 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; +import java.util.Locale; import org.apache.poi.ss.ITestDataProvider; +import org.apache.poi.util.LocaleUtil; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; /** @@ -45,6 +49,16 @@ public abstract class BaseTestDataFormat { assertEquals(-1, BuiltinFormats.getBuiltinFormat(customFmt)); } + @BeforeAll + static void setUp() { + LocaleUtil.setUserLocale(Locale.US); + } + + @AfterAll + static void tearDown() { + LocaleUtil.setUserLocale(null); + } + @Test public final void testBuiltinFormats() throws IOException { try (Workbook wb = _testDataProvider.createWorkbook()) { |