Author: fanningpj
Date: Thu May 29 15:53:22 2025
New Revision: 1925936
URL: http://svn.apache.org/viewvc?rev=1925936&view=rev
Log:
add missing types to CellUtil.namePropertyMap
Added:
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java
- copied, changed from r1925878,
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/ss/util/CellUtil.java
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=1925936&r1=1925935&r2=1925936&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 May 29
15:53:22 2025
@@ -277,6 +277,7 @@ public final class CellUtil {
map.put(BORDER_RIGHT, CellPropertyType.BORDER_RIGHT);
map.put(BORDER_TOP, CellPropertyType.BORDER_TOP);
map.put(BOTTOM_BORDER_COLOR, CellPropertyType.BOTTOM_BORDER_COLOR);
+ map.put(DATA_FORMAT, CellPropertyType.DATA_FORMAT);
map.put(LEFT_BORDER_COLOR, CellPropertyType.LEFT_BORDER_COLOR);
map.put(RIGHT_BORDER_COLOR, CellPropertyType.RIGHT_BORDER_COLOR);
map.put(TOP_BORDER_COLOR, CellPropertyType.TOP_BORDER_COLOR);
@@ -290,9 +291,10 @@ public final class CellUtil {
map.put(INDENTION, CellPropertyType.INDENTION);
map.put(LOCKED, CellPropertyType.LOCKED);
map.put(ROTATION, CellPropertyType.ROTATION);
- map.put(VERTICAL_ALIGNMENT, CellPropertyType.VERTICAL_ALIGNMENT);
map.put(SHRINK_TO_FIT, CellPropertyType.SHRINK_TO_FIT);
map.put(QUOTE_PREFIXED, CellPropertyType.QUOTE_PREFIXED);
+ map.put(VERTICAL_ALIGNMENT, CellPropertyType.VERTICAL_ALIGNMENT);
+ map.put(WRAP_TEXT, CellPropertyType.WRAP_TEXT);
namePropertyMap = Collections.unmodifiableMap(map);
}
Copied: poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java
(from r1925878,
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestAreaReference.java)
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java?p2=poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java&p1=poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestAreaReference.java&r1=1925878&r2=1925936&rev=1925936&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestAreaReference.java
(original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/util/TestCellUtil.java Thu
May 29 15:53:22 2025
@@ -16,71 +16,21 @@
==================================================================== */
package org.apache.poi.ss.util;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.SpreadsheetVersion;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.CellPropertyType;
import org.junit.jupiter.api.Test;
-/**
- * Test for {@link AreaReference} handling of max rows.
- */
-class TestAreaReference {
- @Test
- void testWholeColumn() {
- AreaReference oldStyle =
AreaReference.getWholeColumn(SpreadsheetVersion.EXCEL97, "A", "B");
- assertEquals(0, oldStyle.getFirstCell().getCol());
- assertEquals(0, oldStyle.getFirstCell().getRow());
- assertEquals(1, oldStyle.getLastCell().getCol());
- assertEquals(SpreadsheetVersion.EXCEL97.getLastRowIndex(),
oldStyle.getLastCell().getRow());
- assertTrue(oldStyle.isWholeColumnReference());
-
- AreaReference oldStyleNonWholeColumn = new AreaReference("A1:B23",
SpreadsheetVersion.EXCEL97);
- assertFalse(oldStyleNonWholeColumn.isWholeColumnReference());
-
- AreaReference newStyle =
AreaReference.getWholeColumn(SpreadsheetVersion.EXCEL2007, "A", "B");
- assertEquals(0, newStyle.getFirstCell().getCol());
- assertEquals(0, newStyle.getFirstCell().getRow());
- assertEquals(1, newStyle.getLastCell().getCol());
- assertEquals(SpreadsheetVersion.EXCEL2007.getLastRowIndex(),
newStyle.getLastCell().getRow());
- assertTrue(newStyle.isWholeColumnReference());
-
- AreaReference newStyleNonWholeColumn = new AreaReference("A1:B23",
SpreadsheetVersion.EXCEL2007);
- assertFalse(newStyleNonWholeColumn.isWholeColumnReference());
- }
-
- @Test
- void testWholeRow() {
- AreaReference oldStyle =
AreaReference.getWholeRow(SpreadsheetVersion.EXCEL97, "1", "2");
- assertEquals(0, oldStyle.getFirstCell().getCol());
- assertEquals(0, oldStyle.getFirstCell().getRow());
- assertEquals(SpreadsheetVersion.EXCEL97.getLastColumnIndex(),
oldStyle.getLastCell().getCol());
- assertEquals(1, oldStyle.getLastCell().getRow());
+import java.util.Arrays;
- AreaReference newStyle =
AreaReference.getWholeRow(SpreadsheetVersion.EXCEL2007, "1", "2");
- assertEquals(0, newStyle.getFirstCell().getCol());
- assertEquals(0, newStyle.getFirstCell().getRow());
- assertEquals(SpreadsheetVersion.EXCEL2007.getLastColumnIndex(),
newStyle.getLastCell().getCol());
- assertEquals(1, newStyle.getLastCell().getRow());
- }
+import static org.junit.jupiter.api.Assertions.assertTrue;
+/**
+ * Test for CellUtil constants
+ */
+class TestCellUtil {
@Test
- void test62810() {
- final Workbook wb = new HSSFWorkbook();
- final Sheet sheet = wb.createSheet("Ctor test");
- final String sheetName = sheet.getSheetName();
- final CellReference topLeft = new CellReference(sheetName, 1, 1, true,
true);
- final CellReference bottomRight = new CellReference(sheetName, 5, 10,
true, true);
- final AreaReference goodAreaRef = new AreaReference(topLeft,
bottomRight, SpreadsheetVersion.EXCEL2007);
- final AreaReference badAreaRef = new AreaReference(bottomRight,
topLeft, SpreadsheetVersion.EXCEL2007);
-
- assertEquals("'Ctor test'!$B$2", topLeft.formatAsString());
- assertEquals("'Ctor test'!$K$6", bottomRight.formatAsString());
- assertEquals("'Ctor test'!$B$2:$K$6", goodAreaRef.formatAsString());
- assertEquals("'Ctor test'!$B$2:$K$6", badAreaRef.formatAsString());
+ void testNamePropertyMap() {
+ Arrays.stream(CellPropertyType.values()).forEach(cellPropertyType ->
+
assertTrue(CellUtil.namePropertyMap.containsValue(cellPropertyType),
+ "missing " + cellPropertyType));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
