]> source.dussan.org Git - poi.git/commitdiff
Fix locale error
authorAndreas Beeker <kiwiwings@apache.org>
Sun, 1 Nov 2015 08:43:57 +0000 (08:43 +0000)
committerAndreas Beeker <kiwiwings@apache.org>
Sun, 1 Nov 2015 08:43:57 +0000 (08:43 +0000)
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1711726 13f79535-47bb-0310-9956-ffa450edef68

src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java

index cc37c8153258ecfbc02c8ea4dd863bc4006c5346..2bed6b691019306c3bf8c371da0d59251f22e124 100644 (file)
@@ -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 {