diff options
Diffstat (limited to 'poi-ooxml/src/test/java')
7 files changed, 53 insertions, 35 deletions
diff --git a/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java index 8bea979e33..5ebd7d13b5 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xddf/usermodel/chart/TestXDDFChartRemoveSeries.java @@ -112,21 +112,7 @@ class TestXDDFChartRemoveSeries { } workbook.close(); } - - /** - * Attempt to remove the first series by calling chartData.getSeries().remove(0). - * <p> - * This used to corrupt the workbook but the returned <code>List</code> is unmodifiable. - */ - @Test - void testRemoveSeries0() { - procName = "testRemoveSeries0"; - fileName = procName + ".xlsx"; - - assertThrows(UnsupportedOperationException.class, () -> chartData.getSeries().remove(0)); - assertEquals(2, chartData.getSeriesCount()); - } - + /** * Remove the first series by calling chartData.removeSeries(0). * <p> diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java index 045a03601b..9677cb0a7f 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/model/TestExternalLinksTable.java @@ -32,18 +32,18 @@ public final class TestExternalLinksTable { @Test void none() throws IOException { try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("SampleSS.xlsx")) { - assertNotNull(wb.getExternalLinksTable()); - assertEquals(0, wb.getExternalLinksTable().size()); + assertNotNull(wb.getExternalLinksTables()); + assertEquals(0, wb.getExternalLinksTables().size()); } } @Test void basicRead() throws IOException { try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx")) { - assertNotNull(wb.getExternalLinksTable()); - assertEquals(1, wb.getExternalLinksTable().size()); + assertNotNull(wb.getExternalLinksTables()); + assertEquals(1, wb.getExternalLinksTables().size()); - ExternalLinksTable links = wb.getExternalLinksTable().get(0); + ExternalLinksTable links = wb.getExternalLinksTable(0); assertEquals(3, links.getSheetNames().size()); assertEquals(2, links.getDefinedNames().size()); @@ -70,13 +70,13 @@ public final class TestExternalLinksTable { @Test void basicReadWriteRead() throws IOException { try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref-56737.xlsx")) { - Name name = wb.getExternalLinksTable().get(0).getDefinedNames().get(1); + Name name = wb.getExternalLinksTable(0).getDefinedNames().get(1); name.setNameName("Testing"); name.setRefersToFormula("$A$1"); XSSFWorkbook wbBack = XSSFTestDataSamples.writeOutAndReadBack(wb); - assertEquals(1, wbBack.getExternalLinksTable().size()); - ExternalLinksTable links = wbBack.getExternalLinksTable().get(0); + assertEquals(1, wbBack.getExternalLinksTables().size()); + ExternalLinksTable links = wbBack.getExternalLinksTable(0); name = links.getDefinedNames().get(0); assertEquals("NR_Global_B2", name.getNameName()); @@ -95,11 +95,11 @@ public final class TestExternalLinksTable { @Test void readWithReferencesToTwoExternalBooks() throws IOException { try (XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("ref2-56737.xlsx")) { - assertNotNull(wb.getExternalLinksTable()); - assertEquals(2, wb.getExternalLinksTable().size()); + assertNotNull(wb.getExternalLinksTables()); + assertEquals(2, wb.getExternalLinksTables().size()); // Check the first one, links to 56737.xlsx - ExternalLinksTable links = wb.getExternalLinksTable().get(0); + ExternalLinksTable links = wb.getExternalLinksTable(0); assertEquals("56737.xlsx", links.getLinkedFileName()); assertEquals(3, links.getSheetNames().size()); assertEquals(2, links.getDefinedNames().size()); @@ -122,7 +122,7 @@ public final class TestExternalLinksTable { // Check the second one, links to 56737.xls, slightly differently - links = wb.getExternalLinksTable().get(1); + links = wb.getExternalLinksTable(1); assertEquals("56737.xls", links.getLinkedFileName()); assertEquals(2, links.getSheetNames().size()); assertEquals(2, links.getDefinedNames().size()); diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java index b42aeba053..fa1cb56136 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java @@ -35,7 +35,7 @@ public final class TestXSSFPictureData { XSSFWorkbook wb = XSSFTestDataSamples.openSampleWorkbook("WithDrawing.xlsx"); List<XSSFPictureData> pictures = wb.getAllPictures(); //wb.getAllPictures() should return the same instance across multiple calls - assertSame(pictures, wb.getAllPictures()); + assertEquals(pictures, wb.getAllPictures()); assertEquals(5, pictures.size()); String[] ext = {"jpeg", "emf", "png", "emf", "wmf"}; diff --git a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java index 7926912f6c..19da165b85 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java @@ -1391,7 +1391,7 @@ public final class TestXSSFWorkbook extends BaseTestXWorkbook { try( XSSFWorkbook workbook2 = new XSSFWorkbook(bosB.toInputStream()) ) { - CTExternalLink link = workbook2.getExternalLinksTable().get(0).getCTExternalLink(); + CTExternalLink link = workbook2.getExternalLinksTable(0).getCTExternalLink(); CTExternalSheetData sheetData = link.getExternalBook().getSheetDataSet().getSheetDataArray(0); assertEquals(Double.valueOf(sheetData.getRowArray(0).getCellArray(0).getV()), v1); assertEquals(Double.valueOf(sheetData.getRowArray(0).getCellArray(1).getV()), v2); diff --git a/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java index 79ffa2d701..256fe9fe7e 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComment.java @@ -16,6 +16,7 @@ ==================================================================== */ package org.apache.poi.xwpf.usermodel; +import org.apache.poi.common.usermodel.PictureType; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.util.LocaleUtil; import org.apache.poi.xwpf.XWPFTestDataSamples; @@ -100,7 +101,7 @@ class TestXWPFComment { XWPFParagraph paragraph = comment.createParagraph(); XWPFRun r = paragraph.createRun(); r.addPicture(new ByteArrayInputStream(new byte[0]), - Document.PICTURE_TYPE_JPEG, "test.jpg", 21, 32); + PictureType.JPEG, "test.jpg", 21, 32); assertEquals(1, comments.getAllPictures().size()); assertEquals(1, doc.getAllPackagePictures().size()); diff --git a/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java index 926ea82868..452c869995 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFPictureData.java @@ -117,7 +117,7 @@ class TestXWPFPictureData { // Add a picture to the first paragraph header.getParagraphs().get(0).getRuns().get(0).addPicture( new ByteArrayInputStream(new byte[]{1, 2, 3, 4}), - Document.PICTURE_TYPE_JPEG, "test.jpg", 2, 2); + PictureType.JPEG, "test.jpg", 2, 2); // Check verifyOneHeaderPicture(doc); diff --git a/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java index ed79c2272d..87561e720d 100644 --- a/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java +++ b/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFRun.java @@ -36,6 +36,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.util.LocaleUtil; import org.apache.poi.util.Units; import org.apache.poi.wp.usermodel.HeaderFooterType; +import org.apache.poi.xddf.usermodel.chart.XDDFChart; import org.apache.poi.xwpf.XWPFTestDataSamples; import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy; import org.junit.jupiter.api.AfterEach; @@ -552,7 +553,7 @@ class TestXWPFRun { assertEquals(0, doc.getAllPictures().size()); assertEquals(0, r.getEmbeddedPictures().size()); - r.addPicture(new ByteArrayInputStream(new byte[0]), Document.PICTURE_TYPE_JPEG, "test.jpg", 21, 32); + r.addPicture(new ByteArrayInputStream(new byte[0]), PictureType.JPEG, "test.jpg", 21, 32); assertEquals(1, doc.getAllPictures().size()); assertEquals(1, r.getEmbeddedPictures().size()); @@ -580,7 +581,7 @@ class TestXWPFRun { assertEquals(0, hdr.getAllPictures().size()); assertEquals(0, r.getEmbeddedPictures().size()); - r.addPicture(new ByteArrayInputStream(new byte[0]), Document.PICTURE_TYPE_JPEG, "test.jpg", 21, 32); + r.addPicture(new ByteArrayInputStream(new byte[0]), PictureType.JPEG, "test.jpg", 21, 32); assertEquals(1, hdr.getAllPictures().size()); assertEquals(1, r.getEmbeddedPictures().size()); @@ -627,7 +628,7 @@ class TestXWPFRun { try (XWPFDocument document = new XWPFDocument()) { document.createParagraph().createRun().addPicture( - new ByteArrayInputStream(image), Document.PICTURE_TYPE_JPEG, "test.jpg", Units.toEMU(300), Units.toEMU(100)); + new ByteArrayInputStream(image), PictureType.JPEG, "test.jpg", Units.toEMU(300), Units.toEMU(100)); try (XWPFDocument docBack = writeOutAndReadBack(document)) { List<XWPFPicture> pictures = docBack.getParagraphArray(0).getRuns().get(0).getEmbeddedPictures(); @@ -858,7 +859,7 @@ class TestXWPFRun { assertEquals(0, hdr.getAllPictures().size()); assertEquals(0, r.getEmbeddedPictures().size()); - r.addPicture(new ByteArrayInputStream(new byte[0]), Document.PICTURE_TYPE_JPEG, "test.jpg", 21, 32); + r.addPicture(new ByteArrayInputStream(new byte[0]), PictureType.JPEG, "test.jpg", 21, 32); assertEquals(1, hdr.getAllPictures().size()); assertEquals(1, r.getEmbeddedPictures().size()); @@ -909,4 +910,34 @@ class TestXWPFRun { run.setText("TEST STRING"); assertEquals(1, run.getNumberOfTexts()); } + + @Test + void testGetEmbeddedCharts() throws IOException { + try (XWPFDocument sampleDoc = XWPFTestDataSamples.openSampleDocument("61745.docx")) { + List<XWPFChart> charts = sampleDoc.getCharts(); + assertEquals(2, charts.size()); + List<XWPFChart> run1Charts = sampleDoc.getParagraphArray(0).getRuns().get(0).getEmbeddedCharts(); + assertEquals(1, run1Charts.size()); + assertEquals(charts.get(0), run1Charts.get(0)); + List<XWPFChart> run2Charts = sampleDoc.getParagraphArray(1).getRuns().get(0).getEmbeddedCharts(); + assertEquals(1, run2Charts.size()); + assertEquals(charts.get(1), run2Charts.get(0)); + } + } + + @Test + void testAddChartGetEmbeddedCharts() throws InvalidFormatException, IOException { + XWPFRun run1 = p.createRun(); + XWPFChart chart1 = doc.createChart(run1, XDDFChart.DEFAULT_WIDTH, XDDFChart.DEFAULT_HEIGHT); + assertEquals(1, run1.getEmbeddedCharts().size()); + assertEquals(chart1, run1.getEmbeddedCharts().get(0)); + + XWPFRun run2 = p.createRun(); + XWPFChart chart2 = doc.createChart(run2, XDDFChart.DEFAULT_WIDTH, XDDFChart.DEFAULT_HEIGHT); + assertEquals(1, run2.getEmbeddedCharts().size()); + assertEquals(chart2, run2.getEmbeddedCharts().get(0)); + + XWPFRun run3 = p.createRun(); + assertEquals(0, run3.getEmbeddedCharts().size()); + } } |