Enhance unit-test to Verify that bug 58785 is already via via some other change

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1814440 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
index cf54e155db6057d47dc9418b6c63d0f6bf77a09e..7805bfdd2a3b1398b232b792a016da982f61a5f1 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
+++ b/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java
@@ -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");