Author: fanningpj
Date: Wed Mar  9 20:12:37 2022
New Revision: 1898803

URL: http://svn.apache.org/viewvc?rev=1898803&view=rev
Log:
[bug-65943] support rich text in SXSSFWorkbook (only when shared string table 
is enabled)

Modified:
    
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java

Modified: 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
URL: 
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java?rev=1898803&r1=1898802&r2=1898803&view=diff
==============================================================================
--- 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
 (original)
+++ 
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestSXSSFWorkbook.java
 Wed Mar  9 20:12:37 2022
@@ -160,47 +160,12 @@ public final class TestSXSSFWorkbook ext
 
     @Test
     void useSharedStringsTableWithRichText() throws Exception {
-        try (SXSSFWorkbook wb = new SXSSFWorkbook(null, 10, false, true)) {
-
-            SharedStringsTable sss = wb.getSharedStringSource();
-
-            assertNotNull(sss);
-
-            XSSFFont redFont = new XSSFFont();
-            redFont.setColor(new XSSFColor(new java.awt.Color(241,76,93), new 
DefaultIndexedColorMap()));
-
-            Row row = wb.createSheet("S1").createRow(0);
-
-            row.createCell(0).setCellValue("A");
-            row.createCell(1).setCellValue("B");
-            XSSFRichTextString rts = new XSSFRichTextString("A");
-            rts.applyFont(redFont);
-            row.createCell(2).setCellValue(rts);
-
-            try (XSSFWorkbook xssfWorkbook = 
SXSSFITestDataProvider.instance.writeOutAndReadBack(wb)) {
-                sss = wb.getSharedStringSource();
-                assertEquals(3, sss.getUniqueCount());
-                assertTrue(wb.dispose());
+        testUseSharedStringsTableWithRichText(false);
+    }
 
-                Sheet sheet1 = xssfWorkbook.getSheetAt(0);
-                assertEquals("S1", sheet1.getSheetName());
-                assertEquals(1, sheet1.getPhysicalNumberOfRows());
-                row = sheet1.getRow(0);
-                assertNotNull(row);
-                Cell cell = row.getCell(0);
-                assertNotNull(cell);
-                assertEquals("A", cell.getStringCellValue());
-                cell = row.getCell(1);
-                assertNotNull(cell);
-                assertEquals("B", cell.getStringCellValue());
-                cell = row.getCell(2);
-                assertNotNull(cell);
-                assertEquals("A", cell.getStringCellValue());
-                XSSFRichTextString outputRichTextString = (XSSFRichTextString) 
cell.getRichStringCellValue();
-                XSSFFont outputFont = outputRichTextString.getFontAtIndex(0);
-                assertEquals(redFont, outputFont);
-            }
-        }
+    @Test
+    void useSharedStringsTableWithRichTextAndCompression() throws Exception {
+        testUseSharedStringsTableWithRichText(true);
     }
 
     @Test
@@ -569,4 +534,49 @@ public final class TestSXSSFWorkbook ext
     @Disabled("not implemented")
     protected void changeSheetNameWithSharedFormulas() {
     }
+
+    private void testUseSharedStringsTableWithRichText(boolean 
compressTempFiles) throws Exception {
+        try (SXSSFWorkbook wb = new SXSSFWorkbook(null, 10, compressTempFiles, 
true)) {
+
+            SharedStringsTable sss = wb.getSharedStringSource();
+
+            assertNotNull(sss);
+
+            XSSFFont redFont = new XSSFFont();
+            redFont.setColor(new XSSFColor(new java.awt.Color(241,76,93), new 
DefaultIndexedColorMap()));
+
+            Row row = wb.createSheet("S1").createRow(0);
+
+            row.createCell(0).setCellValue("A");
+            row.createCell(1).setCellValue("B");
+            XSSFRichTextString rts = new XSSFRichTextString("A");
+            rts.applyFont(redFont);
+            row.createCell(2).setCellValue(rts);
+
+            try (XSSFWorkbook xssfWorkbook = 
SXSSFITestDataProvider.instance.writeOutAndReadBack(wb)) {
+                sss = wb.getSharedStringSource();
+                assertEquals(3, sss.getUniqueCount());
+                assertTrue(wb.dispose());
+
+                Sheet sheet1 = xssfWorkbook.getSheetAt(0);
+                assertEquals("S1", sheet1.getSheetName());
+                assertEquals(1, sheet1.getPhysicalNumberOfRows());
+                row = sheet1.getRow(0);
+                assertNotNull(row);
+                Cell cell = row.getCell(0);
+                assertNotNull(cell);
+                assertEquals("A", cell.getStringCellValue());
+                cell = row.getCell(1);
+                assertNotNull(cell);
+                assertEquals("B", cell.getStringCellValue());
+                cell = row.getCell(2);
+                assertNotNull(cell);
+                assertEquals("A", cell.getStringCellValue());
+                XSSFRichTextString outputRichTextString = (XSSFRichTextString) 
cell.getRichStringCellValue();
+                XSSFFont outputFont = outputRichTextString.getFontAtIndex(0);
+                assertEquals(redFont, outputFont);
+            }
+        }
+    }
+
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to