From d41e05068855187d1e08d50e16f1428b1e1f30a1 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Wed, 22 Dec 2021 19:40:44 +0000 Subject: [PATCH] add tests git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1896288 13f79535-47bb-0310-9956-ffa450edef68 --- .../poi/xssf/eventusermodel/XSSFReader.java | 2 +- .../poi/xssf/eventusermodel/TestXSSFReader.java | 17 ++++++++++++----- .../apache/poi/xssf/usermodel/TestXSSFFont.java | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java index fa834e1c76..9a058eb8a5 100644 --- a/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java +++ b/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFReader.java @@ -131,7 +131,7 @@ public class XSSFReader { * or {@link ReadOnlySharedStringsTable}. * @since POI 5.2.0 */ - public boolean useReadOnlySharedStringsTable(boolean useReadOnlySharedStringsTable) { + public boolean useReadOnlySharedStringsTable() { return useReadOnlySharedStringsTable; } diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java index 1b02f66108..5506a364bd 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java @@ -44,9 +44,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.util.IOUtils; import org.apache.poi.util.XMLHelper; import org.apache.poi.xssf.XSSFTestDataSamples; -import org.apache.poi.xssf.model.Comments; -import org.apache.poi.xssf.model.CommentsTable; -import org.apache.poi.xssf.model.StylesTable; +import org.apache.poi.xssf.model.*; import org.apache.poi.xssf.streaming.SXSSFWorkbook; import org.apache.poi.xssf.usermodel.XSSFComment; import org.apache.poi.xssf.usermodel.XSSFShape; @@ -72,9 +70,18 @@ public final class TestXSSFReader { assertNotNull(r.getWorkbookData()); assertNotNull(r.getSharedStringsData()); assertNotNull(r.getStylesData()); - - assertNotNull(r.getSharedStringsTable()); assertNotNull(r.getStylesTable()); + + SharedStrings sst1 = r.getSharedStringsTable(); + assertNotNull(sst1); + assertTrue(sst1 instanceof SharedStringsTable, "instanceof SharedStringsTable"); + + assertFalse(r.useReadOnlySharedStringsTable(), "useReadOnlySharedStringsTable defaults to false"); + r.setUseReadOnlySharedStringsTable(true); + assertTrue(r.useReadOnlySharedStringsTable(), "useReadOnlySharedStringsTable changed to true"); + SharedStrings sst2 = r.getSharedStringsTable(); + assertNotNull(sst2); + assertTrue(sst2 instanceof ReadOnlySharedStringsTable, "instanceof ReadOnlySharedStringsTable"); } } diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java index de6ec4324a..251cf3257b 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFFont.java @@ -299,7 +299,7 @@ public final class TestXSSFFont extends BaseTestFont{ byte[] bytes = Integer.toHexString(0xF1F1F1).getBytes(LocaleUtil.CHARSET_1252); color.setRgb(bytes); - XSSFColor newColor=XSSFColor.from(color, null); + XSSFColor newColor = XSSFColor.from(color); xssfFont.setColor(newColor); assertEquals(ctFont.getColorArray(0).getRgb()[2],newColor.getRGB()[2]); -- 2.39.5