From: PJ Fanning <fanningpj@apache.org>
Date: Tue, 12 Oct 2021 21:50:00 +0000 (+0000)
Subject: [bug-62021] test adding time to date-time
X-Git-Tag: REL_5_2_0~395
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=91d502732b7e441d2af63120f3ac23e4b71a4b64;p=poi.git

[bug-62021] test adding time to date-time

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1894175 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 3ffc986111..4e06e60161 100644
--- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -23,6 +23,8 @@ import static org.apache.commons.io.output.NullOutputStream.NULL_OUTPUT_STREAM;
 import static org.apache.logging.log4j.util.Unbox.box;
 import static org.apache.poi.extractor.ExtractorFactory.OOXML_PACKAGE;
 import static org.apache.poi.openxml4j.opc.TestContentType.isOldXercesActive;
+import static org.apache.poi.ss.util.Utils.addRow;
+import static org.apache.poi.ss.util.Utils.assertDouble;
 import static org.apache.poi.xssf.XSSFTestDataSamples.openSampleWorkbook;
 import static org.apache.poi.xssf.XSSFTestDataSamples.writeOutAndReadBack;
 import static org.junit.jupiter.api.Assertions.*;
@@ -35,6 +37,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.*;
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
@@ -46,7 +49,6 @@ import org.apache.poi.POIDataSamples;
 import org.apache.poi.common.usermodel.HyperlinkType;
 import org.apache.poi.hssf.HSSFITestDataProvider;
 import org.apache.poi.hssf.HSSFTestDataSamples;
-import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ooxml.POIXMLDocumentPart;
 import org.apache.poi.ooxml.POIXMLDocumentPart.RelationPart;
@@ -86,11 +88,7 @@ import org.apache.poi.ss.formula.eval.ValueEval;
 import org.apache.poi.ss.formula.functions.Function;
 import org.apache.poi.ss.formula.ptg.Ptg;
 import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.ss.util.AreaReference;
-import org.apache.poi.ss.util.CellAddress;
-import org.apache.poi.ss.util.CellRangeAddress;
-import org.apache.poi.ss.util.CellReference;
-import org.apache.poi.ss.util.CellUtil;
+import org.apache.poi.ss.util.*;
 import org.apache.poi.util.LocaleUtil;
 import org.apache.poi.util.TempFile;
 import org.apache.poi.util.XMLHelper;
@@ -1940,7 +1938,7 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
             mod.getCell(1).setCellValue(3);
             mod = sheet.getRow(2);
             mod.createCell(0).setCellValue(10);
-            HSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
+            XSSFFormulaEvaluator.evaluateAllFormulaCells(wb);
             assertEquals(256, mod.getCell(2).getNumericCellValue());
         }
     }
@@ -3641,4 +3639,18 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
             assertEquals("Can't open workbook - unsupported file type: XML", ie.getMessage());
         }
     }
+
+    @Test
+    void testBug62021() throws IOException {
+        try (XSSFWorkbook wb = new XSSFWorkbook()) {
+            XSSFFormulaEvaluator fe = new XSSFFormulaEvaluator(wb);
+            XSSFSheet sheet = wb.createSheet("testSheet");
+            LocalDateTime ldt = LocalDateTime.parse("2021-10-15T12:00:00");
+            addRow(sheet, 0, ldt);
+            XSSFCell cell = wb.getSheetAt(0).getRow(0).createCell(100);
+            assertDouble(fe, cell, "A1+1", DateUtil.getExcelDate(ldt) + 1);
+            LocalDateTime expected = ldt.plusMinutes(90);
+            assertDouble(fe, cell, "A1+\"1:30\"", DateUtil.getExcelDate(expected));
+        }
+    }
 }
\ No newline at end of file