Author: fanningpj
Date: Sat Oct 23 12:53:57 2021
New Revision: 1894510
URL: http://svn.apache.org/viewvc?rev=1894510&view=rev
Log:
fix mime type for pict files (image/x-pict)
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
Modified:
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java?rev=1894510&r1=1894509&r2=1894510&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
(original)
+++
poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/TestXSSFPictureData.java
Sat Oct 23 12:53:57 2021
@@ -112,6 +112,37 @@ public final class TestXSSFPictureData {
wb.close();
}
+ @Test
+ void testNewPictFormat() throws IOException {
+ try (XSSFWorkbook wb = new XSSFWorkbook()) {
+ XSSFSheet sheet = wb.createSheet();
+ XSSFDrawing drawing = sheet.createDrawingPatriarch();
+
+ byte[] pictData = "test pict
data".getBytes(LocaleUtil.CHARSET_1252);
+
+ List<XSSFPictureData> pictures = wb.getAllPictures();
+ assertEquals(0, pictures.size());
+
+ int pictIdx = wb.addPicture(pictData,
XSSFWorkbook.PICTURE_TYPE_PICT);
+ assertEquals(1, pictures.size());
+ assertEquals("pict", pictures.get(pictIdx).suggestFileExtension());
+ assertArrayEquals(pictData, pictures.get(pictIdx).getData());
+
+ //TODO finish usermodel API for XSSFPicture
+ XSSFPicture p1 = drawing.createPicture(new XSSFClientAnchor(),
pictIdx);
+ assertNotNull(p1);
+
+ //check that the added pictures are accessible after write
+ try (XSSFWorkbook wbBack =
XSSFTestDataSamples.writeOutAndReadBack(wb)) {
+ List<XSSFPictureData> pictures2 = wbBack.getAllPictures();
+ assertEquals(1, pictures2.size());
+
+ assertEquals("pict",
pictures2.get(pictIdx).suggestFileExtension());
+ assertArrayEquals(pictData, pictures2.get(pictIdx).getData());
+ }
+ }
+ }
+
/**
* Bug 53568: XSSFPicture.getPictureData() can return null.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
