You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2017/11/06 20:26:32 UTC
svn commit: r1814440 -
/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
Author: centic
Date: Mon Nov 6 20:26:32 2017
New Revision: 1814440
URL: http://svn.apache.org/viewvc?rev=1814440&view=rev
Log:
Enhance unit-test to Verify that bug 58785 is already via via some other change
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java?rev=1814440&r1=1814439&r2=1814440&view=diff
==============================================================================
--- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java (original)
+++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java Mon Nov 6 20:26:32 2017
@@ -161,21 +161,60 @@ public class TestXSLFPictureShape {
XSLFPictureShape shape1 = slide1.createPicture(pdata1);
CTPicture ctPic1 = (CTPicture)shape1.getXmlObject();
ctPic1.getNvPicPr().getNvPr().addNewCustDataLst().addNewTags().setId("rId99");
-
- XMLSlideShow ppt2 = new XMLSlideShow();
- XSLFSlide slide2 = ppt2.createSlide().importContent(slide1);
- XSLFPictureShape shape2 = (XSLFPictureShape)slide2.getShapes().get(0);
+ XSLFPictureShape shape2 = slide1.createPicture(pdata1);
+ CTPicture ctPic2 = (CTPicture)shape2.getXmlObject();
+ ctPic2.getNvPicPr().getNvPr().addNewCustDataLst().addNewTags().setId("rId99");
- assertArrayEquals(data1, shape2.getPictureData().getData());
+ differentShapeName(shape1, shape2);
- CTPicture ctPic2 = (CTPicture)shape2.getXmlObject();
- assertFalse(ctPic2.getNvPicPr().getNvPr().isSetCustDataLst());
+ XSLFGroupShape group = slide1.createGroup();
+ XSLFTextBox tb1 = group.createTextBox();
+ XSLFTextBox tb2 = group.createTextBox();
+
+ assertFalse("We should have different names now, but had: " + tb1.getShapeName() + " for both",
+ tb1.getShapeName().equals(tb2.getShapeName()));
+
+ XMLSlideShow pptCopy = new XMLSlideShow();
+
+ XSLFSlide slideCopy = pptCopy.createSlide().importContent(slide1);
+ XSLFPictureShape shapeCopy1 = (XSLFPictureShape)slideCopy.getShapes().get(0);
+
+ assertArrayEquals(data1, shapeCopy1.getPictureData().getData());
+ assertEquals(shape1.getShapeName(), shapeCopy1.getShapeName());
+
+ CTPicture ctPicCopy1 = (CTPicture)shapeCopy1.getXmlObject();
+ assertFalse(ctPicCopy1.getNvPicPr().getNvPr().isSetCustDataLst());
+
+ XSLFPictureShape shapeCopy2 = (XSLFPictureShape)slideCopy.getShapes().get(1);
+
+ assertArrayEquals(data1, shapeCopy2.getPictureData().getData());
+ assertEquals(shape2.getShapeName(), shapeCopy2.getShapeName());
+
+ CTPicture ctPicCopy2 = (CTPicture)shapeCopy2.getXmlObject();
+ assertFalse(ctPicCopy2.getNvPicPr().getNvPr().isSetCustDataLst());
+
+ differentShapeName(shapeCopy1, shapeCopy2);
+
+ XSLFGroupShape groupCopy = (XSLFGroupShape) slideCopy.getShapes().get(2);
+ XSLFTextBox tbCopy1 = (XSLFTextBox) groupCopy.getShapes().get(0);
+ XSLFTextBox tbCopy2 = (XSLFTextBox) groupCopy.getShapes().get(1);
+
+ assertEquals(group.getShapeName(), groupCopy.getShapeName());
+ assertEquals(tb1.getShapeName(), tbCopy1.getShapeName());
+ assertEquals(tb2.getShapeName(), tbCopy2.getShapeName());
+
+ differentShapeName(tb1, tb2);
ppt1.close();
- ppt2.close();
+ pptCopy.close();
+ }
+
+ private void differentShapeName(XSLFShape shape1, XSLFShape shape2) {
+ assertFalse("We should have different names now, but had: " + shape1.getShapeName() + " for both",
+ shape1.getShapeName().equals(shape2.getShapeName()));
}
-
+
@Test
public void bug58663() throws IOException {
InputStream is = _slTests.openResourceAsStream("shapes.pptx");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org