diff options
| -rw-r--r-- | src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java | 21 | ||||
| -rw-r--r-- | src/testcases/org/apache/poi/ss/formula/functions/TestText.java | 1 |
2 files changed, 19 insertions, 3 deletions
diff --git a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java index 224c2bd7dc..8e8a06d3c1 100644 --- a/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java +++ b/src/testcases/org/apache/poi/hssf/usermodel/TestHSSFDateUtil.java @@ -42,13 +42,28 @@ import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.model.InternalWorkbook; import org.apache.poi.ss.usermodel.DateUtil; import org.apache.poi.util.LocaleUtil; +import org.junit.AfterClass; +import org.junit.BeforeClass; import org.junit.Test; /** * Class TestHSSFDateUtil */ -public final class TestHSSFDateUtil { +public class TestHSSFDateUtil { + static TimeZone userTimeZone; + + @BeforeClass + public static void setCEST() { + userTimeZone = LocaleUtil.getUserTimeZone(); + LocaleUtil.setUserTimeZone(TimeZone.getTimeZone("CEST")); + } + + @AfterClass + public static void resetTimeZone() { + LocaleUtil.setUserTimeZone(userTimeZone); + } + /** * Checks the date conversion functions in the HSSFDateUtil class. */ @@ -136,9 +151,9 @@ public final class TestHSSFDateUtil { cal.set(Calendar.HOUR_OF_DAY, hour); Date javaDate = HSSFDateUtil.getJavaDate(excelDate, false); + double actDate = HSSFDateUtil.getExcelDate(javaDate, false); assertEquals("Checking " + hour + " hours on Daylight Saving Time start date", - excelDate, - HSSFDateUtil.getExcelDate(javaDate, false), oneMinute); + excelDate, actDate, oneMinute); } } diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestText.java b/src/testcases/org/apache/poi/ss/formula/functions/TestText.java index 4249de677b..928c639fae 100644 --- a/src/testcases/org/apache/poi/ss/formula/functions/TestText.java +++ b/src/testcases/org/apache/poi/ss/formula/functions/TestText.java @@ -115,6 +115,7 @@ public final class TestText { // update: now the locale will be (if not set otherwise) always Locale.getDefault() (see LocaleUtil) DateFormatSymbols dfs = DateFormatSymbols.getInstance(LocaleUtil.getUserLocale()); SimpleDateFormat sdf = new SimpleDateFormat("MMMM", dfs); + sdf.setTimeZone(LocaleUtil.getUserTimeZone()); String november = sdf.format(LocaleUtil.getLocaleCalendar(2015,10,1).getTime()); // Again with Java style |