Author: fanningpj
Date: Thu Sep 1 15:44:26 2022
New Revision: 1903816
URL: http://svn.apache.org/viewvc?rev=1903816&view=rev
Log:
bug-66052 fix broken test
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java?rev=1903816&r1=1903815&r2=1903816&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/util/TestXSSFCellUtil.java
Thu Sep 1 15:44:26 2022
@@ -28,7 +28,6 @@ import org.apache.poi.ss.util.CellUtil;
import org.apache.poi.xssf.XSSFITestDataProvider;
import org.apache.poi.xssf.usermodel.XSSFColor;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -41,7 +40,6 @@ class TestXSSFCellUtil extends BaseTestC
super(XSSFITestDataProvider.instance);
}
- @Disabled("see bug-66052 comment 10")
@Test
public void testSetForegroundColorCellStyleProperty() throws IOException,
DecoderException {
try (Workbook workbook = new XSSFWorkbook()) {
Modified: poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java?rev=1903816&r1=1903815&r2=1903816&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java (original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java Thu Sep 1
15:44:26 2022
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import org.apache.logging.log4j.LogManager;
@@ -415,16 +416,16 @@ public final class CellUtil {
cell.setCellStyle(newStyle);
}
- private static boolean styleMapsMatch(final Map<String, Object> map1,
final Map<String, Object> map2) {
- final Map<String, Object> map1Copy = new HashMap<>(map1);
- final Map<String, Object> map2Copy = new HashMap<>(map2);
+ private static boolean styleMapsMatch(final Map<String, Object> newProps,
final Map<String, Object> storedProps) {
+ final Map<String, Object> map1Copy = new HashMap<>(newProps);
+ final Map<String, Object> map2Copy = new HashMap<>(storedProps);
final Object backColor1 = map1Copy.remove(FILL_BACKGROUND_COLOR_COLOR);
final Object backColor2 = map2Copy.remove(FILL_BACKGROUND_COLOR_COLOR);
final Object foreColor1 = map1Copy.remove(FILL_FOREGROUND_COLOR_COLOR);
final Object foreColor2 = map2Copy.remove(FILL_FOREGROUND_COLOR_COLOR);
if (map1Copy.equals(map2Copy)) {
- final boolean backColorsMatch = backColor1 == null || backColor2
== null || backColor1.equals(backColor2);
- final boolean foreColorsMatch = foreColor1 == null || foreColor2
== null || foreColor1.equals(foreColor2);
+ final boolean backColorsMatch = backColor2 == null ||
Objects.equals(backColor1, backColor2);
+ final boolean foreColorsMatch = foreColor2 == null ||
Objects.equals(foreColor1, foreColor2);
return backColorsMatch && foreColorsMatch;
}
return false;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
