You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/05/22 20:22:17 UTC
svn commit: r1890119 [8/10] - in /poi/trunk/poi-ooxml/src:
main/java/org/apache/poi/ooxml/extractor/
main/java/org/apache/poi/ooxml/util/
main/java/org/apache/poi/openxml4j/exceptions/
main/java/org/apache/poi/openxml4j/opc/ main/java/org/apache/poi/op...
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/openxml4j/opc/TestRelationships.java Sat May 22 20:22:16 2021
@@ -36,12 +36,12 @@ import org.junit.jupiter.api.Test;
class TestRelationships {
- private static final String HYPERLINK_REL_TYPE =
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
- private static final String COMMENTS_REL_TYPE =
- "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
- private static final String SHEET_WITH_COMMENTS =
- "/xl/worksheets/sheet1.xml";
+ private static final String HYPERLINK_REL_TYPE =
+ "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
+ private static final String COMMENTS_REL_TYPE =
+ "http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments";
+ private static final String SHEET_WITH_COMMENTS =
+ "/xl/worksheets/sheet1.xml";
private static final Logger LOG = LogManager.getLogger(TestPackageCoreProperties.class);
@@ -155,72 +155,72 @@ class TestRelationships {
*/
@Test
void testCreateExcelHyperlinkRelations() throws Exception {
- String filepath = OpenXML4JTestDataSamples.getSampleFileName("ExcelWithHyperlinks.xlsx");
- OPCPackage pkg = OPCPackage.open(filepath, PackageAccess.READ_WRITE);
- PackagePart sheet = pkg.getPart(
- PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
- assertNotNull(sheet);
-
- assertEquals(3, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
-
- // Add three new ones
- PackageRelationship openxml4j =
- sheet.addExternalRelationship("http://www.openxml4j.org/", HYPERLINK_REL_TYPE);
- PackageRelationship sf =
- sheet.addExternalRelationship("http://openxml4j.sf.net/", HYPERLINK_REL_TYPE);
- PackageRelationship file =
- sheet.addExternalRelationship("MyDocument.docx", HYPERLINK_REL_TYPE);
-
- // Check they were added properly
- assertNotNull(openxml4j);
- assertNotNull(sf);
- assertNotNull(file);
-
- assertEquals(6, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
-
- assertEquals("http://www.openxml4j.org/", openxml4j.getTargetURI().toString());
- assertEquals("/xl/worksheets/sheet1.xml", openxml4j.getSourceURI().toString());
- assertEquals(HYPERLINK_REL_TYPE, openxml4j.getRelationshipType());
-
- assertEquals("http://openxml4j.sf.net/", sf.getTargetURI().toString());
- assertEquals("/xl/worksheets/sheet1.xml", sf.getSourceURI().toString());
- assertEquals(HYPERLINK_REL_TYPE, sf.getRelationshipType());
-
- assertEquals("MyDocument.docx", file.getTargetURI().toString());
- assertEquals("/xl/worksheets/sheet1.xml", file.getSourceURI().toString());
- assertEquals(HYPERLINK_REL_TYPE, file.getRelationshipType());
-
- // Will get ids 7, 8 and 9, as we already have 1-6
- assertEquals("rId7", openxml4j.getId());
- assertEquals("rId8", sf.getId());
- assertEquals("rId9", file.getId());
-
-
- // Write out and re-load
- UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
- pkg.save(baos);
+ String filepath = OpenXML4JTestDataSamples.getSampleFileName("ExcelWithHyperlinks.xlsx");
+ OPCPackage pkg = OPCPackage.open(filepath, PackageAccess.READ_WRITE);
+ PackagePart sheet = pkg.getPart(
+ PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
+ assertNotNull(sheet);
+
+ assertEquals(3, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
+
+ // Add three new ones
+ PackageRelationship openxml4j =
+ sheet.addExternalRelationship("http://www.openxml4j.org/", HYPERLINK_REL_TYPE);
+ PackageRelationship sf =
+ sheet.addExternalRelationship("http://openxml4j.sf.net/", HYPERLINK_REL_TYPE);
+ PackageRelationship file =
+ sheet.addExternalRelationship("MyDocument.docx", HYPERLINK_REL_TYPE);
+
+ // Check they were added properly
+ assertNotNull(openxml4j);
+ assertNotNull(sf);
+ assertNotNull(file);
+
+ assertEquals(6, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
+
+ assertEquals("http://www.openxml4j.org/", openxml4j.getTargetURI().toString());
+ assertEquals("/xl/worksheets/sheet1.xml", openxml4j.getSourceURI().toString());
+ assertEquals(HYPERLINK_REL_TYPE, openxml4j.getRelationshipType());
+
+ assertEquals("http://openxml4j.sf.net/", sf.getTargetURI().toString());
+ assertEquals("/xl/worksheets/sheet1.xml", sf.getSourceURI().toString());
+ assertEquals(HYPERLINK_REL_TYPE, sf.getRelationshipType());
+
+ assertEquals("MyDocument.docx", file.getTargetURI().toString());
+ assertEquals("/xl/worksheets/sheet1.xml", file.getSourceURI().toString());
+ assertEquals(HYPERLINK_REL_TYPE, file.getRelationshipType());
+
+ // Will get ids 7, 8 and 9, as we already have 1-6
+ assertEquals("rId7", openxml4j.getId());
+ assertEquals("rId8", sf.getId());
+ assertEquals("rId9", file.getId());
- // use revert to not re-write the input file
+
+ // Write out and re-load
+ UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
+ pkg.save(baos);
+
+ // use revert to not re-write the input file
pkg.revert();
- pkg = OPCPackage.open(baos.toInputStream());
+ pkg = OPCPackage.open(baos.toInputStream());
- // Check again
- sheet = pkg.getPart(PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
+ // Check again
+ sheet = pkg.getPart(PackagingURIHelper.createPartName(SHEET_WITH_COMMENTS));
- assertEquals(6, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
+ assertEquals(6, sheet.getRelationshipsByType(HYPERLINK_REL_TYPE).size());
- assertEquals("http://poi.apache.org/",
- sheet.getRelationship("rId1").getTargetURI().toString());
- assertEquals("mailto:dev@poi.apache.org?subject=XSSF%20Hyperlinks",
- sheet.getRelationship("rId3").getTargetURI().toString());
-
- assertEquals("http://www.openxml4j.org/",
- sheet.getRelationship("rId7").getTargetURI().toString());
- assertEquals("http://openxml4j.sf.net/",
- sheet.getRelationship("rId8").getTargetURI().toString());
- assertEquals("MyDocument.docx",
- sheet.getRelationship("rId9").getTargetURI().toString());
+ assertEquals("http://poi.apache.org/",
+ sheet.getRelationship("rId1").getTargetURI().toString());
+ assertEquals("mailto:dev@poi.apache.org?subject=XSSF%20Hyperlinks",
+ sheet.getRelationship("rId3").getTargetURI().toString());
+
+ assertEquals("http://www.openxml4j.org/",
+ sheet.getRelationship("rId7").getTargetURI().toString());
+ assertEquals("http://openxml4j.sf.net/",
+ sheet.getRelationship("rId8").getTargetURI().toString());
+ assertEquals("MyDocument.docx",
+ sheet.getRelationship("rId9").getTargetURI().toString());
}
@Test
@@ -352,9 +352,9 @@ class TestRelationships {
@Test
void testSelfRelations_bug51187() throws Exception {
- UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
+ UnsynchronizedByteArrayOutputStream baos = new UnsynchronizedByteArrayOutputStream();
PackageRelationship rel1;
- try (OPCPackage pkg = OPCPackage.create(baos)) {
+ try (OPCPackage pkg = OPCPackage.create(baos)) {
PackagePart partA =
pkg.createPart(PackagingURIHelper.createPartName("/partA"), "text/plain");
@@ -367,7 +367,7 @@ class TestRelationships {
// Save, and re-load
}
- try (OPCPackage pkg = OPCPackage.open(baos.toInputStream())) {
+ try (OPCPackage pkg = OPCPackage.open(baos.toInputStream())) {
PackagePart partA = pkg.getPart(PackagingURIHelper.createPartName("/partA"));
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/poifs/crypt/dsig/TestSignatureInfo.java Sat May 22 20:22:16 2021
@@ -174,12 +174,12 @@ class TestSignatureInfo {
private KeyPair keyPair;
private X509Certificate x509;
- @BeforeAll
- public static void setUpClass() {
- POITestCase.setImageIOCacheDir();
- }
+ @BeforeAll
+ public static void setUpClass() {
+ POITestCase.setImageIOCacheDir();
+ }
- @AfterAll
+ @AfterAll
public static void removeUserLocale() {
LocaleUtil.resetUserLocale();
}
@@ -748,13 +748,13 @@ class TestSignatureInfo {
void bug65214() throws Exception {
initKeyPair();
- UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream();
- try (XWPFDocument doc = new XWPFDocument()) {
+ UnsynchronizedByteArrayOutputStream bos = new UnsynchronizedByteArrayOutputStream();
+ try (XWPFDocument doc = new XWPFDocument()) {
XWPFHyperlinkRun r = doc.createParagraph().createHyperlinkRun("http://poi.apache.org");
- r.setText("Hyperlink");
- r.setUnderline(UnderlinePatterns.SINGLE);
- r.setUnderlineColor("0000FF");
- doc.write(bos);
+ r.setText("Hyperlink");
+ r.setUnderline(UnderlinePatterns.SINGLE);
+ r.setUnderlineColor("0000FF");
+ doc.write(bos);
}
SignatureConfig signatureConfig = new SignatureConfig();
@@ -966,7 +966,7 @@ class TestSignatureInfo {
try (OPCPackage pkg = OPCPackage.open(signDoc, PackageAccess.READ)) {
SignatureLine line2 = sup.get();
try (POIXMLDocument doc = reinit.init(line2, pkg)) {
- assertNotNull(doc);
+ assertNotNull(doc);
line2.parse();
assertEquals(line.getSuggestedSigner(), line2.getSuggestedSigner());
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/ss/tests/formula/eval/TestXSSFCircularReferences.java Sat May 22 20:22:16 2021
@@ -24,7 +24,7 @@ import org.apache.poi.xssf.XSSFITestData
* Tests XSSFFormulaEvaluator for its handling of cell formula circular references.
*/
public final class TestXSSFCircularReferences extends BaseTestCircularReferences {
- public TestXSSFCircularReferences() {
+ public TestXSSFCircularReferences() {
super(XSSFITestDataProvider.instance);
}
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/TestXSLFSlideShow.java Sat May 22 20:22:16 2021
@@ -48,94 +48,94 @@ class TestXSLFSlideShow {
@BeforeEach
void setUp() throws Exception {
- pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx"));
- }
+ pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx"));
+ }
- @AfterEach
- void tearDown() throws IOException {
- pack.close();
- }
+ @AfterEach
+ void tearDown() throws IOException {
+ pack.close();
+ }
@Test
- void testContainsMainContentType() throws Exception {
- boolean found = false;
- for(PackagePart part : pack.getParts()) {
- if(part.getContentType().equals(XSLFRelation.MAIN.getContentType())) {
- found = true;
- }
- }
- assertTrue(found);
- }
+ void testContainsMainContentType() throws Exception {
+ boolean found = false;
+ for(PackagePart part : pack.getParts()) {
+ if(part.getContentType().equals(XSLFRelation.MAIN.getContentType())) {
+ found = true;
+ }
+ }
+ assertTrue(found);
+ }
@Test
- void testOpen() throws IOException, OpenXML4JException, XmlException {
- // With the finalized uri, should be fine
- XSLFSlideShow xml = new XSLFSlideShow(pack);
- // Check the core
- assertNotNull(xml.getPresentation());
-
- // Check it has some slides
- assertNotEquals(0, xml.getSlideReferences().sizeOfSldIdArray());
- assertNotEquals(0, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
+ void testOpen() throws IOException, OpenXML4JException, XmlException {
+ // With the finalized uri, should be fine
+ XSLFSlideShow xml = new XSLFSlideShow(pack);
+ // Check the core
+ assertNotNull(xml.getPresentation());
+
+ // Check it has some slides
+ assertNotEquals(0, xml.getSlideReferences().sizeOfSldIdArray());
+ assertNotEquals(0, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
- xml.close();
- }
+ xml.close();
+ }
@Test
- void testSlideBasics() throws IOException, OpenXML4JException, XmlException {
- XSLFSlideShow xml = new XSLFSlideShow(pack);
+ void testSlideBasics() throws IOException, OpenXML4JException, XmlException {
+ XSLFSlideShow xml = new XSLFSlideShow(pack);
- // Should have 1 master
- assertEquals(1, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
+ // Should have 1 master
+ assertEquals(1, xml.getSlideMasterReferences().sizeOfSldMasterIdArray());
- // Should have three sheets
- assertEquals(2, xml.getSlideReferences().sizeOfSldIdArray());
+ // Should have three sheets
+ assertEquals(2, xml.getSlideReferences().sizeOfSldIdArray());
- // Check they're as expected
- CTSlideIdListEntry[] slides = xml.getSlideReferences().getSldIdArray();
+ // Check they're as expected
+ CTSlideIdListEntry[] slides = xml.getSlideReferences().getSldIdArray();
- assertEquals(256, slides[0].getId());
- assertEquals(257, slides[1].getId());
- assertEquals("rId2", slides[0].getId2());
- assertEquals("rId3", slides[1].getId2());
+ assertEquals(256, slides[0].getId());
+ assertEquals(257, slides[1].getId());
+ assertEquals("rId2", slides[0].getId2());
+ assertEquals("rId3", slides[1].getId2());
- // Now get those objects
- assertNotNull(xml.getSlide(slides[0]));
- assertNotNull(xml.getSlide(slides[1]));
+ // Now get those objects
+ assertNotNull(xml.getSlide(slides[0]));
+ assertNotNull(xml.getSlide(slides[1]));
- // And check they have notes as expected
- assertNotNull(xml.getNotes(slides[0]));
- assertNotNull(xml.getNotes(slides[1]));
+ // And check they have notes as expected
+ assertNotNull(xml.getNotes(slides[0]));
+ assertNotNull(xml.getNotes(slides[1]));
- // And again for the master
- CTSlideMasterIdListEntry[] masters = xml.getSlideMasterReferences().getSldMasterIdArray();
+ // And again for the master
+ CTSlideMasterIdListEntry[] masters = xml.getSlideMasterReferences().getSldMasterIdArray();
- // see SlideAtom.USES_MASTER_SLIDE_ID
- assertEquals(0x80000000L, masters[0].getId());
- assertEquals("rId1", masters[0].getId2());
- assertNotNull(xml.getSlideMaster(masters[0]));
+ // see SlideAtom.USES_MASTER_SLIDE_ID
+ assertEquals(0x80000000L, masters[0].getId());
+ assertEquals("rId1", masters[0].getId2());
+ assertNotNull(xml.getSlideMaster(masters[0]));
- xml.close();
- }
+ xml.close();
+ }
@Test
- void testMetadataBasics() throws IOException, OpenXML4JException, XmlException {
- XSLFSlideShow xml = new XSLFSlideShow(pack);
+ void testMetadataBasics() throws IOException, OpenXML4JException, XmlException {
+ XSLFSlideShow xml = new XSLFSlideShow(pack);
- assertNotNull(xml.getProperties().getCoreProperties());
- assertNotNull(xml.getProperties().getExtendedProperties());
+ assertNotNull(xml.getProperties().getCoreProperties());
+ assertNotNull(xml.getProperties().getExtendedProperties());
- CTProperties props = xml.getProperties().getExtendedProperties().getUnderlyingProperties();
- assertEquals("Microsoft Office PowerPoint", props.getApplication());
- assertEquals(0, props.getCharacters());
- assertEquals(0, props.getLines());
-
- CoreProperties cprops = xml.getProperties().getCoreProperties();
- assertNull(cprops.getTitle());
- assertFalse(cprops.getUnderlyingProperties().getSubjectProperty().isPresent());
+ CTProperties props = xml.getProperties().getExtendedProperties().getUnderlyingProperties();
+ assertEquals("Microsoft Office PowerPoint", props.getApplication());
+ assertEquals(0, props.getCharacters());
+ assertEquals(0, props.getLines());
+
+ CoreProperties cprops = xml.getProperties().getCoreProperties();
+ assertNull(cprops.getTitle());
+ assertFalse(cprops.getUnderlyingProperties().getSubjectProperty().isPresent());
- xml.close();
- }
+ xml.close();
+ }
@Test
void testMasterBackground() throws IOException {
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java Sat May 22 20:22:16 2021
@@ -42,9 +42,9 @@ import org.junit.jupiter.api.Test;
class TestXSLFPowerPointExtractor {
private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
- /**
- * Get text out of the simple file
- */
+ /**
+ * Get text out of the simple file
+ */
@Test
void testGetSimpleText() throws IOException {
try (XMLSlideShow xmlA = openPPTX("sample.pptx");
@@ -155,7 +155,7 @@ class TestXSLFPowerPointExtractor {
text = extractor.getText();
assertEquals("\n1\n\n2\n", text);
}
- }
+ }
@Test
void testGetComments() throws IOException {
@@ -176,8 +176,8 @@ class TestXSLFPowerPointExtractor {
}
@Test
- void testGetMasterText() throws Exception {
- try (XMLSlideShow xml = openPPTX("WithMaster.pptx");
+ void testGetMasterText() throws Exception {
+ try (XMLSlideShow xml = openPPTX("WithMaster.pptx");
SlideShowExtractor<XSLFShape, XSLFTextParagraph> extractor = new SlideShowExtractor<>(xml)) {
extractor.setSlidesByDefault(true);
extractor.setNotesByDefault(false);
@@ -210,10 +210,10 @@ class TestXSLFPowerPointExtractor {
"This text comes from the Master Slide\n";
assertEquals(wholeText, text);
}
- }
+ }
- @Test
- void testTable() throws Exception {
+ @Test
+ void testTable() throws Exception {
try (XMLSlideShow xml = openPPTX("present1.pptx");
SlideShowExtractor<XSLFShape, XSLFTextParagraph> extractor = new SlideShowExtractor<>(xml)) {
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xslf/usermodel/TestXSLFChart.java Sat May 22 20:22:16 2021
@@ -147,22 +147,22 @@ class TestXSLFChart {
pptx.close();
}
- private void fillChartData(XSLFChart chart, XDDFChartData data) {
- final int numOfPoints = 3;
+ private void fillChartData(XSLFChart chart, XDDFChartData data) {
+ final int numOfPoints = 3;
final String[] categories = {"First", "Second", "Third"};
final Integer[] values = {1, 3, 4};
final String categoryDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 0, 0));
final String valuesDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 1, 1));
- final XDDFChartData.Series series = data.getSeries(0);
- final XDDFDataSource<?> categoryData = XDDFDataSourcesFactory.fromArray(categories, categoryDataRange);
+ final XDDFChartData.Series series = data.getSeries(0);
+ final XDDFDataSource<?> categoryData = XDDFDataSourcesFactory.fromArray(categories, categoryDataRange);
final XDDFNumericalDataSource<Integer> valuesData = XDDFDataSourcesFactory.fromArray(values, valuesDataRange);
series.replaceData(categoryData, valuesData);
final String title = "Apache POI";
series.setTitle(title, chart.setSheetTitle(title, 0));
chart.plot(data);
- }
+ }
private XSLFChart findChart(XSLFSlide slide) {
// find chart in the slide
@@ -188,147 +188,147 @@ class TestXSLFChart {
assertEquals(1, data.size());
XDDFChartData firstSeries = data.get(0);
- assertNotNull(firstSeries);
- if (firstSeries instanceof XDDFScatterChartData) {
+ assertNotNull(firstSeries);
+ if (firstSeries instanceof XDDFScatterChartData) {
assertNull(firstSeries.getCategoryAxis());
assertEquals(2, firstSeries.getValueAxes().size());
checkAxisOperations(firstSeries.getValueAxes().get(0));
checkAxisOperations(firstSeries.getValueAxes().get(1));
- } else if (!(firstSeries instanceof XDDFPieChartData)) {
- assertNotNull(firstSeries.getCategoryAxis());
- assertEquals(1, firstSeries.getValueAxes().size());
- checkAxisOperations(firstSeries.getValueAxes().get(0));
- }
+ } else if (!(firstSeries instanceof XDDFPieChartData)) {
+ assertNotNull(firstSeries.getCategoryAxis());
+ assertEquals(1, firstSeries.getValueAxes().size());
+ checkAxisOperations(firstSeries.getValueAxes().get(0));
+ }
return data;
}
- private void checkLegendOperations(XSLFChart chart) {
- XDDFChartLegend legend = chart.getOrAddLegend();
+ private void checkLegendOperations(XSLFChart chart) {
+ XDDFChartLegend legend = chart.getOrAddLegend();
assertFalse(legend.isOverlay());
- legend.setOverlay(true);
+ legend.setOverlay(true);
assertTrue(legend.isOverlay());
- legend.setPosition(LegendPosition.TOP_RIGHT);
- assertEquals(LegendPosition.TOP_RIGHT, legend.getPosition());
+ legend.setPosition(LegendPosition.TOP_RIGHT);
+ assertEquals(LegendPosition.TOP_RIGHT, legend.getPosition());
- XDDFManualLayout layout = legend.getOrAddManualLayout();
- assertNotNull(layout.getTarget());
- assertNotNull(layout.getXMode());
- assertNotNull(layout.getYMode());
- assertNotNull(layout.getHeightMode());
- assertNotNull(layout.getWidthMode());
- /*
- * According to interface, 0.0 should be returned for
- * uninitialized double properties.
- */
+ XDDFManualLayout layout = legend.getOrAddManualLayout();
+ assertNotNull(layout.getTarget());
+ assertNotNull(layout.getXMode());
+ assertNotNull(layout.getYMode());
+ assertNotNull(layout.getHeightMode());
+ assertNotNull(layout.getWidthMode());
+ /*
+ * According to interface, 0.0 should be returned for
+ * uninitialized double properties.
+ */
assertEquals(0.0, layout.getX(), 0.0);
assertEquals(0.0, layout.getY(), 0.0);
assertEquals(0.0, layout.getWidthRatio(), 0.0);
assertEquals(0.0, layout.getHeightRatio(), 0.0);
- final double newRatio = 1.1;
- final double newCoordinate = 0.3;
- final LayoutMode nonDefaultMode = LayoutMode.FACTOR;
- final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
+ final double newRatio = 1.1;
+ final double newCoordinate = 0.3;
+ final LayoutMode nonDefaultMode = LayoutMode.FACTOR;
+ final LayoutTarget nonDefaultTarget = LayoutTarget.OUTER;
- layout.setWidthRatio(newRatio);
+ layout.setWidthRatio(newRatio);
assertEquals(layout.getWidthRatio(), newRatio, 0.0);
- layout.setHeightRatio(newRatio);
+ layout.setHeightRatio(newRatio);
assertEquals(layout.getHeightRatio(), newRatio, 0.0);
- layout.setX(newCoordinate);
+ layout.setX(newCoordinate);
assertEquals(layout.getX(), newCoordinate, 0.0);
- layout.setY(newCoordinate);
+ layout.setY(newCoordinate);
assertEquals(layout.getY(), newCoordinate, 0.0);
- layout.setXMode(nonDefaultMode);
+ layout.setXMode(nonDefaultMode);
assertSame(layout.getXMode(), nonDefaultMode);
- layout.setYMode(nonDefaultMode);
+ layout.setYMode(nonDefaultMode);
assertSame(layout.getYMode(), nonDefaultMode);
- layout.setWidthMode(nonDefaultMode);
+ layout.setWidthMode(nonDefaultMode);
assertSame(layout.getWidthMode(), nonDefaultMode);
- layout.setHeightMode(nonDefaultMode);
+ layout.setHeightMode(nonDefaultMode);
assertSame(layout.getHeightMode(), nonDefaultMode);
- layout.setTarget(nonDefaultTarget);
+ layout.setTarget(nonDefaultTarget);
assertSame(layout.getTarget(), nonDefaultTarget);
- }
+ }
- private void checkAxisOperations(XDDFValueAxis axis) {
- axis.setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
- assertEquals(AxisCrossBetween.MIDPOINT_CATEGORY, axis.getCrossBetween());
+ private void checkAxisOperations(XDDFValueAxis axis) {
+ axis.setCrossBetween(AxisCrossBetween.MIDPOINT_CATEGORY);
+ assertEquals(AxisCrossBetween.MIDPOINT_CATEGORY, axis.getCrossBetween());
- axis.setCrosses(AxisCrosses.AUTO_ZERO);
- assertEquals(AxisCrosses.AUTO_ZERO, axis.getCrosses());
+ axis.setCrosses(AxisCrosses.AUTO_ZERO);
+ assertEquals(AxisCrosses.AUTO_ZERO, axis.getCrosses());
- final String numberFormat = "General";
- axis.setNumberFormat(numberFormat);
- assertEquals(numberFormat, axis.getNumberFormat());
+ final String numberFormat = "General";
+ axis.setNumberFormat(numberFormat);
+ assertEquals(numberFormat, axis.getNumberFormat());
- axis.setPosition(AxisPosition.BOTTOM);
- assertEquals(AxisPosition.BOTTOM, axis.getPosition());
+ axis.setPosition(AxisPosition.BOTTOM);
+ assertEquals(AxisPosition.BOTTOM, axis.getPosition());
- axis.setMajorTickMark(AxisTickMark.NONE);
- assertEquals(AxisTickMark.NONE, axis.getMajorTickMark());
+ axis.setMajorTickMark(AxisTickMark.NONE);
+ assertEquals(AxisTickMark.NONE, axis.getMajorTickMark());
- axis.setMajorTickMark(AxisTickMark.IN);
- assertEquals(AxisTickMark.IN, axis.getMajorTickMark());
+ axis.setMajorTickMark(AxisTickMark.IN);
+ assertEquals(AxisTickMark.IN, axis.getMajorTickMark());
- axis.setMajorTickMark(AxisTickMark.OUT);
- assertEquals(AxisTickMark.OUT, axis.getMajorTickMark());
+ axis.setMajorTickMark(AxisTickMark.OUT);
+ assertEquals(AxisTickMark.OUT, axis.getMajorTickMark());
- axis.setMajorTickMark(AxisTickMark.CROSS);
- assertEquals(AxisTickMark.CROSS, axis.getMajorTickMark());
+ axis.setMajorTickMark(AxisTickMark.CROSS);
+ assertEquals(AxisTickMark.CROSS, axis.getMajorTickMark());
- axis.setMinorTickMark(AxisTickMark.NONE);
- assertEquals(AxisTickMark.NONE, axis.getMinorTickMark());
+ axis.setMinorTickMark(AxisTickMark.NONE);
+ assertEquals(AxisTickMark.NONE, axis.getMinorTickMark());
- axis.setMinorTickMark(AxisTickMark.IN);
- assertEquals(AxisTickMark.IN, axis.getMinorTickMark());
+ axis.setMinorTickMark(AxisTickMark.IN);
+ assertEquals(AxisTickMark.IN, axis.getMinorTickMark());
- axis.setMinorTickMark(AxisTickMark.OUT);
- assertEquals(AxisTickMark.OUT, axis.getMinorTickMark());
+ axis.setMinorTickMark(AxisTickMark.OUT);
+ assertEquals(AxisTickMark.OUT, axis.getMinorTickMark());
- axis.setMinorTickMark(AxisTickMark.CROSS);
- assertEquals(AxisTickMark.CROSS, axis.getMinorTickMark());
+ axis.setMinorTickMark(AxisTickMark.CROSS);
+ assertEquals(AxisTickMark.CROSS, axis.getMinorTickMark());
- axis.setVisible(true);
- assertTrue(axis.isVisible());
+ axis.setVisible(true);
+ assertTrue(axis.isVisible());
- axis.setVisible(false);
- assertFalse(axis.isVisible());
+ axis.setVisible(false);
+ assertFalse(axis.isVisible());
- final double EPSILON = 1E-7;
- axis.setLogBase(Math.E);
- assertTrue(Math.abs(axis.getLogBase() - Math.E) < EPSILON);
+ final double EPSILON = 1E-7;
+ axis.setLogBase(Math.E);
+ assertTrue(Math.abs(axis.getLogBase() - Math.E) < EPSILON);
- final double newValue = 10.0;
+ final double newValue = 10.0;
- axis.setMinimum(newValue);
- assertTrue(Math.abs(axis.getMinimum() - newValue) < EPSILON);
+ axis.setMinimum(newValue);
+ assertTrue(Math.abs(axis.getMinimum() - newValue) < EPSILON);
- axis.setMaximum(newValue);
- assertTrue(Math.abs(axis.getMaximum() - newValue) < EPSILON);
+ axis.setMaximum(newValue);
+ assertTrue(Math.abs(axis.getMaximum() - newValue) < EPSILON);
- IllegalArgumentException iae = null;
- try {
- axis.setLogBase(0.0);
- } catch (IllegalArgumentException e) {
- iae = e;
- }
- assertNotNull(iae);
+ IllegalArgumentException iae = null;
+ try {
+ axis.setLogBase(0.0);
+ } catch (IllegalArgumentException e) {
+ iae = e;
+ }
+ assertNotNull(iae);
- iae = null;
- try {
- axis.setLogBase(30000.0);
- } catch (IllegalArgumentException e) {
- iae = e;
- }
- assertNotNull(iae);
- }
+ iae = null;
+ try {
+ axis.setLogBase(30000.0);
+ } catch (IllegalArgumentException e) {
+ iae = e;
+ }
+ assertNotNull(iae);
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/TestSheetProtection.java Sat May 22 20:22:16 2021
@@ -28,266 +28,266 @@ import static org.junit.jupiter.api.Asse
import static org.junit.jupiter.api.Assertions.assertTrue;
class TestSheetProtection {
- private XSSFWorkbook workbook;
- private XSSFSheet sheet;
+ private XSSFWorkbook workbook;
+ private XSSFSheet sheet;
- @BeforeEach
- void setUp() {
- workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_not_protected.xlsx");
- sheet = workbook.getSheetAt(0);
- }
-
- @AfterEach
- void tearDown() throws IOException {
- workbook.close();
- }
-
- @Test
- void testShouldReadWorkbookProtection() throws IOException {
- assertFalse(sheet.isAutoFilterLocked());
- assertFalse(sheet.isDeleteColumnsLocked());
- assertFalse(sheet.isDeleteRowsLocked());
- assertFalse(sheet.isFormatCellsLocked());
- assertFalse(sheet.isFormatColumnsLocked());
- assertFalse(sheet.isFormatRowsLocked());
- assertFalse(sheet.isInsertColumnsLocked());
- assertFalse(sheet.isInsertHyperlinksLocked());
- assertFalse(sheet.isInsertRowsLocked());
- assertFalse(sheet.isPivotTablesLocked());
- assertFalse(sheet.isSortLocked());
- assertFalse(sheet.isObjectsLocked());
- assertFalse(sheet.isScenariosLocked());
- assertFalse(sheet.isSelectLockedCellsLocked());
- assertFalse(sheet.isSelectUnlockedCellsLocked());
- assertFalse(sheet.isSheetLocked());
-
- try (XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_allLocked.xlsx")) {
- sheet = workbook.getSheetAt(0);
-
- assertTrue(sheet.isAutoFilterLocked());
- assertTrue(sheet.isDeleteColumnsLocked());
- assertTrue(sheet.isDeleteRowsLocked());
- assertTrue(sheet.isFormatCellsLocked());
- assertTrue(sheet.isFormatColumnsLocked());
- assertTrue(sheet.isFormatRowsLocked());
- assertTrue(sheet.isInsertColumnsLocked());
- assertTrue(sheet.isInsertHyperlinksLocked());
- assertTrue(sheet.isInsertRowsLocked());
- assertTrue(sheet.isPivotTablesLocked());
- assertTrue(sheet.isSortLocked());
- assertTrue(sheet.isObjectsLocked());
- assertTrue(sheet.isScenariosLocked());
- assertTrue(sheet.isSelectLockedCellsLocked());
- assertTrue(sheet.isSelectUnlockedCellsLocked());
- assertTrue(sheet.isSheetLocked());
- }
- }
-
- @Test
- void testWriteAutoFilter() {
- assertFalse(sheet.isAutoFilterLocked());
- sheet.lockAutoFilter(true);
- assertFalse(sheet.isAutoFilterLocked());
- sheet.enableLocking();
- assertTrue(sheet.isAutoFilterLocked());
- sheet.lockAutoFilter(false);
- assertFalse(sheet.isAutoFilterLocked());
- }
-
- @Test
- void testWriteDeleteColumns() {
- assertFalse(sheet.isDeleteColumnsLocked());
- sheet.lockDeleteColumns(true);
- assertFalse(sheet.isDeleteColumnsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isDeleteColumnsLocked());
- sheet.lockDeleteColumns(false);
- assertFalse(sheet.isDeleteColumnsLocked());
- }
-
- @Test
- void testWriteDeleteRows() {
- assertFalse(sheet.isDeleteRowsLocked());
- sheet.lockDeleteRows(true);
- assertFalse(sheet.isDeleteRowsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isDeleteRowsLocked());
+ @BeforeEach
+ void setUp() {
+ workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_not_protected.xlsx");
+ sheet = workbook.getSheetAt(0);
+ }
+
+ @AfterEach
+ void tearDown() throws IOException {
+ workbook.close();
+ }
+
+ @Test
+ void testShouldReadWorkbookProtection() throws IOException {
+ assertFalse(sheet.isAutoFilterLocked());
+ assertFalse(sheet.isDeleteColumnsLocked());
+ assertFalse(sheet.isDeleteRowsLocked());
+ assertFalse(sheet.isFormatCellsLocked());
+ assertFalse(sheet.isFormatColumnsLocked());
+ assertFalse(sheet.isFormatRowsLocked());
+ assertFalse(sheet.isInsertColumnsLocked());
+ assertFalse(sheet.isInsertHyperlinksLocked());
+ assertFalse(sheet.isInsertRowsLocked());
+ assertFalse(sheet.isPivotTablesLocked());
+ assertFalse(sheet.isSortLocked());
+ assertFalse(sheet.isObjectsLocked());
+ assertFalse(sheet.isScenariosLocked());
+ assertFalse(sheet.isSelectLockedCellsLocked());
+ assertFalse(sheet.isSelectUnlockedCellsLocked());
+ assertFalse(sheet.isSheetLocked());
+
+ try (XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_allLocked.xlsx")) {
+ sheet = workbook.getSheetAt(0);
+
+ assertTrue(sheet.isAutoFilterLocked());
+ assertTrue(sheet.isDeleteColumnsLocked());
+ assertTrue(sheet.isDeleteRowsLocked());
+ assertTrue(sheet.isFormatCellsLocked());
+ assertTrue(sheet.isFormatColumnsLocked());
+ assertTrue(sheet.isFormatRowsLocked());
+ assertTrue(sheet.isInsertColumnsLocked());
+ assertTrue(sheet.isInsertHyperlinksLocked());
+ assertTrue(sheet.isInsertRowsLocked());
+ assertTrue(sheet.isPivotTablesLocked());
+ assertTrue(sheet.isSortLocked());
+ assertTrue(sheet.isObjectsLocked());
+ assertTrue(sheet.isScenariosLocked());
+ assertTrue(sheet.isSelectLockedCellsLocked());
+ assertTrue(sheet.isSelectUnlockedCellsLocked());
+ assertTrue(sheet.isSheetLocked());
+ }
+ }
+
+ @Test
+ void testWriteAutoFilter() {
+ assertFalse(sheet.isAutoFilterLocked());
+ sheet.lockAutoFilter(true);
+ assertFalse(sheet.isAutoFilterLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isAutoFilterLocked());
+ sheet.lockAutoFilter(false);
+ assertFalse(sheet.isAutoFilterLocked());
+ }
+
+ @Test
+ void testWriteDeleteColumns() {
+ assertFalse(sheet.isDeleteColumnsLocked());
+ sheet.lockDeleteColumns(true);
+ assertFalse(sheet.isDeleteColumnsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isDeleteColumnsLocked());
+ sheet.lockDeleteColumns(false);
+ assertFalse(sheet.isDeleteColumnsLocked());
+ }
+
+ @Test
+ void testWriteDeleteRows() {
+ assertFalse(sheet.isDeleteRowsLocked());
+ sheet.lockDeleteRows(true);
+ assertFalse(sheet.isDeleteRowsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isDeleteRowsLocked());
sheet.lockDeleteRows(false);
assertFalse(sheet.isDeleteRowsLocked());
- }
+ }
- @Test
- void testWriteFormatCells() {
- assertFalse(sheet.isFormatCellsLocked());
- sheet.lockFormatCells(true);
- assertFalse(sheet.isFormatCellsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isFormatCellsLocked());
+ @Test
+ void testWriteFormatCells() {
+ assertFalse(sheet.isFormatCellsLocked());
+ sheet.lockFormatCells(true);
+ assertFalse(sheet.isFormatCellsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isFormatCellsLocked());
sheet.lockFormatCells(false);
assertFalse(sheet.isFormatCellsLocked());
- }
+ }
- @Test
- void testWriteFormatColumns() {
- assertFalse(sheet.isFormatColumnsLocked());
- sheet.lockFormatColumns(true);
- assertFalse(sheet.isFormatColumnsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isFormatColumnsLocked());
+ @Test
+ void testWriteFormatColumns() {
+ assertFalse(sheet.isFormatColumnsLocked());
+ sheet.lockFormatColumns(true);
+ assertFalse(sheet.isFormatColumnsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isFormatColumnsLocked());
sheet.lockFormatColumns(false);
assertFalse(sheet.isFormatColumnsLocked());
- }
+ }
- @Test
- void testWriteFormatRows() {
- assertFalse(sheet.isFormatRowsLocked());
- sheet.lockFormatRows(true);
- assertFalse(sheet.isFormatRowsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isFormatRowsLocked());
+ @Test
+ void testWriteFormatRows() {
+ assertFalse(sheet.isFormatRowsLocked());
+ sheet.lockFormatRows(true);
+ assertFalse(sheet.isFormatRowsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isFormatRowsLocked());
sheet.lockFormatRows(false);
assertFalse(sheet.isFormatRowsLocked());
- }
+ }
- @Test
- void testWriteInsertColumns() {
- assertFalse(sheet.isInsertColumnsLocked());
- sheet.lockInsertColumns(true);
- assertFalse(sheet.isInsertColumnsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isInsertColumnsLocked());
+ @Test
+ void testWriteInsertColumns() {
+ assertFalse(sheet.isInsertColumnsLocked());
+ sheet.lockInsertColumns(true);
+ assertFalse(sheet.isInsertColumnsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isInsertColumnsLocked());
sheet.lockInsertColumns(false);
assertFalse(sheet.isInsertColumnsLocked());
- }
+ }
- @Test
- void testWriteInsertHyperlinks() {
- assertFalse(sheet.isInsertHyperlinksLocked());
- sheet.lockInsertHyperlinks(true);
- assertFalse(sheet.isInsertHyperlinksLocked());
- sheet.enableLocking();
- assertTrue(sheet.isInsertHyperlinksLocked());
+ @Test
+ void testWriteInsertHyperlinks() {
+ assertFalse(sheet.isInsertHyperlinksLocked());
+ sheet.lockInsertHyperlinks(true);
+ assertFalse(sheet.isInsertHyperlinksLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isInsertHyperlinksLocked());
sheet.lockInsertHyperlinks(false);
assertFalse(sheet.isInsertHyperlinksLocked());
- }
+ }
- @Test
- void testWriteInsertRows() {
- assertFalse(sheet.isInsertRowsLocked());
- sheet.lockInsertRows(true);
- assertFalse(sheet.isInsertRowsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isInsertRowsLocked());
+ @Test
+ void testWriteInsertRows() {
+ assertFalse(sheet.isInsertRowsLocked());
+ sheet.lockInsertRows(true);
+ assertFalse(sheet.isInsertRowsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isInsertRowsLocked());
sheet.lockInsertRows(false);
assertFalse(sheet.isInsertRowsLocked());
- }
+ }
- @Test
- void testWritePivotTables() {
- assertFalse(sheet.isPivotTablesLocked());
- sheet.lockPivotTables(true);
- assertFalse(sheet.isPivotTablesLocked());
- sheet.enableLocking();
- assertTrue(sheet.isPivotTablesLocked());
+ @Test
+ void testWritePivotTables() {
+ assertFalse(sheet.isPivotTablesLocked());
+ sheet.lockPivotTables(true);
+ assertFalse(sheet.isPivotTablesLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isPivotTablesLocked());
sheet.lockPivotTables(false);
assertFalse(sheet.isPivotTablesLocked());
- }
+ }
- @Test
- void testWriteSort() {
- assertFalse(sheet.isSortLocked());
- sheet.lockSort(true);
- assertFalse(sheet.isSortLocked());
- sheet.enableLocking();
- assertTrue(sheet.isSortLocked());
+ @Test
+ void testWriteSort() {
+ assertFalse(sheet.isSortLocked());
+ sheet.lockSort(true);
+ assertFalse(sheet.isSortLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isSortLocked());
sheet.lockSort(false);
assertFalse(sheet.isSortLocked());
- }
+ }
- @Test
- void testWriteObjects() {
- assertFalse(sheet.isObjectsLocked());
- sheet.lockObjects(true);
- assertFalse(sheet.isObjectsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isObjectsLocked());
+ @Test
+ void testWriteObjects() {
+ assertFalse(sheet.isObjectsLocked());
+ sheet.lockObjects(true);
+ assertFalse(sheet.isObjectsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isObjectsLocked());
sheet.lockObjects(false);
assertFalse(sheet.isObjectsLocked());
- }
+ }
- @Test
- void testWriteScenarios() {
- assertFalse(sheet.isScenariosLocked());
- sheet.lockScenarios(true);
- assertFalse(sheet.isScenariosLocked());
- sheet.enableLocking();
- assertTrue(sheet.isScenariosLocked());
+ @Test
+ void testWriteScenarios() {
+ assertFalse(sheet.isScenariosLocked());
+ sheet.lockScenarios(true);
+ assertFalse(sheet.isScenariosLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isScenariosLocked());
sheet.lockScenarios(false);
assertFalse(sheet.isScenariosLocked());
- }
+ }
- @Test
- void testWriteSelectLockedCells() {
- assertFalse(sheet.isSelectLockedCellsLocked());
- sheet.lockSelectLockedCells(true);
- assertFalse(sheet.isSelectLockedCellsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isSelectLockedCellsLocked());
+ @Test
+ void testWriteSelectLockedCells() {
+ assertFalse(sheet.isSelectLockedCellsLocked());
+ sheet.lockSelectLockedCells(true);
+ assertFalse(sheet.isSelectLockedCellsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isSelectLockedCellsLocked());
sheet.lockSelectLockedCells(false);
assertFalse(sheet.isSelectLockedCellsLocked());
- }
+ }
- @Test
- void testWriteSelectUnlockedCells() {
- assertFalse(sheet.isSelectUnlockedCellsLocked());
- sheet.lockSelectUnlockedCells(true);
- assertFalse(sheet.isSelectUnlockedCellsLocked());
- sheet.enableLocking();
- assertTrue(sheet.isSelectUnlockedCellsLocked());
+ @Test
+ void testWriteSelectUnlockedCells() {
+ assertFalse(sheet.isSelectUnlockedCellsLocked());
+ sheet.lockSelectUnlockedCells(true);
+ assertFalse(sheet.isSelectUnlockedCellsLocked());
+ sheet.enableLocking();
+ assertTrue(sheet.isSelectUnlockedCellsLocked());
sheet.lockSelectUnlockedCells(false);
assertFalse(sheet.isSelectUnlockedCellsLocked());
- }
+ }
- @Test
- void testWriteSelectEnableLocking() throws IOException {
- try (XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_allLocked.xlsx")) {
- sheet = workbook.getSheetAt(0);
-
- assertTrue(sheet.isAutoFilterLocked());
- assertTrue(sheet.isDeleteColumnsLocked());
- assertTrue(sheet.isDeleteRowsLocked());
- assertTrue(sheet.isFormatCellsLocked());
- assertTrue(sheet.isFormatColumnsLocked());
- assertTrue(sheet.isFormatRowsLocked());
- assertTrue(sheet.isInsertColumnsLocked());
- assertTrue(sheet.isInsertHyperlinksLocked());
- assertTrue(sheet.isInsertRowsLocked());
- assertTrue(sheet.isPivotTablesLocked());
- assertTrue(sheet.isSortLocked());
- assertTrue(sheet.isObjectsLocked());
- assertTrue(sheet.isScenariosLocked());
- assertTrue(sheet.isSelectLockedCellsLocked());
- assertTrue(sheet.isSelectUnlockedCellsLocked());
- assertTrue(sheet.isSheetLocked());
-
- sheet.disableLocking();
-
- assertFalse(sheet.isAutoFilterLocked());
- assertFalse(sheet.isDeleteColumnsLocked());
- assertFalse(sheet.isDeleteRowsLocked());
- assertFalse(sheet.isFormatCellsLocked());
- assertFalse(sheet.isFormatColumnsLocked());
- assertFalse(sheet.isFormatRowsLocked());
- assertFalse(sheet.isInsertColumnsLocked());
- assertFalse(sheet.isInsertHyperlinksLocked());
- assertFalse(sheet.isInsertRowsLocked());
- assertFalse(sheet.isPivotTablesLocked());
- assertFalse(sheet.isSortLocked());
- assertFalse(sheet.isObjectsLocked());
- assertFalse(sheet.isScenariosLocked());
- assertFalse(sheet.isSelectLockedCellsLocked());
- assertFalse(sheet.isSelectUnlockedCellsLocked());
- assertFalse(sheet.isSheetLocked());
- }
- }
+ @Test
+ void testWriteSelectEnableLocking() throws IOException {
+ try (XSSFWorkbook workbook = XSSFTestDataSamples.openSampleWorkbook("sheetProtection_allLocked.xlsx")) {
+ sheet = workbook.getSheetAt(0);
+
+ assertTrue(sheet.isAutoFilterLocked());
+ assertTrue(sheet.isDeleteColumnsLocked());
+ assertTrue(sheet.isDeleteRowsLocked());
+ assertTrue(sheet.isFormatCellsLocked());
+ assertTrue(sheet.isFormatColumnsLocked());
+ assertTrue(sheet.isFormatRowsLocked());
+ assertTrue(sheet.isInsertColumnsLocked());
+ assertTrue(sheet.isInsertHyperlinksLocked());
+ assertTrue(sheet.isInsertRowsLocked());
+ assertTrue(sheet.isPivotTablesLocked());
+ assertTrue(sheet.isSortLocked());
+ assertTrue(sheet.isObjectsLocked());
+ assertTrue(sheet.isScenariosLocked());
+ assertTrue(sheet.isSelectLockedCellsLocked());
+ assertTrue(sheet.isSelectUnlockedCellsLocked());
+ assertTrue(sheet.isSheetLocked());
+
+ sheet.disableLocking();
+
+ assertFalse(sheet.isAutoFilterLocked());
+ assertFalse(sheet.isDeleteColumnsLocked());
+ assertFalse(sheet.isDeleteRowsLocked());
+ assertFalse(sheet.isFormatCellsLocked());
+ assertFalse(sheet.isFormatColumnsLocked());
+ assertFalse(sheet.isFormatRowsLocked());
+ assertFalse(sheet.isInsertColumnsLocked());
+ assertFalse(sheet.isInsertHyperlinksLocked());
+ assertFalse(sheet.isInsertRowsLocked());
+ assertFalse(sheet.isPivotTablesLocked());
+ assertFalse(sheet.isSortLocked());
+ assertFalse(sheet.isObjectsLocked());
+ assertFalse(sheet.isScenariosLocked());
+ assertFalse(sheet.isSelectLockedCellsLocked());
+ assertFalse(sheet.isSelectUnlockedCellsLocked());
+ assertFalse(sheet.isSheetLocked());
+ }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestReadOnlySharedStringsTable.java Sat May 22 20:22:16 2021
@@ -42,7 +42,7 @@ public final class TestReadOnlySharedStr
@Test
void testParse() throws Exception {
- try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
+ try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
List<PackagePart> parts = pkg.getPartsByName(Pattern.compile("/xl/sharedStrings.xml"));
assertEquals(1, parts.size());
@@ -60,11 +60,11 @@ public final class TestReadOnlySharedStr
assertEquals(i1.getString(), i2.getString());
}
}
- }
+ }
- //51519
+ //51519
@Test
- void testPhoneticRuns() throws Exception {
+ void testPhoneticRuns() throws Exception {
try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("51519.xlsx"))) {
List < PackagePart > parts = pkg.getPartsByName(Pattern.compile("/xl/sharedStrings.xml"));
assertEquals(1, parts.size());
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/eventusermodel/TestXSSFReader.java Sat May 22 20:22:16 2021
@@ -61,7 +61,7 @@ public final class TestXSSFReader {
@Test
void testGetBits() throws Exception {
- try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
+ try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
XSSFReader r = new XSSFReader(pkg);
@@ -72,11 +72,11 @@ public final class TestXSSFReader {
assertNotNull(r.getSharedStringsTable());
assertNotNull(r.getStylesTable());
}
- }
+ }
@Test
- void testStyles() throws Exception {
- try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
+ void testStyles() throws Exception {
+ try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
XSSFReader r = new XSSFReader(pkg);
@@ -90,10 +90,10 @@ public final class TestXSSFReader {
assertNotNull(r.getStylesData());
assertNotNull(r.getThemesData());
}
- }
+ }
@Test
- void testStrings() throws Exception {
+ void testStrings() throws Exception {
try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
XSSFReader r = new XSSFReader(pkg);
@@ -101,10 +101,10 @@ public final class TestXSSFReader {
assertEquals(11, r.getSharedStringsTable().getSharedStringItems().size());
assertEquals("Test spreadsheet", r.getSharedStringsTable().getItemAt(0).toString());
}
- }
+ }
@Test
- void testSheets() throws Exception {
+ void testSheets() throws Exception {
try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("SampleSS.xlsx"))) {
XSSFReader r = new XSSFReader(pkg);
@@ -131,14 +131,14 @@ public final class TestXSSFReader {
}
assertEquals(3, count);
}
- }
+ }
- /**
- * Check that the sheet iterator returns sheets in the logical order
- * (as they are defined in the workbook.xml)
- */
+ /**
+ * Check that the sheet iterator returns sheets in the logical order
+ * (as they are defined in the workbook.xml)
+ */
@Test
- void testOrderOfSheets() throws Exception {
+ void testOrderOfSheets() throws Exception {
try (OPCPackage pkg = OPCPackage.open(_ssTests.openResourceAsStream("reordered_sheets.xlsx"))) {
XSSFReader r = new XSSFReader(pkg);
@@ -157,10 +157,10 @@ public final class TestXSSFReader {
}
assertEquals(4, count);
}
- }
+ }
@Test
- void testComments() throws Exception {
+ void testComments() throws Exception {
try (OPCPackage pkg = XSSFTestDataSamples.openSamplePackage("comments.xlsx")) {
XSSFReader r = new XSSFReader(pkg);
XSSFReader.SheetIterator it = (XSSFReader.SheetIterator) r.getSheetsData();
@@ -182,7 +182,7 @@ public final class TestXSSFReader {
}
assertEquals(3, count);
}
- }
+ }
/**
* Iterating over a workbook with chart sheets in it, using the
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFBEventBasedExcelExtractor.java Sat May 22 20:22:16 2021
@@ -71,10 +71,10 @@ class TestXSSFBEventBasedExcelExtractor
"Nunc\t999\n";
String CHUNK2 =
"The quick brown fox jumps over the lazy dog\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n";
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n";
assertEquals(
CHUNK1 +
"at\t4995\n" +
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractor.java Sat May 22 20:22:16 2021
@@ -39,92 +39,92 @@ import org.junit.jupiter.api.Test;
* Tests for {@link XSSFEventBasedExcelExtractor}
*/
class TestXSSFEventBasedExcelExtractor {
- protected XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
+ protected XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
return new XSSFEventBasedExcelExtractor(XSSFTestDataSamples.
openSamplePackage(sampleName));
- }
+ }
+
+ /**
+ * Get text out of the simple file
+ */
+ @Test
+ void testGetSimpleText() throws Exception {
+ // a very simple file
+ XSSFEventBasedExcelExtractor extractor = getExtractor("sample.xlsx");
+ extractor.getText();
+
+ String text = extractor.getText();
+ assertTrue(text.length() > 0);
+
+ // Check sheet names
+ assertStartsWith(text, "Sheet1");
+ assertEndsWith(text, "Sheet3\n");
+
+ // Now without, will have text
+ extractor.setIncludeSheetNames(false);
+ text = extractor.getText();
+ String CHUNK1 =
+ "Lorem\t111\n" +
+ "ipsum\t222\n" +
+ "dolor\t333\n" +
+ "sit\t444\n" +
+ "amet\t555\n" +
+ "consectetuer\t666\n" +
+ "adipiscing\t777\n" +
+ "elit\t888\n" +
+ "Nunc\t999\n";
+ String CHUNK2 =
+ "The quick brown fox jumps over the lazy dog\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n";
+ assertEquals(
+ CHUNK1 +
+ "at\t4995\n" +
+ CHUNK2
+ , text);
+
+ // Now get formulas not their values
+ extractor.setFormulasNotResults(true);
+ text = extractor.getText();
+ assertEquals(
+ CHUNK1 +
+ "at\tSUM(B1:B9)\n" +
+ CHUNK2, text);
+
+ // With sheet names too
+ extractor.setIncludeSheetNames(true);
+ text = extractor.getText();
+ assertEquals(
+ "Sheet1\n" +
+ CHUNK1 +
+ "at\tSUM(B1:B9)\n" +
+ "rich test\n" +
+ CHUNK2 +
+ "Sheet3\n"
+ , text);
- /**
- * Get text out of the simple file
- */
- @Test
- void testGetSimpleText() throws Exception {
- // a very simple file
- XSSFEventBasedExcelExtractor extractor = getExtractor("sample.xlsx");
- extractor.getText();
-
- String text = extractor.getText();
- assertTrue(text.length() > 0);
-
- // Check sheet names
- assertStartsWith(text, "Sheet1");
- assertEndsWith(text, "Sheet3\n");
-
- // Now without, will have text
- extractor.setIncludeSheetNames(false);
- text = extractor.getText();
- String CHUNK1 =
- "Lorem\t111\n" +
- "ipsum\t222\n" +
- "dolor\t333\n" +
- "sit\t444\n" +
- "amet\t555\n" +
- "consectetuer\t666\n" +
- "adipiscing\t777\n" +
- "elit\t888\n" +
- "Nunc\t999\n";
- String CHUNK2 =
- "The quick brown fox jumps over the lazy dog\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n";
- assertEquals(
- CHUNK1 +
- "at\t4995\n" +
- CHUNK2
- , text);
-
- // Now get formulas not their values
- extractor.setFormulasNotResults(true);
- text = extractor.getText();
- assertEquals(
- CHUNK1 +
- "at\tSUM(B1:B9)\n" +
- CHUNK2, text);
-
- // With sheet names too
- extractor.setIncludeSheetNames(true);
- text = extractor.getText();
- assertEquals(
- "Sheet1\n" +
- CHUNK1 +
- "at\tSUM(B1:B9)\n" +
- "rich test\n" +
- CHUNK2 +
- "Sheet3\n"
- , text);
-
- extractor.close();
- }
-
- @Test
- void testGetComplexText() throws Exception {
- // A fairly complex file
- XSSFEventBasedExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
- extractor.getText();
-
- String text = extractor.getText();
- assertTrue(text.length() > 0);
-
- // Might not have all formatting it should do!
- assertStartsWith(text,
- "Avgtxfull\n" +
- "(iii) AVERAGE TAX RATES ON ANNUAL"
- );
+ extractor.close();
+ }
- extractor.close();
- }
+ @Test
+ void testGetComplexText() throws Exception {
+ // A fairly complex file
+ XSSFEventBasedExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
+ extractor.getText();
+
+ String text = extractor.getText();
+ assertTrue(text.length() > 0);
+
+ // Might not have all formatting it should do!
+ assertStartsWith(text,
+ "Avgtxfull\n" +
+ "(iii) AVERAGE TAX RATES ON ANNUAL"
+ );
+
+ extractor.close();
+ }
@Test
void testInlineStrings() throws Exception {
@@ -141,44 +141,44 @@ class TestXSSFEventBasedExcelExtractor {
assertContains(text, "Long Text");
// Inline Strings
- assertContains(text, "1st Inline String");
- assertContains(text, "And More");
+ assertContains(text, "1st Inline String");
+ assertContains(text, "And More");
// Formulas
- assertContains(text, "A2");
- assertContains(text, "A5-A$2");
+ assertContains(text, "A2");
+ assertContains(text, "A5-A$2");
extractor.close();
}
- /**
- * Test that we return pretty much the same as
- * ExcelExtractor does, when we're both passed
- * the same file, just saved as xls and xlsx
- */
+ /**
+ * Test that we return pretty much the same as
+ * ExcelExtractor does, when we're both passed
+ * the same file, just saved as xls and xlsx
+ */
@Test
void testComparedToOLE2() throws Exception {
- // A fairly simple file - ooxml
- XSSFEventBasedExcelExtractor ooxmlExtractor = getExtractor("SampleSS.xlsx");
+ // A fairly simple file - ooxml
+ XSSFEventBasedExcelExtractor ooxmlExtractor = getExtractor("SampleSS.xlsx");
- ExcelExtractor ole2Extractor =
- new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
+ ExcelExtractor ole2Extractor =
+ new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
- POITextExtractor[] extractors =
- new POITextExtractor[] { ooxmlExtractor, ole2Extractor };
- for (POITextExtractor extractor : extractors) {
+ POITextExtractor[] extractors =
+ new POITextExtractor[] { ooxmlExtractor, ole2Extractor };
+ for (POITextExtractor extractor : extractors) {
String text = extractor.getText().replaceAll("[\r\t]", "");
- assertStartsWith(text, "First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n");
- Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
- Matcher m = pattern.matcher(text);
- assertTrue(m.matches());
- }
-
- ole2Extractor.close();
- ooxmlExtractor.close();
- }
+ assertStartsWith(text, "First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n");
+ Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
+ Matcher m = pattern.matcher(text);
+ assertTrue(m.matches());
+ }
+
+ ole2Extractor.close();
+ ooxmlExtractor.close();
+ }
- /** Test text extraction from text box using getShapes() */
+ /** Test text extraction from text box using getShapes() */
@Test
void testShapes() throws Exception{
@@ -320,35 +320,35 @@ class TestXSSFEventBasedExcelExtractor {
}
@Test
- void test59021() throws Exception {
- XSSFEventBasedExcelExtractor ex =
- new XSSFEventBasedExcelExtractor(
- XSSFTestDataSamples.openSamplePackage("59021.xlsx"));
- String text = ex.getText();
- assertContains(text, "Abkhazia - Fixed");
- assertContains(text, "10/02/2016");
- ex.close();
- }
-
- @Test
- void test51519() throws Exception {
- //default behavior: include phonetic runs
- XSSFEventBasedExcelExtractor ex =
- new XSSFEventBasedExcelExtractor(
- XSSFTestDataSamples.openSamplePackage("51519.xlsx"));
- String text = ex.getText();
- assertContains(text, "\u65E5\u672C\u30AA\u30E9\u30AF\u30EB \u30CB\u30DB\u30F3");
- ex.close();
-
- //now try turning them off
- ex =
- new XSSFEventBasedExcelExtractor(
- XSSFTestDataSamples.openSamplePackage("51519.xlsx"));
- ex.setConcatenatePhoneticRuns(false);
- text = ex.getText();
- assertFalse(text.contains("\u65E5\u672C\u30AA\u30E9\u30AF\u30EB \u30CB\u30DB\u30F3"),
- "should not be able to find appended phonetic run");
- ex.close();
+ void test59021() throws Exception {
+ XSSFEventBasedExcelExtractor ex =
+ new XSSFEventBasedExcelExtractor(
+ XSSFTestDataSamples.openSamplePackage("59021.xlsx"));
+ String text = ex.getText();
+ assertContains(text, "Abkhazia - Fixed");
+ assertContains(text, "10/02/2016");
+ ex.close();
+ }
+
+ @Test
+ void test51519() throws Exception {
+ //default behavior: include phonetic runs
+ XSSFEventBasedExcelExtractor ex =
+ new XSSFEventBasedExcelExtractor(
+ XSSFTestDataSamples.openSamplePackage("51519.xlsx"));
+ String text = ex.getText();
+ assertContains(text, "\u65E5\u672C\u30AA\u30E9\u30AF\u30EB \u30CB\u30DB\u30F3");
+ ex.close();
+
+ //now try turning them off
+ ex =
+ new XSSFEventBasedExcelExtractor(
+ XSSFTestDataSamples.openSamplePackage("51519.xlsx"));
+ ex.setConcatenatePhoneticRuns(false);
+ text = ex.getText();
+ assertFalse(text.contains("\u65E5\u672C\u30AA\u30E9\u30AF\u30EB \u30CB\u30DB\u30F3"),
+ "should not be able to find appended phonetic run");
+ ex.close();
- }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFEventBasedExcelExtractorUsingFactory.java Sat May 22 20:22:16 2021
@@ -22,15 +22,15 @@ import org.junit.jupiter.api.AfterEach;
class TestXSSFEventBasedExcelExtractorUsingFactory extends TestXSSFEventBasedExcelExtractor {
- @Override
- protected final XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
- ExtractorFactory.setAllThreadsPreferEventExtractors(true);
- return (XSSFEventBasedExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
- }
+ @Override
+ protected final XSSFEventBasedExcelExtractor getExtractor(String sampleName) throws Exception {
+ ExtractorFactory.setAllThreadsPreferEventExtractors(true);
+ return (XSSFEventBasedExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
+ }
- @AfterEach
+ @AfterEach
void tearDown() {
- // reset setting to not affect other tests
- ExtractorFactory.setAllThreadsPreferEventExtractors(null);
- }
+ // reset setting to not affect other tests
+ ExtractorFactory.setAllThreadsPreferEventExtractors(null);
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractor.java Sat May 22 20:22:16 2021
@@ -41,164 +41,164 @@ import org.junit.jupiter.api.Test;
* Tests for {@link XSSFExcelExtractor}
*/
class TestXSSFExcelExtractor {
- protected XSSFExcelExtractor getExtractor(String sampleName) {
- return new XSSFExcelExtractor(XSSFTestDataSamples.openSampleWorkbook(sampleName));
- }
-
- /**
- * Get text out of the simple file
- */
- @Test
- void testGetSimpleText() throws IOException {
- // a very simple file
- XSSFExcelExtractor extractor = getExtractor("sample.xlsx");
-
- String text = extractor.getText();
- assertTrue(text.length() > 0);
-
- // Check sheet names
- assertStartsWith(text, "Sheet1");
- assertEndsWith(text, "Sheet3\n");
-
- // Now without, will have text
- extractor.setIncludeSheetNames(false);
- text = extractor.getText();
- String CHUNK1 =
- "Lorem\t111\n" +
- "ipsum\t222\n" +
- "dolor\t333\n" +
- "sit\t444\n" +
- "amet\t555\n" +
- "consectetuer\t666\n" +
- "adipiscing\t777\n" +
- "elit\t888\n" +
- "Nunc\t999\n";
- String CHUNK2 =
- "The quick brown fox jumps over the lazy dog\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n" +
- "hello, xssf hello, xssf\n";
- assertEquals(
- CHUNK1 +
- "at\t4995\n" +
- CHUNK2
- , text);
-
- // Now get formulas not their values
- extractor.setFormulasNotResults(true);
- text = extractor.getText();
- assertEquals(
- CHUNK1 +
- "at\tSUM(B1:B9)\n" +
- CHUNK2, text);
-
- // With sheet names too
- extractor.setIncludeSheetNames(true);
- text = extractor.getText();
- assertEquals(
- "Sheet1\n" +
- CHUNK1 +
- "at\tSUM(B1:B9)\n" +
- "rich test\n" +
- CHUNK2 +
- "Sheet3\n"
- , text);
-
- extractor.close();
- }
-
- @Test
- void testGetComplexText() throws IOException {
- // A fairly complex file
- XSSFExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
-
- String text = extractor.getText();
- assertTrue(text.length() > 0);
-
- // Might not have all formatting it should do!
- assertStartsWith(text,
- "Avgtxfull\n" +
- "\t(iii) AVERAGE TAX RATES ON ANNUAL"
- );
-
- extractor.close();
- }
-
- /**
- * Test that we return pretty much the same as
- * ExcelExtractor does, when we're both passed
- * the same file, just saved as xls and xlsx
- */
- @Test
- void testComparedToOLE2() throws IOException {
- // A fairly simple file - ooxml
- XSSFExcelExtractor ooxmlExtractor = getExtractor("SampleSS.xlsx");
-
- ExcelExtractor ole2Extractor =
- new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
-
- Map<String, POITextExtractor> extractors = new HashMap<>();
- extractors.put("SampleSS.xlsx", ooxmlExtractor);
- extractors.put("SampleSS.xls", ole2Extractor);
-
- for (final Entry<String, POITextExtractor> e : extractors.entrySet()) {
- String filename = e.getKey();
- POITextExtractor extractor = e.getValue();
- String text = extractor.getText().replaceAll("[\r\t]", "");
- assertStartsWith(filename, text, "First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n");
- Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
- Matcher m = pattern.matcher(text);
- assertTrue(m.matches(), filename);
- }
-
- ole2Extractor.close();
- ooxmlExtractor.close();
- }
-
- /**
- * From bug #45540
- */
- @Test
- void testHeaderFooter() throws IOException {
- String[] files = new String[] {
- "45540_classic_Header.xlsx", "45540_form_Header.xlsx",
- "45540_classic_Footer.xlsx", "45540_form_Footer.xlsx",
- };
- for(String sampleName : files) {
- XSSFExcelExtractor extractor = getExtractor(sampleName);
- String text = extractor.getText();
-
- assertContains(sampleName, text, "testdoc");
- assertContains(sampleName, text, "test phrase");
-
- extractor.close();
- }
- }
-
- /**
- * From bug #45544
- */
- @Test
- void testComments() throws IOException {
- XSSFExcelExtractor extractor = getExtractor("45544.xlsx");
- String text = extractor.getText();
-
- // No comments there yet
- assertNotContained(text, "testdoc");
- assertNotContained(text, "test phrase");
-
- // Turn on comment extraction, will then be
- extractor.setIncludeCellComments(true);
- text = extractor.getText();
- assertContains(text, "testdoc");
- assertContains(text, "test phrase");
+ protected XSSFExcelExtractor getExtractor(String sampleName) {
+ return new XSSFExcelExtractor(XSSFTestDataSamples.openSampleWorkbook(sampleName));
+ }
+
+ /**
+ * Get text out of the simple file
+ */
+ @Test
+ void testGetSimpleText() throws IOException {
+ // a very simple file
+ XSSFExcelExtractor extractor = getExtractor("sample.xlsx");
+
+ String text = extractor.getText();
+ assertTrue(text.length() > 0);
+
+ // Check sheet names
+ assertStartsWith(text, "Sheet1");
+ assertEndsWith(text, "Sheet3\n");
+
+ // Now without, will have text
+ extractor.setIncludeSheetNames(false);
+ text = extractor.getText();
+ String CHUNK1 =
+ "Lorem\t111\n" +
+ "ipsum\t222\n" +
+ "dolor\t333\n" +
+ "sit\t444\n" +
+ "amet\t555\n" +
+ "consectetuer\t666\n" +
+ "adipiscing\t777\n" +
+ "elit\t888\n" +
+ "Nunc\t999\n";
+ String CHUNK2 =
+ "The quick brown fox jumps over the lazy dog\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n" +
+ "hello, xssf hello, xssf\n";
+ assertEquals(
+ CHUNK1 +
+ "at\t4995\n" +
+ CHUNK2
+ , text);
+
+ // Now get formulas not their values
+ extractor.setFormulasNotResults(true);
+ text = extractor.getText();
+ assertEquals(
+ CHUNK1 +
+ "at\tSUM(B1:B9)\n" +
+ CHUNK2, text);
+
+ // With sheet names too
+ extractor.setIncludeSheetNames(true);
+ text = extractor.getText();
+ assertEquals(
+ "Sheet1\n" +
+ CHUNK1 +
+ "at\tSUM(B1:B9)\n" +
+ "rich test\n" +
+ CHUNK2 +
+ "Sheet3\n"
+ , text);
+
+ extractor.close();
+ }
+
+ @Test
+ void testGetComplexText() throws IOException {
+ // A fairly complex file
+ XSSFExcelExtractor extractor = getExtractor("AverageTaxRates.xlsx");
+
+ String text = extractor.getText();
+ assertTrue(text.length() > 0);
+
+ // Might not have all formatting it should do!
+ assertStartsWith(text,
+ "Avgtxfull\n" +
+ "\t(iii) AVERAGE TAX RATES ON ANNUAL"
+ );
+
+ extractor.close();
+ }
+
+ /**
+ * Test that we return pretty much the same as
+ * ExcelExtractor does, when we're both passed
+ * the same file, just saved as xls and xlsx
+ */
+ @Test
+ void testComparedToOLE2() throws IOException {
+ // A fairly simple file - ooxml
+ XSSFExcelExtractor ooxmlExtractor = getExtractor("SampleSS.xlsx");
+
+ ExcelExtractor ole2Extractor =
+ new ExcelExtractor(HSSFTestDataSamples.openSampleWorkbook("SampleSS.xls"));
+
+ Map<String, POITextExtractor> extractors = new HashMap<>();
+ extractors.put("SampleSS.xlsx", ooxmlExtractor);
+ extractors.put("SampleSS.xls", ole2Extractor);
+
+ for (final Entry<String, POITextExtractor> e : extractors.entrySet()) {
+ String filename = e.getKey();
+ POITextExtractor extractor = e.getValue();
+ String text = extractor.getText().replaceAll("[\r\t]", "");
+ assertStartsWith(filename, text, "First Sheet\nTest spreadsheet\n2nd row2nd row 2nd column\n");
+ Pattern pattern = Pattern.compile(".*13(\\.0+)?\\s+Sheet3.*", Pattern.DOTALL);
+ Matcher m = pattern.matcher(text);
+ assertTrue(m.matches(), filename);
+ }
+
+ ole2Extractor.close();
+ ooxmlExtractor.close();
+ }
+
+ /**
+ * From bug #45540
+ */
+ @Test
+ void testHeaderFooter() throws IOException {
+ String[] files = new String[] {
+ "45540_classic_Header.xlsx", "45540_form_Header.xlsx",
+ "45540_classic_Footer.xlsx", "45540_form_Footer.xlsx",
+ };
+ for(String sampleName : files) {
+ XSSFExcelExtractor extractor = getExtractor(sampleName);
+ String text = extractor.getText();
+
+ assertContains(sampleName, text, "testdoc");
+ assertContains(sampleName, text, "test phrase");
+
+ extractor.close();
+ }
+ }
+
+ /**
+ * From bug #45544
+ */
+ @Test
+ void testComments() throws IOException {
+ XSSFExcelExtractor extractor = getExtractor("45544.xlsx");
+ String text = extractor.getText();
+
+ // No comments there yet
+ assertNotContained(text, "testdoc");
+ assertNotContained(text, "test phrase");
+
+ // Turn on comment extraction, will then be
+ extractor.setIncludeCellComments(true);
+ text = extractor.getText();
+ assertContains(text, "testdoc");
+ assertContains(text, "test phrase");
- extractor.close();
- }
+ extractor.close();
+ }
- @Test
- void testInlineStrings() throws IOException {
+ @Test
+ void testInlineStrings() throws IOException {
XSSFExcelExtractor extractor = getExtractor("InlineStrings.xlsx");
extractor.setFormulasNotResults(true);
String text = extractor.getText();
@@ -220,13 +220,13 @@ class TestXSSFExcelExtractor {
assertContains(text, "A5-A$2");
extractor.close();
- }
+ }
- /**
- * Simple test for text box text
- */
- @Test
- void testTextBoxes() throws IOException {
+ /**
+ * Simple test for text box text
+ */
+ @Test
+ void testTextBoxes() throws IOException {
try (XSSFExcelExtractor extractor = getExtractor("WithTextBox.xlsx")) {
extractor.setFormulasNotResults(true);
String text = extractor.getText();
@@ -234,10 +234,10 @@ class TestXSSFExcelExtractor {
assertContains(text, "Line 2");
assertContains(text, "Line 3");
}
- }
+ }
- @Test
- void testPhoneticRuns() throws Exception {
+ @Test
+ void testPhoneticRuns() throws Exception {
try (XSSFExcelExtractor extractor = getExtractor("51519.xlsx")) {
String text = extractor.getText();
assertContains(text, "\u8C4A\u7530");
@@ -246,5 +246,5 @@ class TestXSSFExcelExtractor {
assertNotContained(text, "\u30CB\u30DB\u30F3");
}
- }
+ }
}
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/extractor/TestXSSFExcelExtractorUsingFactory.java Sat May 22 20:22:16 2021
@@ -25,16 +25,16 @@ import org.junit.jupiter.api.AfterEach;
* Tests for {@link XSSFExcelExtractor}
*/
public final class TestXSSFExcelExtractorUsingFactory extends TestXSSFExcelExtractor {
- @Override
- protected final XSSFExcelExtractor getExtractor(String sampleName) {
- ExtractorFactory.setAllThreadsPreferEventExtractors(false);
- ExtractorFactory.setThreadPrefersEventExtractors(false);
- try {
- return (XSSFExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+ @Override
+ protected final XSSFExcelExtractor getExtractor(String sampleName) {
+ ExtractorFactory.setAllThreadsPreferEventExtractors(false);
+ ExtractorFactory.setThreadPrefersEventExtractors(false);
+ try {
+ return (XSSFExcelExtractor) ExtractorFactory.createExtractor(HSSFTestDataSamples.openSampleFileStream(sampleName));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
@AfterEach
void tearDown() {
Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java?rev=1890119&r1=1890118&r2=1890119&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/streaming/TestOutlining.java Sat May 22 20:22:16 2021
@@ -35,48 +35,48 @@ import org.junit.jupiter.api.Test;
public final class TestOutlining {
@Test
- void testSetRowGroupCollapsed() throws IOException {
- SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
- wb2.setCompressTempFiles(true);
- SXSSFSheet sheet2 = wb2.createSheet("new sheet");
-
- int rowCount = 20;
- for (int i = 0; i < rowCount; i++) {
- sheet2.createRow(i);
- }
-
- sheet2.groupRow(4, 9);
- sheet2.groupRow(11, 19);
-
- sheet2.setRowGroupCollapsed(4, true);
-
- SXSSFRow r = sheet2.getRow(8);
- assertTrue(r.getHidden());
- r = sheet2.getRow(10);
- assertTrue(r.getCollapsed());
- r = sheet2.getRow(12);
- assertNull(r.getHidden());
- wb2.dispose();
+ void testSetRowGroupCollapsed() throws IOException {
+ SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
+ wb2.setCompressTempFiles(true);
+ SXSSFSheet sheet2 = wb2.createSheet("new sheet");
+
+ int rowCount = 20;
+ for (int i = 0; i < rowCount; i++) {
+ sheet2.createRow(i);
+ }
+
+ sheet2.groupRow(4, 9);
+ sheet2.groupRow(11, 19);
+
+ sheet2.setRowGroupCollapsed(4, true);
+
+ SXSSFRow r = sheet2.getRow(8);
+ assertTrue(r.getHidden());
+ r = sheet2.getRow(10);
+ assertTrue(r.getCollapsed());
+ r = sheet2.getRow(12);
+ assertNull(r.getHidden());
+ wb2.dispose();
- wb2.close();
- }
+ wb2.close();
+ }
@Test
void testSetRowGroupCollapsedError() throws IOException {
- SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
- wb2.setCompressTempFiles(true);
- SXSSFSheet sheet2 = wb2.createSheet("new sheet");
-
- int rowCount = 20;
- for (int i = 0; i < rowCount; i++) {
- sheet2.createRow(i);
- }
+ SXSSFWorkbook wb2 = new SXSSFWorkbook(100);
+ wb2.setCompressTempFiles(true);
+ SXSSFSheet sheet2 = wb2.createSheet("new sheet");
+
+ int rowCount = 20;
+ for (int i = 0; i < rowCount; i++) {
+ sheet2.createRow(i);
+ }
- sheet2.groupRow(4, 9);
- sheet2.groupRow(11, 19);
+ sheet2.groupRow(4, 9);
+ sheet2.groupRow(11, 19);
IllegalArgumentException e;
- e = assertThrows(IllegalArgumentException.class, () -> sheet2.setRowGroupCollapsed(3, true));
+ e = assertThrows(IllegalArgumentException.class, () -> sheet2.setRowGroupCollapsed(3, true));
assertTrue(e.getMessage().contains("row (3)"));
e = assertThrows(IllegalArgumentException.class, () -> sheet2.setRowGroupCollapsed(10, true));
@@ -88,17 +88,17 @@ public final class TestOutlining {
e = assertThrows(IllegalArgumentException.class, () -> sheet2.setRowGroupCollapsed(20, true));
assertTrue(e.getMessage().contains("Row does not exist"), "Had: " + e.getMessage());
- SXSSFRow r = sheet2.getRow(8);
- assertNotNull(r);
- assertNull(r.getHidden());
- r = sheet2.getRow(10);
- assertNull(r.getCollapsed());
- r = sheet2.getRow(12);
- assertNull(r.getHidden());
- wb2.dispose();
+ SXSSFRow r = sheet2.getRow(8);
+ assertNotNull(r);
+ assertNull(r.getHidden());
+ r = sheet2.getRow(10);
+ assertNull(r.getCollapsed());
+ r = sheet2.getRow(12);
+ assertNull(r.getHidden());
+ wb2.dispose();
- wb2.close();
- }
+ wb2.close();
+ }
@Test
void testOutlineGettersHSSF() throws IOException {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org