aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Beeker <kiwiwings@apache.org>2015-11-01 08:43:57 +0000
committerAndreas Beeker <kiwiwings@apache.org>2015-11-01 08:43:57 +0000
commitcff4102574508fb9cf783177441c2e26660e3224 (patch)
tree137482399236924cd43fad431d2729f91243debe /src
parent5fd534c44bb95d55c3b6b84a2e11df35221f48b4 (diff)
downloadpoi-cff4102574508fb9cf783177441c2e26660e3224.tar.gz
poi-cff4102574508fb9cf783177441c2e26660e3224.zip
Fix locale error
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1711726 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
index cc37c81532..2bed6b6910 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
@@ -32,6 +32,7 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.zip.CRC32;
@@ -63,6 +64,7 @@ import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.apache.poi.ss.util.AreaReference;
import org.apache.poi.ss.util.CellReference;
import org.apache.poi.util.IOUtils;
+import org.apache.poi.util.LocaleUtil;
import org.apache.poi.util.TempFile;
import org.apache.poi.xssf.XSSFITestDataProvider;
import org.apache.poi.xssf.XSSFTestDataSamples;
@@ -1039,7 +1041,7 @@ public final class TestXSSFWorkbook extends BaseTestWorkbook {
@Test
public void testBug56957CloseWorkbook() throws Exception {
File file = TempFile.createTempFile("TestBug56957_", ".xlsx");
- final String dateExp = "Sun Nov 09 00:00:00 CET 2014";
+ final Date dateExp = LocaleUtil.getLocaleCalendar(2014, 10, 9).getTime();
try {
// as the file is written to, we make a copy before actually working on it
@@ -1049,27 +1051,27 @@ public final class TestXSSFWorkbook extends BaseTestWorkbook {
// read-only mode works!
Workbook workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ));
- String str = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString();
- assertEquals(dateExp, str);
+ Date dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue();
+ assertEquals(dateExp, dateAct);
workbook.close();
workbook = null;
workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ));
- str = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString();
- assertEquals(dateExp, str);
+ dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue();
+ assertEquals(dateExp, dateAct);
workbook.close();
workbook = null;
// now check read/write mode
workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ_WRITE));
- str = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString();
- assertEquals(dateExp, str);
+ dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue();
+ assertEquals(dateExp, dateAct);
workbook.close();
workbook = null;
workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ_WRITE));
- str = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString();
- assertEquals(dateExp, str);
+ dateAct = workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue();
+ assertEquals(dateExp, dateAct);
workbook.close();
workbook = null;
} finally {