Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add CellUtil test 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1903837 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2022-09-02 22:54:03 +00:00
parent ff2e90e9a5
commit e485bf0b65
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
View File

@ -20,6 +20,7 @@ package org.apache.poi.ss.tests.util;
import org.apache.commons.codec.DecoderException;
import org.apache.commons.codec.binary.Hex;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.FillPatternType;
import org.apache.poi.ss.usermodel.IndexedColors;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
@ -31,7 +32,11 @@ import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.junit.jupiter.api.Test;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.util.LinkedHashMap;
import java.util.Map;
import static org.junit.jupiter.api.Assertions.*;
@ -83,4 +88,37 @@ class TestXSSFCellUtil extends BaseTestCellUtil {
assertEquals(IndexedColors.AUTOMATIC.getIndex(), cell.getCellStyle().getFillForegroundColor());
}
}
@Test
public void testSetForegroundColorCellStylePropertiesToNull() throws IOException, DecoderException {
try (Workbook workbook = new XSSFWorkbook()) {
final Sheet sheet = workbook.createSheet("Sheet");
final Row row = sheet.createRow(0);
final Cell cell = row.createCell(0);
final XSSFColor color = new XSSFColor(Hex.decodeHex("FF0000"));
{
final Map<String, Object> properties = new LinkedHashMap<>();
properties.put(CellUtil.FILL_FOREGROUND_COLOR_COLOR, color);
properties.put(CellUtil.FILL_PATTERN, FillPatternType.SOLID_FOREGROUND);
CellUtil.setCellStyleProperties(cell, properties);
}
assertEquals(color, cell.getCellStyle().getFillForegroundColorColor());
{
final Map<String, Object> properties = new LinkedHashMap<>();
properties.put(CellUtil.FILL_FOREGROUND_COLOR_COLOR, null);
properties.put(CellUtil.FILL_PATTERN, FillPatternType.NO_FILL);
CellUtil.setCellStyleProperties(cell, properties);
}
assertNull(cell.getCellStyle().getFillForegroundColorColor());
assertEquals(IndexedColors.AUTOMATIC.getIndex(), cell.getCellStyle().getFillForegroundColor());
}
}
}

6
poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
View File

@ -395,6 +395,12 @@ public final class CellUtil {
CellStyle newStyle = null;
Map<String, Object> values = getFormatProperties(originalStyle);
if (properties.containsKey(FILL_FOREGROUND_COLOR_COLOR) && properties.get(FILL_FOREGROUND_COLOR_COLOR) == null) {
values.remove(FILL_FOREGROUND_COLOR);
}
if (properties.containsKey(FILL_BACKGROUND_COLOR_COLOR) && properties.get(FILL_BACKGROUND_COLOR_COLOR) == null) {
values.remove(FILL_BACKGROUND_COLOR);
}
putAll(properties, values);
// index seems like what index the cellstyle is in the list of styles for a workbook.