diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java index c36d8f7d3..6b4170ddb 100644 --- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java +++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java @@ -29,6 +29,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.Arrays; @@ -2529,4 +2530,45 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues { FormulaEvaluator eval = wb.getCreationHelper().createFormulaEvaluator(); assertEquals(expectedResultOrNull, eval.evaluate(intF).formatAsString()); } + + @Test + public void test48962() { + Workbook wb = XSSFTestDataSamples.openSampleWorkbook("48962.xlsx"); + Sheet sh = wb.getSheetAt(0); + Row row = sh.getRow(1); + Cell cell = row.getCell(0); + + CellStyle style = cell.getCellStyle(); + assertNotNull(style); + + // color index + assertEquals(64, style.getFillBackgroundColor()); + XSSFColor color = ((XSSFCellStyle)style).getFillBackgroundXSSFColor(); + assertNotNull(color); + + // indexed color + assertEquals(64, color.getIndexed()); + assertEquals(64, color.getIndex()); + + // not an RGB color + assertFalse(color.isRGB()); + assertNull(color.getRGB()); + } + + @Test + public void test50755_workday_formula_example() { + Workbook wb = XSSFTestDataSamples.openSampleWorkbook("50755_workday_formula_example.xlsx"); + Sheet sheet = wb.getSheet("Sheet1"); + for(Row aRow : sheet) { + Cell cell = aRow.getCell(1); + if(cell.getCellType() == Cell.CELL_TYPE_FORMULA) { + String formula = cell.getCellFormula(); + //System.out.println("formula: " + formula); + assertNotNull(formula); + assertTrue(formula.contains("WORKDAY")); + } else { + assertNotNull(cell.toString()); + } + } + } } diff --git a/test-data/spreadsheet/48962.xlsx b/test-data/spreadsheet/48962.xlsx new file mode 100644 index 000000000..7d14f77f0 Binary files /dev/null and b/test-data/spreadsheet/48962.xlsx differ diff --git a/test-data/spreadsheet/50755_workday_formula_example.xlsx b/test-data/spreadsheet/50755_workday_formula_example.xlsx new file mode 100644 index 000000000..c3ad479b5 Binary files /dev/null and b/test-data/spreadsheet/50755_workday_formula_example.xlsx differ