Add a (disabled) unit test showing the incorrect ordering problem of parts - bug #57552
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1676810 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
13dc67c73a
commit
c029154424
@ -18,6 +18,7 @@ package org.apache.poi.xslf;
|
|||||||
|
|
||||||
import static junit.framework.TestCase.assertEquals;
|
import static junit.framework.TestCase.assertEquals;
|
||||||
import static org.apache.poi.POITestCase.assertContains;
|
import static org.apache.poi.POITestCase.assertContains;
|
||||||
|
import static org.junit.Assert.assertArrayEquals;
|
||||||
import static org.junit.Assert.assertNotNull;
|
import static org.junit.Assert.assertNotNull;
|
||||||
import static org.junit.Assert.fail;
|
import static org.junit.Assert.fail;
|
||||||
|
|
||||||
@ -47,7 +48,6 @@ import org.apache.poi.xslf.usermodel.XSLFSlide;
|
|||||||
import org.apache.poi.xslf.usermodel.XSLFSlideLayout;
|
import org.apache.poi.xslf.usermodel.XSLFSlideLayout;
|
||||||
import org.junit.Ignore;
|
import org.junit.Ignore;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
public class TestXSLFBugs {
|
public class TestXSLFBugs {
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
@ -260,6 +260,108 @@ public class TestXSLFBugs {
|
|||||||
validateSlides(ss, true, "Slide1","Slide2","New slide");
|
validateSlides(ss, true, "Slide1","Slide2","New slide");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* When working with >9 images, make sure the sorting ensures
|
||||||
|
* that image10.foo isn't between image1.foo and image2.foo
|
||||||
|
*/
|
||||||
|
@Test
|
||||||
|
@Ignore
|
||||||
|
public void test57552() throws Exception {
|
||||||
|
XMLSlideShow ss = new XMLSlideShow();
|
||||||
|
for (String s : new String[]{"Slide1","Slide2"}) {
|
||||||
|
ss.createSlide().createTextBox().setText(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Slide starts with just layout relation
|
||||||
|
XSLFSlide slide = ss.getSlides()[0];
|
||||||
|
assertEquals(0, ss.getAllPictures().size());
|
||||||
|
assertEquals(1, slide.getShapes().length);
|
||||||
|
|
||||||
|
assertEquals(1, slide.getRelations().size());
|
||||||
|
assertRelationEquals(XSLFRelation.SLIDE_LAYOUT, slide.getRelations().get(0));
|
||||||
|
|
||||||
|
// Some dummy pictures
|
||||||
|
byte[][] pics = new byte[15][3];
|
||||||
|
for (int i=0; i<pics.length; i++) {
|
||||||
|
for (int j=0; j<pics[i].length; j++) {
|
||||||
|
pics[i][j] = (byte)i;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add a few pictures
|
||||||
|
for (int i=0; i<10; i++) {
|
||||||
|
int idx = ss.addPicture(pics[i], XSLFPictureData.PICTURE_TYPE_JPEG);
|
||||||
|
assertEquals(i, idx);
|
||||||
|
assertEquals(i+1, ss.getAllPictures().size());
|
||||||
|
|
||||||
|
XSLFPictureShape shape = slide.createPicture(idx);
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[i], shape.getPictureData().getData());
|
||||||
|
assertEquals(i+2, slide.getShapes().length);
|
||||||
|
}
|
||||||
|
// Re-fetch the pictures and check
|
||||||
|
for (int i=0; i<10; i++) {
|
||||||
|
XSLFPictureShape shape = (XSLFPictureShape)slide.getShapes()[i+1];
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[i], shape.getPictureData().getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add past 10
|
||||||
|
for (int i=10; i<15; i++) {
|
||||||
|
int idx = ss.addPicture(pics[i], XSLFPictureData.PICTURE_TYPE_JPEG);
|
||||||
|
assertEquals(i, idx);
|
||||||
|
assertEquals(i+1, ss.getAllPictures().size());
|
||||||
|
|
||||||
|
XSLFPictureShape shape = slide.createPicture(idx);
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[i], shape.getPictureData().getData());
|
||||||
|
assertEquals(i+2, slide.getShapes().length);
|
||||||
|
}
|
||||||
|
// Check all pictures
|
||||||
|
for (int i=0; i<15; i++) {
|
||||||
|
XSLFPictureShape shape = (XSLFPictureShape)slide.getShapes()[i+1];
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[i], shape.getPictureData().getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add a duplicate, check the right one is picked
|
||||||
|
int idx = ss.addPicture(pics[3], XSLFPictureData.PICTURE_TYPE_JPEG);
|
||||||
|
assertEquals(3, idx);
|
||||||
|
assertEquals(15, ss.getAllPictures().size());
|
||||||
|
|
||||||
|
XSLFPictureShape shape = slide.createPicture(idx);
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[3], shape.getPictureData().getData());
|
||||||
|
assertEquals(17, slide.getShapes().length);
|
||||||
|
|
||||||
|
|
||||||
|
// Save and re-load
|
||||||
|
ss = XSLFTestDataSamples.writeOutAndReadBack(ss);
|
||||||
|
slide = ss.getSlides()[0];
|
||||||
|
|
||||||
|
// Check the 15 individual ones added
|
||||||
|
for (int i=0; i<15; i++) {
|
||||||
|
shape = (XSLFPictureShape)slide.getShapes()[i+1];
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[i], shape.getPictureData().getData());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check the duplicate
|
||||||
|
shape = (XSLFPictureShape)slide.getShapes()[16];
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[3], shape.getPictureData().getData());
|
||||||
|
|
||||||
|
// Add another duplicate
|
||||||
|
idx = ss.addPicture(pics[5], XSLFPictureData.PICTURE_TYPE_JPEG);
|
||||||
|
assertEquals(5, idx);
|
||||||
|
assertEquals(15, ss.getAllPictures().size());
|
||||||
|
|
||||||
|
shape = slide.createPicture(idx);
|
||||||
|
assertNotNull(shape.getPictureData());
|
||||||
|
assertArrayEquals(pics[5], shape.getPictureData().getData());
|
||||||
|
assertEquals(18, slide.getShapes().length);
|
||||||
|
}
|
||||||
|
|
||||||
private void validateSlides(XMLSlideShow ss, boolean saveAndReload, String... slideTexts) {
|
private void validateSlides(XMLSlideShow ss, boolean saveAndReload, String... slideTexts) {
|
||||||
if (saveAndReload) {
|
if (saveAndReload) {
|
||||||
ss = XSLFTestDataSamples.writeOutAndReadBack(ss);
|
ss = XSLFTestDataSamples.writeOutAndReadBack(ss);
|
||||||
@ -272,5 +374,8 @@ public class TestXSLFBugs {
|
|||||||
assertContains(getSlideText(slide), slideTexts[i]);
|
assertContains(getSlideText(slide), slideTexts[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
private void assertRelationEquals(XSLFRelation expected, POIXMLDocumentPart relation) {
|
||||||
|
assertEquals(expected.getContentType(), relation.getPackagePart().getContentType());
|
||||||
|
assertEquals(expected.getFileName(expected.getFileNameIndex(relation)), relation.getPackagePart().getPartName().getName());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user