Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFBugs.java Thu Dec 24 18:42:29 2020 @@ -20,14 +20,14 @@ import static org.apache.poi.POITestCase import static org.apache.poi.sl.draw.DrawTextParagraph.HYPERLINK_HREF; import static org.apache.poi.sl.draw.DrawTextParagraph.HYPERLINK_LABEL; import static org.apache.poi.xslf.XSLFTestDataSamples.openSampleDocument; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.awt.Color; import java.awt.Dimension; @@ -104,9 +104,9 @@ import org.apache.poi.xslf.usermodel.XSL import org.apache.poi.xslf.usermodel.XSLFTextParagraph; import org.apache.poi.xslf.usermodel.XSLFTextRun; import org.apache.poi.xslf.util.DummyGraphics2d; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect; import org.openxmlformats.schemas.presentationml.x2006.main.CTShape; @@ -115,7 +115,7 @@ public class TestXSLFBugs { private static boolean xslfOnly; - @BeforeClass + @BeforeAll public static void checkHslf() { try { Class.forName("org.apache.poi.hslf.usermodel.HSLFSlideShow"); @@ -126,14 +126,14 @@ public class TestXSLFBugs { @Test public void bug62929() throws Exception { - try(XMLSlideShow ss1 = openSampleDocument("missing-blip-fill.pptx")) { + try (XMLSlideShow ss1 = openSampleDocument("missing-blip-fill.pptx")) { assertEquals(1, ss1.getSlides().size()); XSLFSlide slide = ss1.getSlides().get(0); assertEquals(slide.getShapes().size(), 1); - XSLFPictureShape picture = (XSLFPictureShape)slide.getShapes().get(0); + XSLFPictureShape picture = (XSLFPictureShape) slide.getShapes().get(0); assertEquals(picture.getShapeId(), 662); assertFalse(picture.isExternalLinkedPicture()); @@ -234,7 +234,7 @@ public class TestXSLFBugs { XSLFSlide slide2 = src.createSlide(); XSLFTextBox shape = slide.createTextBox(); - shape.setAnchor(new Rectangle2D.Double(100,100,400,100)); + shape.setAnchor(new Rectangle2D.Double(100, 100, 400, 100)); XSLFTextParagraph p = shape.addNewTextParagraph(); XSLFTextRun r = p.addNewTextRun(); @@ -247,7 +247,7 @@ public class TestXSLFBugs { r.createHyperlink().linkToSlide(slide2); shape = slide2.createTextBox(); - shape.setAnchor(new Rectangle2D.Double(100,100,400,100)); + shape.setAnchor(new Rectangle2D.Double(100, 100, 400, 100)); shape.setText("slide 2"); dest.createSlide().importContent(slide); @@ -258,7 +258,7 @@ public class TestXSLFBugs { try (XMLSlideShow ppt = new XMLSlideShow(new ByteArrayInputStream(bos.toByteArray()))) { XSLFSlide slide = ppt.getSlides().get(0); - XSLFTextBox shape = (XSLFTextBox)slide.getShapes().get(0); + XSLFTextBox shape = (XSLFTextBox) slide.getShapes().get(0); XSLFTextParagraph p = shape.getTextParagraphs().get(1); XSLFHyperlink h1 = p.getTextRuns().get(0).getHyperlink(); assertNotNull(h1); @@ -276,16 +276,16 @@ public class TestXSLFBugs { public void bug62587() throws IOException { ByteArrayOutputStream bos = new ByteArrayOutputStream(); try (XMLSlideShow ppt = new XMLSlideShow()) { - Slide<?,?> slide = ppt.createSlide(); + Slide<?, ?> slide = ppt.createSlide(); XSLFPictureData pd = ppt.addPicture(slTests.getFile("wrench.emf"), PictureType.EMF); - PictureShape<?,?> ps = slide.createPicture(pd); - ps.setAnchor(new Rectangle2D.Double(100,100,100,100)); + PictureShape<?, ?> ps = slide.createPicture(pd); + ps.setAnchor(new Rectangle2D.Double(100, 100, 100, 100)); ppt.write(bos); } Object[][] pics = { {"santa.wmf", PictureType.WMF, XSLFRelation.IMAGE_WMF}, - {"tomcat.png",PictureType.PNG, XSLFRelation.IMAGE_PNG}, + {"tomcat.png", PictureType.PNG, XSLFRelation.IMAGE_PNG}, {"clock.jpg", PictureType.JPEG, XSLFRelation.IMAGE_JPEG} }; @@ -296,7 +296,7 @@ public class TestXSLFBugs { XSLFSlide s2 = ppt.createSlide(); s2.importContent(s1); - XSLFPictureData pd = ppt.addPicture(slTests.getFile((String)p[0]), (PictureType)p[1]); + XSLFPictureData pd = ppt.addPicture(slTests.getFile((String) p[0]), (PictureType) p[1]); XSLFPictureShape ps = (XSLFPictureShape) s2.getShapes().get(0); Rectangle2D anchor = ps.getAnchor(); s2.removeShape(ps); @@ -340,7 +340,7 @@ public class TestXSLFBugs { assertTrue(shapeToDelete1.isPresent()); slide1.removeShape(shapeToDelete1.get()); assertTrue(slide1.getRelationParts().stream() - .allMatch(rp -> "rId1,rId3".contains(rp.getRelationship().getId()) )); + .allMatch(rp -> "rId1,rId3".contains(rp.getRelationship().getId()))); assertNotNull(ppt1.getPackage().getPart(ppn)); ppt1.close(); @@ -353,7 +353,7 @@ public class TestXSLFBugs { assertTrue(shapeToDelete2.isPresent()); slide2.removeShape(shapeToDelete2.get()); assertTrue(slide2.getRelationParts().stream() - .allMatch(rp -> "rId1,rId2".contains(rp.getRelationship().getId()) )); + .allMatch(rp -> "rId1,rId2".contains(rp.getRelationship().getId()))); assertNotNull(ppt2.getPackage().getPart(ppn)); ppt2.close(); @@ -369,34 +369,34 @@ public class TestXSLFBugs { @Test public void bug51187() throws Exception { - XMLSlideShow ss1 = openSampleDocument("51187.pptx"); + XMLSlideShow ss1 = openSampleDocument("51187.pptx"); - assertEquals(1, ss1.getSlides().size()); + assertEquals(1, ss1.getSlides().size()); + + // Check the relations on it + // Note - rId3 is a self reference + XSLFSlide slide0 = ss1.getSlides().get(0); + + assertRelation(slide0, "/ppt/slides/slide1.xml", null); + assertRelation(slide0, "/ppt/slideLayouts/slideLayout12.xml", "rId1"); + assertRelation(slide0, "/ppt/notesSlides/notesSlide1.xml", "rId2"); + assertRelation(slide0, "/ppt/slides/slide1.xml", "rId3"); + assertRelation(slide0, "/ppt/media/image1.png", "rId4"); + + // Save and re-load + XMLSlideShow ss2 = XSLFTestDataSamples.writeOutAndReadBack(ss1); + ss1.close(); + assertEquals(1, ss2.getSlides().size()); - // Check the relations on it - // Note - rId3 is a self reference - XSLFSlide slide0 = ss1.getSlides().get(0); - - assertRelation(slide0, "/ppt/slides/slide1.xml", null); - assertRelation(slide0, "/ppt/slideLayouts/slideLayout12.xml", "rId1"); - assertRelation(slide0, "/ppt/notesSlides/notesSlide1.xml", "rId2"); - assertRelation(slide0, "/ppt/slides/slide1.xml", "rId3"); - assertRelation(slide0, "/ppt/media/image1.png", "rId4"); - - // Save and re-load - XMLSlideShow ss2 = XSLFTestDataSamples.writeOutAndReadBack(ss1); - ss1.close(); - assertEquals(1, ss2.getSlides().size()); - - slide0 = ss2.getSlides().get(0); - assertRelation(slide0, "/ppt/slides/slide1.xml", null); - assertRelation(slide0, "/ppt/slideLayouts/slideLayout12.xml", "rId1"); - assertRelation(slide0, "/ppt/notesSlides/notesSlide1.xml", "rId2"); - // TODO Fix this - assertRelation(slide0, "/ppt/slides/slide1.xml", "rId3"); - assertRelation(slide0, "/ppt/media/image1.png", "rId4"); + slide0 = ss2.getSlides().get(0); + assertRelation(slide0, "/ppt/slides/slide1.xml", null); + assertRelation(slide0, "/ppt/slideLayouts/slideLayout12.xml", "rId1"); + assertRelation(slide0, "/ppt/notesSlides/notesSlide1.xml", "rId2"); + // TODO Fix this + assertRelation(slide0, "/ppt/slides/slide1.xml", "rId3"); + assertRelation(slide0, "/ppt/media/image1.png", "rId4"); - ss2.close(); + ss2.close(); } private static void assertRelation(XSLFSlide slide, String exp, String rId) { @@ -410,53 +410,47 @@ public class TestXSLFBugs { */ @Test public void tika705() throws Exception { - XMLSlideShow ss = openSampleDocument("with_japanese.pptx"); + XMLSlideShow ss = openSampleDocument("with_japanese.pptx"); - // Should have one slide - assertEquals(1, ss.getSlides().size()); - XSLFSlide slide = ss.getSlides().get(0); - - // Check the relations from this - Collection<RelationPart> rels = slide.getRelationParts(); - - // Should have 6 relations: - // 1 external hyperlink (skipped from list) - // 4 internal hyperlinks - // 1 slide layout - assertEquals(5, rels.size()); - int layouts = 0; - int hyperlinks = 0; - for(RelationPart p : rels) { - if(p.getRelationship().getRelationshipType().equals(XSLFRelation.HYPERLINK.getRelation())) { - hyperlinks++; - } else if(p.getDocumentPart() instanceof XSLFSlideLayout) { - layouts++; - } - } - assertEquals(1, layouts); - assertEquals(4, hyperlinks); - - // Hyperlinks should all be to #_ftn1 or #ftnref1 - for(RelationPart p : rels) { - if(p.getRelationship().getRelationshipType().equals(XSLFRelation.HYPERLINK.getRelation())) { - URI target = p.getRelationship().getTargetURI(); - - //noinspection StatementWithEmptyBody - if(target.getFragment().equals("_ftn1") || - target.getFragment().equals("_ftnref1")) { - // Good - } else { - fail("Invalid target " + target.getFragment() + " on " + target); - } - } - } - ss.close(); + // Should have one slide + assertEquals(1, ss.getSlides().size()); + XSLFSlide slide = ss.getSlides().get(0); + + // Check the relations from this + Collection<RelationPart> rels = slide.getRelationParts(); + + // Should have 6 relations: + // 1 external hyperlink (skipped from list) + // 4 internal hyperlinks + // 1 slide layout + assertEquals(5, rels.size()); + int layouts = 0; + int hyperlinks = 0; + for (RelationPart p : rels) { + if (p.getRelationship().getRelationshipType().equals(XSLFRelation.HYPERLINK.getRelation())) { + hyperlinks++; + } else if (p.getDocumentPart() instanceof XSLFSlideLayout) { + layouts++; + } + } + assertEquals(1, layouts); + assertEquals(4, hyperlinks); + + // Hyperlinks should all be to #_ftn1 or #ftnref1 + for (RelationPart p : rels) { + if (p.getRelationship().getRelationshipType().equals(XSLFRelation.HYPERLINK.getRelation())) { + URI target = p.getRelationship().getTargetURI(); + String frag = target.getFragment(); + assertTrue(frag.equals("_ftn1") || frag.equals("_ftnref1"), "Invalid target " + frag + " on " + target); + } + } + ss.close(); } /** * A slideshow can have more than one rID pointing to a given - * slide, eg presentation.xml rID1 -> slide1.xml, but slide1.xml - * rID2 -> slide3.xml + * slide, eg presentation.xml rID1 -> slide1.xml, but slide1.xml + * rID2 -> slide3.xml */ @Test public void bug54916() throws IOException { @@ -493,12 +487,12 @@ public class TestXSLFBugs { int internalPictures = 0; int externalPictures = 0; - for (XSLFSlide slide : ppt.getSlides()){ - for (XSLFShape shape : slide.getShapes()){ + for (XSLFSlide slide : ppt.getSlides()) { + for (XSLFShape shape : slide.getShapes()) { assertNotNull(shape); if (shape instanceof XSLFPictureShape) { - XSLFPictureShape picture = (XSLFPictureShape)shape; + XSLFPictureShape picture = (XSLFPictureShape) shape; if (picture.isExternalLinkedPicture()) { externalPictures++; @@ -520,7 +514,7 @@ public class TestXSLFBugs { } @Test - @Ignore("Similar to TestFontRendering it doesn't make sense to compare images because of tiny rendering differences in windows/unix") + @Disabled("Similar to TestFontRendering it doesn't make sense to compare images because of tiny rendering differences in windows/unix") public void bug54542() throws Exception { XMLSlideShow ss = openSampleDocument("54542_cropped_bitmap.pptx"); @@ -533,7 +527,7 @@ public class TestXSLFBugs { AffineTransform at = new AffineTransform(); at.setToScale(zoom, zoom); - BufferedImage imgActual = new BufferedImage((int)Math.ceil(pgsize.width*zoom), (int)Math.ceil(pgsize.height*zoom), BufferedImage.TYPE_3BYTE_BGR); + BufferedImage imgActual = new BufferedImage((int) Math.ceil(pgsize.width * zoom), (int) Math.ceil(pgsize.height * zoom), BufferedImage.TYPE_3BYTE_BGR); Graphics2D graphics = imgActual.createGraphics(); graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); graphics.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY); @@ -549,7 +543,7 @@ public class TestXSLFBugs { } private String getSlideText(XMLSlideShow ppt, XSLFSlide slide) throws IOException { - try (SlideShowExtractor<XSLFShape,XSLFTextParagraph> extr = new SlideShowExtractor<>(ppt)) { + try (SlideShowExtractor<XSLFShape, XSLFTextParagraph> extr = new SlideShowExtractor<>(ppt)) { // do not auto-close the slideshow extr.setCloseFilesystem(false); extr.setSlidesByDefault(true); @@ -562,38 +556,38 @@ public class TestXSLFBugs { @Test public void bug57250() throws Exception { XMLSlideShow ss = new XMLSlideShow(); - for (String s : new String[]{"Slide1","Slide2"}) { + for (String s : new String[]{"Slide1", "Slide2"}) { ss.createSlide().createTextBox().setText(s); } - validateSlides(ss, false, "Slide1","Slide2"); + validateSlides(ss, false, "Slide1", "Slide2"); XSLFSlide slide = ss.createSlide(); slide.createTextBox().setText("New slide"); - validateSlides(ss, true, "Slide1","Slide2","New slide"); + validateSlides(ss, true, "Slide1", "Slide2", "New slide"); // Move backward ss.setSlideOrder(slide, 0); - validateSlides(ss, true, "New slide","Slide1","Slide2"); + validateSlides(ss, true, "New slide", "Slide1", "Slide2"); // Move forward ss.setSlideOrder(slide, 1); - validateSlides(ss, true, "Slide1","New slide","Slide2"); + validateSlides(ss, true, "Slide1", "New slide", "Slide2"); // Move to end ss.setSlideOrder(slide, 0); ss.setSlideOrder(slide, 2); - validateSlides(ss, true, "Slide1","Slide2","New slide"); + validateSlides(ss, true, "Slide1", "Slide2", "New slide"); ss.close(); } /** * When working with >9 images, make sure the sorting ensures - * that image10.foo isn't between image1.foo and image2.foo + * that image10.foo isn't between image1.foo and image2.foo */ @Test public void test57552() throws Exception { XMLSlideShow ss = new XMLSlideShow(); - for (String s : new String[]{"Slide1","Slide2"}) { + for (String s : new String[]{"Slide1", "Slide2"}) { ss.createSlide().createTextBox().setText(s); } @@ -612,7 +606,7 @@ public class TestXSLFBugs { // Some dummy pictures byte[][] pics = new byte[15][3]; - for (int i=0; i<pics.length; i++) { + for (int i = 0; i < pics.length; i++) { Arrays.fill(pics[i], (byte) i); } @@ -620,8 +614,8 @@ public class TestXSLFBugs { addPictures(ss, slide, pics, 0, 10); // Re-fetch the pictures and check - for (int i=0; i<10; i++) { - XSLFPictureShape shape = (XSLFPictureShape)slide.getShapes().get(i+1); + for (int i = 0; i < 10; i++) { + XSLFPictureShape shape = (XSLFPictureShape) slide.getShapes().get(i + 1); assertNotNull(shape.getPictureData()); assertArrayEquals(pics[i], shape.getPictureData().getData()); } @@ -630,8 +624,8 @@ public class TestXSLFBugs { addPictures(ss, slide, pics, 10, 15); // Check all pictures - for (int i=0; i<15; i++) { - XSLFPictureShape shape = (XSLFPictureShape)slide.getShapes().get(i+1); + for (int i = 0; i < 15; i++) { + XSLFPictureShape shape = (XSLFPictureShape) slide.getShapes().get(i + 1); assertNotNull(shape.getPictureData()); assertArrayEquals(pics[i], shape.getPictureData().getData()); } @@ -652,14 +646,14 @@ public class TestXSLFBugs { slide = ss2.getSlides().get(0); // Check the 15 individual ones added - for (int i=0; i<15; i++) { - shape = (XSLFPictureShape)slide.getShapes().get(i+1); + for (int i = 0; i < 15; i++) { + shape = (XSLFPictureShape) slide.getShapes().get(i + 1); assertNotNull(shape.getPictureData()); assertArrayEquals(pics[i], shape.getPictureData().getData()); } // Check the duplicate - shape = (XSLFPictureShape)slide.getShapes().get(16); + shape = (XSLFPictureShape) slide.getShapes().get(16); assertNotNull(shape.getPictureData()); assertArrayEquals(pics[3], shape.getPictureData().getData()); @@ -678,15 +672,15 @@ public class TestXSLFBugs { } private void addPictures(XMLSlideShow ss, XSLFSlide slide, byte[][] pics, int start, int end) { - for (int i = start; i< end; i++) { + for (int i = start; i < end; i++) { XSLFPictureData data = ss.addPicture(pics[i], PictureType.JPEG); assertEquals(i, data.getIndex()); - assertEquals(i+1, ss.getPictureData().size()); + assertEquals(i + 1, ss.getPictureData().size()); XSLFPictureShape shape = slide.createPicture(data); assertNotNull(shape.getPictureData()); assertArrayEquals(pics[i], shape.getPictureData().getData()); - assertEquals(i+2, slide.getShapes().size()); + assertEquals(i + 2, slide.getShapes().size()); } } @@ -715,7 +709,7 @@ public class TestXSLFBugs { int i = 1; for (XSLFSlideMaster sm : ss.getSlideMasters()) { - assertEquals("rId"+(i++), ss.getRelationId(sm)); + assertEquals("rId" + (i++), ss.getRelationId(sm)); } ss.close(); @@ -744,7 +738,7 @@ public class TestXSLFBugs { @Test public void blibFillAlternateContent() throws IOException { XMLSlideShow ppt = openSampleDocument("2411-Performance_Up.pptx"); - XSLFPictureShape ps = (XSLFPictureShape)ppt.getSlides().get(4).getShapes().get(0); + XSLFPictureShape ps = (XSLFPictureShape) ppt.getSlides().get(4).getShapes().get(0); assertNotNull(ps.getPictureData()); ppt.close(); } @@ -768,8 +762,8 @@ public class TestXSLFBugs { XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1); ppt1.close(); slide = ppt2.getSlides().get(0); - ps1 = (XSLFPictureShape)slide.getShapes().get(0); - ps2 = (XSLFPictureShape)slide.getShapes().get(1); + ps1 = (XSLFPictureShape) slide.getShapes().get(0); + ps2 = (XSLFPictureShape) slide.getShapes().get(1); assertEquals(url1, ps1.getHyperlink().getAddress()); assertEquals(url2, ps2.getHyperlink().getAddress()); @@ -778,15 +772,15 @@ public class TestXSLFBugs { @Test public void bug58217() throws IOException { - Color fillColor = new Color(1f,1f,0f,0.1f); - Color lineColor = new Color(25.3f/255f,1f,0f,0.4f); - Color textColor = new Color(1f,1f,0f,0.6f); + Color fillColor = new Color(1f, 1f, 0f, 0.1f); + Color lineColor = new Color(25.3f / 255f, 1f, 0f, 0.4f); + Color textColor = new Color(1f, 1f, 0f, 0.6f); XMLSlideShow ppt1 = new XMLSlideShow(); XSLFSlide sl = ppt1.createSlide(); XSLFAutoShape as = sl.createAutoShape(); as.setShapeType(ShapeType.STAR_10); - as.setAnchor(new Rectangle2D.Double(100,100,300,300)); + as.setAnchor(new Rectangle2D.Double(100, 100, 300, 300)); as.setFillColor(fillColor); as.setLineColor(lineColor); as.setText("Alpha"); @@ -798,7 +792,7 @@ public class TestXSLFBugs { XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt1); ppt1.close(); sl = ppt2.getSlides().get(0); - as = (XSLFAutoShape)sl.getShapes().get(0); + as = (XSLFAutoShape) sl.getShapes().get(0); checkColor(fillColor, as.getFillStyle().getPaint()); checkColor(lineColor, as.getStrokeStyle().getPaint()); checkColor(textColor, as.getTextParagraphs().get(0).getTextRuns().get(0).getFontColor()); @@ -807,7 +801,7 @@ public class TestXSLFBugs { private static void checkColor(Color expected, PaintStyle actualStyle) { assertTrue(actualStyle instanceof SolidPaint); - SolidPaint ps = (SolidPaint)actualStyle; + SolidPaint ps = (SolidPaint) actualStyle; Color actual = DrawPaint.applyColorTransform(ps.getSolidColor()); float[] expRGB = expected.getRGBComponents(null); float[] actRGB = actual.getRGBComponents(null); @@ -896,24 +890,24 @@ public class TestXSLFBugs { XMLSlideShow src = new XMLSlideShow(); XSLFSlide sl = src.createSlide(); XSLFGroupShape gs = sl.createGroup(); - gs.setAnchor(new Rectangle2D.Double(100,100,100,100)); - gs.setInteriorAnchor(new Rectangle2D.Double(0,0,100,100)); + gs.setAnchor(new Rectangle2D.Double(100, 100, 100, 100)); + gs.setInteriorAnchor(new Rectangle2D.Double(0, 0, 100, 100)); XSLFAutoShape as = gs.createAutoShape(); - as.setAnchor(new Rectangle2D.Double(0,0,100,100)); + as.setAnchor(new Rectangle2D.Double(0, 0, 100, 100)); as.setShapeType(ShapeType.STAR_24); as.setFillColor(Color.YELLOW); - CTShape csh = (CTShape)as.getXmlObject(); + CTShape csh = (CTShape) as.getXmlObject(); CTOuterShadowEffect shadow = csh.getSpPr().addNewEffectLst().addNewOuterShdw(); shadow.setDir(270000); shadow.setDist(100000); - shadow.addNewSrgbClr().setVal(new byte[] {0x00, (byte)0xFF, 0x00}); + shadow.addNewSrgbClr().setVal(new byte[]{0x00, (byte) 0xFF, 0x00}); XMLSlideShow dst = new XMLSlideShow(); XSLFSlide sl2 = dst.createSlide(); sl2.importContent(sl); - XSLFGroupShape gs2 = (XSLFGroupShape)sl2.getShapes().get(0); - XSLFAutoShape as2 = (XSLFAutoShape)gs2.getShapes().get(0); - CTShape csh2 = (CTShape)as2.getXmlObject(); + XSLFGroupShape gs2 = (XSLFGroupShape) sl2.getShapes().get(0); + XSLFAutoShape as2 = (XSLFAutoShape) gs2.getShapes().get(0); + CTShape csh2 = (CTShape) as2.getXmlObject(); assertTrue(csh2.getSpPr().isSetEffectLst()); dst.close(); @@ -923,7 +917,7 @@ public class TestXSLFBugs { @Test public void test60810() throws IOException { XMLSlideShow ppt = openSampleDocument("60810.pptx"); - for(XSLFSlide slide : ppt.getSlides()) { + for (XSLFSlide slide : ppt.getSlides()) { XSLFNotes notesSlide = ppt.getNotesSlide(slide); assertNotNull(notesSlide); } @@ -941,19 +935,15 @@ public class TestXSLFBugs { @Test public void test61515() throws IOException { - XMLSlideShow ppt = openSampleDocument("61515.pptx"); - ppt.removeSlide(0); - assertEquals(1, ppt.createSlide().getRelations().size()); - try { - XMLSlideShow saved = XSLFTestDataSamples.writeOutAndReadBack(ppt); - assertEquals(1, saved.getSlides().size()); - XSLFSlide slide = saved.getSlides().get(0); - assertEquals(1, slide.getRelations().size()); - saved.close(); - } catch (IOException e) { - fail("Could not read back saved presentation."); + try (XMLSlideShow ppt = openSampleDocument("61515.pptx")) { + ppt.removeSlide(0); + assertEquals(1, ppt.createSlide().getRelations().size()); + try (XMLSlideShow saved = XSLFTestDataSamples.writeOutAndReadBack(ppt)) { + assertEquals(1, saved.getSlides().size()); + XSLFSlide slide = saved.getSlides().get(0); + assertEquals(1, slide.getRelations().size()); + } } - ppt.close(); } @Test @@ -964,11 +954,11 @@ public class TestXSLFBugs { } } - @Ignore + @Disabled @Test public void testDivinoRevelado() throws IOException { try (XMLSlideShow ppt = openSampleDocument("Divino_Revelado.pptx"); - XMLSlideShow saved = XSLFTestDataSamples.writeOutAndReadBack(ppt)){ + XMLSlideShow saved = XSLFTestDataSamples.writeOutAndReadBack(ppt)) { assertEquals(ppt.getSlides().size(), saved.getSlides().size()); } } @@ -990,13 +980,13 @@ public class TestXSLFBugs { shapes.add(slide.createAutoShape()); shapes.add(g2.createAutoShape()); shapes.add(g1.createAutoShape()); - assertArrayEquals(new int[]{ 2,3,4,5,6,7,8 }, ids.apply(shapes)); + assertArrayEquals(new int[]{2, 3, 4, 5, 6, 7, 8}, ids.apply(shapes)); g1.removeShape(g2); shapes.remove(5); shapes.remove(3); shapes.remove(2); shapes.add(g1.createAutoShape()); - assertArrayEquals(new int[]{ 2,3,6,8,4 }, ids.apply(shapes)); + assertArrayEquals(new int[]{2, 3, 6, 8, 4}, ids.apply(shapes)); } } @@ -1022,7 +1012,7 @@ public class TestXSLFBugs { public void alternateContent() throws Exception { try (XMLSlideShow ppt = openSampleDocument("alterman_security.pptx")) { XSLFSlideMaster slide = ppt.getSlideMasters().get(0); - XSLFObjectShape os = (XSLFObjectShape)slide.getShapes().get(0); + XSLFObjectShape os = (XSLFObjectShape) slide.getShapes().get(0); // ctOleObject is nested in AlternateContent in this file // if there are casting errors, we would fail early and wouldn't reach this point anyway assertNotNull(os.getCTOleObject()); @@ -1033,7 +1023,7 @@ public class TestXSLFBugs { try (XMLSlideShow ppt = openSampleDocument("2411-Performance_Up.pptx")) { XSLFSlide slide = ppt.getSlides().get(4); - XSLFPictureShape ps = (XSLFPictureShape)slide.getShapes().get(0); + XSLFPictureShape ps = (XSLFPictureShape) slide.getShapes().get(0); assertEquals("image4.png", ps.getPictureData().getFileName()); assertEquals("Picture 5", ps.getShapeName()); } @@ -1044,11 +1034,11 @@ public class TestXSLFBugs { public void bug57796() throws IOException { assumeFalse(xslfOnly); - try (SlideShow<?,?> ppt = SlideShowFactory.create(slTests.getFile("WithLinks.ppt"))) { - Slide<?,?> slide = ppt.getSlides().get(0); - TextShape<?,?> shape = (TextShape<?,?>) slide.getShapes().get(1); + try (SlideShow<?, ?> ppt = SlideShowFactory.create(slTests.getFile("WithLinks.ppt"))) { + Slide<?, ?> slide = ppt.getSlides().get(0); + TextShape<?, ?> shape = (TextShape<?, ?>) slide.getShapes().get(1); TextRun r = shape.getTextParagraphs().get(1).getTextRuns().get(0); - Hyperlink<?,?> hlRun = r.getHyperlink(); + Hyperlink<?, ?> hlRun = r.getHyperlink(); assertNotNull(hlRun); assertEquals("http://jakarta.apache.org/poi/";, hlRun.getAddress()); assertEquals("http://jakarta.apache.org/poi/";, hlRun.getLabel()); @@ -1074,7 +1064,7 @@ public class TestXSLFBugs { if ("Jakarta HSSF".equals(sb.toString())) { // this is a test for a manually modified ppt, for real hyperlink label // one would need to access the screen tip record - Attribute[] obj = { HYPERLINK_HREF, HYPERLINK_LABEL }; + Attribute[] obj = {HYPERLINK_HREF, HYPERLINK_LABEL}; assertNotNull(attributes); Stream.of(obj).map(attributes::get).forEach(strings::add); }
Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/TestXSLFSlideShow.java Thu Dec 24 18:42:29 2020 @@ -33,25 +33,25 @@ import org.apache.poi.xslf.usermodel.XSL import org.apache.poi.xslf.usermodel.XSLFSlide; import org.apache.poi.xslf.usermodel.XSLFSlideShow; import org.apache.xmlbeans.XmlException; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.officeDocument.x2006.extendedProperties.CTProperties; import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry; import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestXSLFSlideShow { private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); private OPCPackage pack; - @Before + @BeforeEach public void setUp() throws Exception { pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx")); } - @After + @AfterEach public void tearDown() throws IOException { pack.close(); } @@ -73,18 +73,18 @@ public class TestXSLFSlideShow { XSLFSlideShow xml = new XSLFSlideShow(pack); // Check the core assertNotNull(xml.getPresentation()); - + // Check it has some slides assertNotEquals(0, xml.getSlideReferences().sizeOfSldIdArray()); assertNotEquals(0, xml.getSlideMasterReferences().sizeOfSldMasterIdArray()); - + xml.close(); } - + @Test public void testSlideBasics() throws IOException, OpenXML4JException, XmlException { XSLFSlideShow xml = new XSLFSlideShow(pack); - + // Should have 1 master assertEquals(1, xml.getSlideMasterReferences().sizeOfSldMasterIdArray()); @@ -98,62 +98,62 @@ public class TestXSLFSlideShow { assertEquals(257, slides[1].getId()); assertEquals("rId2", slides[0].getId2()); assertEquals("rId3", slides[1].getId2()); - + // Now get those objects assertNotNull(xml.getSlide(slides[0])); assertNotNull(xml.getSlide(slides[1])); - + // And check they have notes as expected assertNotNull(xml.getNotes(slides[0])); assertNotNull(xml.getNotes(slides[1])); - + // And again for the master CTSlideMasterIdListEntry[] masters = xml.getSlideMasterReferences().getSldMasterIdArray(); - + // see SlideAtom.USES_MASTER_SLIDE_ID assertEquals(0x80000000L, masters[0].getId()); assertEquals("rId1", masters[0].getId2()); assertNotNull(xml.getSlideMaster(masters[0])); - + xml.close(); } - + @Test public void testMetadataBasics() throws IOException, OpenXML4JException, XmlException { XSLFSlideShow xml = new XSLFSlideShow(pack); - + assertNotNull(xml.getProperties().getCoreProperties()); assertNotNull(xml.getProperties().getExtendedProperties()); - + CTProperties props = xml.getProperties().getExtendedProperties().getUnderlyingProperties(); assertEquals("Microsoft Office PowerPoint", props.getApplication()); assertEquals(0, props.getCharacters()); assertEquals(0, props.getLines()); - + CoreProperties cprops = xml.getProperties().getCoreProperties(); assertNull(cprops.getTitle()); assertFalse(cprops.getUnderlyingProperties().getSubjectProperty().isPresent()); - + xml.close(); } - + @Test public void testMasterBackground() throws IOException { XMLSlideShow ppt = new XMLSlideShow(); XSLFBackground b = ppt.getSlideMasters().get(0).getBackground(); b.setFillColor(Color.RED); - + XSLFSlide sl = ppt.createSlide(); XSLFAutoShape as = sl.createAutoShape(); as.setAnchor(new Rectangle2D.Double(100,100,100,100)); as.setShapeType(ShapeType.CLOUD); - + XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt); ppt.close(); - + XSLFBackground b2 = ppt2.getSlideMasters().get(0).getBackground(); assertEquals(Color.RED, b2.getFillColor()); - + ppt2.close(); } } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/extractor/TestXSLFPowerPointExtractor.java Thu Dec 24 18:42:29 2020 @@ -19,10 +19,10 @@ package org.apache.poi.xslf.extractor; import static org.apache.poi.POITestCase.assertContains; import static org.apache.poi.POITestCase.assertNotContained; import static org.apache.poi.POITestCase.assertStartsWith; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; @@ -34,7 +34,7 @@ import org.apache.poi.sl.extractor.Slide import org.apache.poi.xslf.usermodel.XMLSlideShow; import org.apache.poi.xslf.usermodel.XSLFShape; import org.apache.poi.xslf.usermodel.XSLFTextParagraph; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for XSLFPowerPointExtractor @@ -245,11 +245,11 @@ public class TestXSLFPowerPointExtractor String text = extractor.getText(); if (extension.equals("thmx")) { // Theme file doesn't have any textual content - assertEquals(filename, 0, text.length()); + assertEquals(0, text.length(), filename); continue; } - assertTrue(filename, text.length() > 0); + assertTrue(text.length() > 0, filename); assertContains(filename, text, "Attachment Test"); assertContains(filename, text, "This is a test file data with the same content"); assertContains(filename, text, "content parsing"); @@ -267,7 +267,7 @@ public class TestXSLFPowerPointExtractor try (final SlideShowExtractor extr = (SlideShowExtractor) ExtractorFactory.createExtractor(headerFile)) { String text = extr.getText(); assertNotNull(text); - assertFalse("Had: " + text, text.contains("testdoc")); + assertFalse(text.contains("testdoc"), "Had: " + text); extr.setSlidesByDefault(false); extr.setNotesByDefault(true); Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestPPTX2PNG.java Thu Dec 24 18:42:29 2020 @@ -20,32 +20,27 @@ package org.apache.poi.xslf.usermodel; import static java.util.Arrays.asList; -import static org.junit.Assert.assertTrue; -import static org.junit.Assume.assumeFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import java.io.File; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; import org.apache.poi.POIDataSamples; import org.apache.poi.xslf.util.PPTX2PNG; -import org.junit.BeforeClass; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.junit.runners.Parameterized.Parameter; -import org.junit.runners.Parameterized.Parameters; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; /** * Test class for testing PPTX2PNG utility which renders .ppt and .pptx slideshows */ @SuppressWarnings("ConstantConditions") -@RunWith(Parameterized.class) public class TestPPTX2PNG { private static boolean xslfOnly; private static final POIDataSamples samples = POIDataSamples.getSlideShowInstance(); @@ -63,7 +58,7 @@ public class TestPPTX2PNG { private static final String pdfFiles = "alterman_security.ppt"; - @BeforeClass + @BeforeAll public static void checkHslf() { try { Class.forName("org.apache.poi.hslf.usermodel.HSLFSlideShow"); @@ -72,33 +67,29 @@ public class TestPPTX2PNG { } } - // use filename instead of File object to omit full pathname in test name - @Parameter - public String pptFile; - - + public static Stream<Arguments> data() { + Function<String, Stream<Arguments>> fun = (basedir == null) + ? (f) -> Stream.of(Arguments.of(f)) + : (f) -> Stream.of(basedir.listFiles(p -> p.getName().matches(f))).map(File::getName).map(Arguments::of); - @Parameters(name="{0}") - public static Collection<String> data() { - Function<String, Stream<String>> fun = (basedir == null) ? Stream::of : - (f) -> Stream.of(basedir.listFiles(p -> p.getName().matches(f))).map(File::getName); - - return Stream.of(files.split(", ?")).flatMap(fun).collect(Collectors.toList()); + return Stream.of(files.split(", ?")).flatMap(fun); } - @Test - public void render() throws Exception { - assumeFalse("ignore HSLF (.ppt) / HEMF (.emf) / HWMF (.wmf) files in no-scratchpad run", xslfOnly && pptFile.matches(".*\\.(ppt|emf|wmf)$")); - PPTX2PNG.main(getArgs("null")); + // use filename instead of File object to omit full pathname in test name + @ParameterizedTest + @MethodSource("data") + public void render(String pptFile) throws Exception { + assumeFalse(xslfOnly && pptFile.matches(".*\\.(ppt|emf|wmf)$"), "ignore HSLF (.ppt) / HEMF (.emf) / HWMF (.wmf) files in no-scratchpad run"); + PPTX2PNG.main(getArgs(pptFile, "null")); if (svgFiles.contains(pptFile)) { - PPTX2PNG.main(getArgs("svg")); + PPTX2PNG.main(getArgs(pptFile, "svg")); } if (pdfFiles.contains(pptFile)) { - PPTX2PNG.main(getArgs("pdf")); + PPTX2PNG.main(getArgs(pptFile, "pdf")); } } - private String[] getArgs(String format) throws IOException { + private String[] getArgs(String pptFile, String format) throws IOException { File tmpDir = new File("build/tmp/"); // fix maven build errors Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java Thu Dec 24 18:42:29 2020 @@ -16,12 +16,11 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -31,177 +30,172 @@ import org.apache.poi.openxml4j.opc.OPCP import org.apache.poi.openxml4j.opc.PackagePart; import org.apache.poi.sl.usermodel.BaseTestSlideShow; import org.apache.poi.sl.usermodel.SlideShow; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdListEntry; import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry; import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry; -public class TestXMLSlideShow extends BaseTestSlideShow<XSLFShape,XSLFTextParagraph> { - private OPCPackage pack; +public class TestXMLSlideShow extends BaseTestSlideShow<XSLFShape, XSLFTextParagraph> { + private OPCPackage pack; - @Override - public XMLSlideShow createSlideShow() { - return new XMLSlideShow(); - } - - @Before - public void setUp() throws Exception { - pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx")); - } - - @After - public void tearDown() { - pack.revert(); - } - - @Test - public void testContainsMainContentType() throws Exception { - boolean found = false; - for(PackagePart part : pack.getParts()) { - if(part.getContentType().equals(XSLFRelation.MAIN.getContentType())) { - found = true; - } - } - assertTrue(found); - } - - @Test - public void testOpen() throws Exception { - // With the finalised uri, should be fine - XMLSlideShow xml = new XMLSlideShow(pack); - // Check the core - assertNotNull(xml.getCTPresentation()); - - // Check it has some slides - assertFalse(xml.getSlides().isEmpty()); - assertFalse(xml.getSlideMasters().isEmpty()); - - xml.close(); - } - - @SuppressWarnings("deprecation") - @Test - public void testSlideBasics() throws IOException { - XMLSlideShow xml = new XMLSlideShow(pack); - - // Should have 1 master - assertEquals(1, xml.getSlideMasters().size()); - - // Should have two sheets - assertEquals(2, xml.getSlides().size()); - - // Check they're as expected - CTSlideIdListEntry[] slides = xml.getCTPresentation().getSldIdLst().getSldIdArray(); - - assertEquals(256, slides[0].getId()); - assertEquals(257, slides[1].getId()); - assertEquals("rId2", slides[0].getId2()); - assertEquals("rId3", slides[1].getId2()); - - // Now get those objects - assertNotNull(xml.getSlides().get(0)); - assertNotNull(xml.getSlides().get(1)); - - // And check they have notes as expected - assertNotNull(xml.getSlides().get(0).getNotes()); - assertNotNull(xml.getSlides().get(1).getNotes()); - - // Next up look for the slide master - CTSlideMasterIdListEntry[] masters = xml.getCTPresentation().getSldMasterIdLst().getSldMasterIdArray(); - - // see SlideAtom.USES_MASTER_SLIDE_ID - assertEquals(0x80000000L, masters[0].getId()); - assertEquals("rId1", masters[0].getId2()); - assertNotNull(xml.getSlideMasters().get(0)); - - // Finally look for the notes master - CTNotesMasterIdListEntry notesMaster = - xml.getCTPresentation().getNotesMasterIdLst().getNotesMasterId(); - assertNotNull(notesMaster); - - assertNotNull(xml.getNotesMaster()); - - xml.close(); - } - - @Test - public void testMetadataBasics() throws IOException { - XMLSlideShow xml = new XMLSlideShow(pack); - - assertNotNull(xml.getProperties().getCoreProperties()); - assertNotNull(xml.getProperties().getExtendedProperties()); - - assertEquals("Microsoft Office PowerPoint", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication()); - assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters()); - assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines()); - - assertNull(xml.getProperties().getCoreProperties().getTitle()); - assertFalse(xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().isPresent()); - - xml.close(); - } - - @Test - public void testComments() throws Exception { - // Default sample file has none - XMLSlideShow xml = new XMLSlideShow(pack); - - assertNull(xml.getCommentAuthors()); - - for (XSLFSlide slide : xml.getSlides()) { - assertTrue(slide.getComments().isEmpty()); - } - - // Try another with comments - XMLSlideShow xmlComments = new XMLSlideShow(slTests.openResourceAsStream("45545_Comment.pptx")); - - // Has one author - assertNotNull(xmlComments.getCommentAuthors()); - assertEquals(1, xmlComments.getCommentAuthors().getCTCommentAuthorsList().sizeOfCmAuthorArray()); - assertEquals("XPVMWARE01", xmlComments.getCommentAuthors().getAuthorById(0).getName()); - - // First two slides have comments - int i = -1; - for (XSLFSlide slide : xmlComments.getSlides()) { - i++; - - if(i == 0) { - assertNotNull(slide.getCommentsPart()); - assertEquals(1, slide.getCommentsPart().getNumberOfComments()); - assertEquals("testdoc", slide.getCommentsPart().getCommentAt(0).getText()); - assertEquals(0, slide.getCommentsPart().getCommentAt(0).getAuthorId()); - } else if (i == 1) { - assertNotNull(slide.getComments()); - assertEquals(1, slide.getCommentsPart().getNumberOfComments()); - assertEquals("test phrase", slide.getCommentsPart().getCommentAt(0).getText()); - assertEquals(0, slide.getCommentsPart().getCommentAt(0).getAuthorId()); - } else { - assertNull(slide.getCommentsPart()); + @Override + public XMLSlideShow createSlideShow() { + return new XMLSlideShow(); + } + + @BeforeEach + public void setUp() throws Exception { + pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx")); + } + + @AfterEach + public void tearDown() { + pack.revert(); + } + + @Test + public void testContainsMainContentType() throws Exception { + boolean found = false; + for (PackagePart part : pack.getParts()) { + if (part.getContentType().equals(XSLFRelation.MAIN.getContentType())) { + found = true; + } + } + assertTrue(found); + } + + @Test + public void testOpen() throws Exception { + // With the finalised uri, should be fine + XMLSlideShow xml = new XMLSlideShow(pack); + // Check the core + assertNotNull(xml.getCTPresentation()); + + // Check it has some slides + assertFalse(xml.getSlides().isEmpty()); + assertFalse(xml.getSlideMasters().isEmpty()); + + xml.close(); + } + + @SuppressWarnings("deprecation") + @Test + public void testSlideBasics() throws IOException { + XMLSlideShow xml = new XMLSlideShow(pack); + + // Should have 1 master + assertEquals(1, xml.getSlideMasters().size()); + + // Should have two sheets + assertEquals(2, xml.getSlides().size()); + + // Check they're as expected + CTSlideIdListEntry[] slides = xml.getCTPresentation().getSldIdLst().getSldIdArray(); + + assertEquals(256, slides[0].getId()); + assertEquals(257, slides[1].getId()); + assertEquals("rId2", slides[0].getId2()); + assertEquals("rId3", slides[1].getId2()); + + // Now get those objects + assertNotNull(xml.getSlides().get(0)); + assertNotNull(xml.getSlides().get(1)); + + // And check they have notes as expected + assertNotNull(xml.getSlides().get(0).getNotes()); + assertNotNull(xml.getSlides().get(1).getNotes()); + + // Next up look for the slide master + CTSlideMasterIdListEntry[] masters = xml.getCTPresentation().getSldMasterIdLst().getSldMasterIdArray(); + + // see SlideAtom.USES_MASTER_SLIDE_ID + assertEquals(0x80000000L, masters[0].getId()); + assertEquals("rId1", masters[0].getId2()); + assertNotNull(xml.getSlideMasters().get(0)); + + // Finally look for the notes master + CTNotesMasterIdListEntry notesMaster = + xml.getCTPresentation().getNotesMasterIdLst().getNotesMasterId(); + assertNotNull(notesMaster); + + assertNotNull(xml.getNotesMaster()); + + xml.close(); + } + + @Test + public void testMetadataBasics() throws IOException { + XMLSlideShow xml = new XMLSlideShow(pack); + + assertNotNull(xml.getProperties().getCoreProperties()); + assertNotNull(xml.getProperties().getExtendedProperties()); + + assertEquals("Microsoft Office PowerPoint", xml.getProperties().getExtendedProperties().getUnderlyingProperties().getApplication()); + assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getCharacters()); + assertEquals(0, xml.getProperties().getExtendedProperties().getUnderlyingProperties().getLines()); + + assertNull(xml.getProperties().getCoreProperties().getTitle()); + assertFalse(xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().isPresent()); + + xml.close(); + } + + @Test + public void testComments() throws Exception { + // Default sample file has none + XMLSlideShow xml = new XMLSlideShow(pack); + + assertNull(xml.getCommentAuthors()); + + for (XSLFSlide slide : xml.getSlides()) { assertTrue(slide.getComments().isEmpty()); - } - } + } + + // Try another with comments + XMLSlideShow xmlComments = new XMLSlideShow(slTests.openResourceAsStream("45545_Comment.pptx")); - xmlComments.close(); - xml.close(); - } - - @Override - public XMLSlideShow reopen(SlideShow<XSLFShape,XSLFTextParagraph> show) { - try { - BufAccessBAOS bos = new BufAccessBAOS(); - show.write(bos); - return new XMLSlideShow(new ByteArrayInputStream(bos.getBuf())); - } catch (IOException e) { - fail(e.getMessage()); - return null; - } - } - - private static class BufAccessBAOS extends ByteArrayOutputStream { - byte[] getBuf() { - return buf; - } - } + // Has one author + assertNotNull(xmlComments.getCommentAuthors()); + assertEquals(1, xmlComments.getCommentAuthors().getCTCommentAuthorsList().sizeOfCmAuthorArray()); + assertEquals("XPVMWARE01", xmlComments.getCommentAuthors().getAuthorById(0).getName()); + + // First two slides have comments + int i = -1; + for (XSLFSlide slide : xmlComments.getSlides()) { + i++; + + if (i == 0) { + assertNotNull(slide.getCommentsPart()); + assertEquals(1, slide.getCommentsPart().getNumberOfComments()); + assertEquals("testdoc", slide.getCommentsPart().getCommentAt(0).getText()); + assertEquals(0, slide.getCommentsPart().getCommentAt(0).getAuthorId()); + } else if (i == 1) { + assertNotNull(slide.getComments()); + assertEquals(1, slide.getCommentsPart().getNumberOfComments()); + assertEquals("test phrase", slide.getCommentsPart().getCommentAt(0).getText()); + assertEquals(0, slide.getCommentsPart().getCommentAt(0).getAuthorId()); + } else { + assertNull(slide.getCommentsPart()); + assertTrue(slide.getComments().isEmpty()); + } + } + + xmlComments.close(); + xml.close(); + } + + @Override + public XMLSlideShow reopen(SlideShow<XSLFShape, XSLFTextParagraph> show) throws IOException { + BufAccessBAOS bos = new BufAccessBAOS(); + show.write(bos); + return new XMLSlideShow(new ByteArrayInputStream(bos.getBuf())); + } + + private static class BufAccessBAOS extends ByteArrayOutputStream { + byte[] getBuf() { + return buf; + } + } } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java Thu Dec 24 18:42:29 2020 @@ -16,12 +16,12 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; @@ -31,7 +31,7 @@ import org.apache.poi.sl.usermodel.TextS import org.apache.poi.sl.usermodel.TextShape.TextDirection; import org.apache.poi.sl.usermodel.VerticalAlignment; import org.apache.poi.util.Units; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties; import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType; import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFBackground.java Thu Dec 24 18:42:29 2020 @@ -17,14 +17,14 @@ package org.apache.poi.xslf.usermodel; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.presentationml.x2006.main.CTBackgroundProperties; import org.openxmlformats.schemas.presentationml.x2006.main.impl.CTBackgroundImpl; import java.awt.*; import java.io.IOException; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; public class TestXSLFBackground { @Test Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java Thu Dec 24 18:42:29 2020 @@ -18,12 +18,12 @@ */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; @@ -56,7 +56,7 @@ import org.apache.poi.xddf.usermodel.cha import org.apache.poi.xddf.usermodel.chart.XDDFScatterChartData; import org.apache.poi.xddf.usermodel.chart.XDDFValueAxis; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * a modified version from POI-examples Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFColor.java Thu Dec 24 18:42:29 2020 @@ -16,14 +16,14 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Color; import java.io.IOException; import org.apache.poi.sl.usermodel.PresetColor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTColor; import org.openxmlformats.schemas.drawingml.x2006.main.CTHslColor; import org.openxmlformats.schemas.drawingml.x2006.main.CTSRgbColor; @@ -157,7 +157,7 @@ public class TestXSLFColor { xml = CTColor.Factory.newInstance(); STPresetColorVal.Enum preVal = STPresetColorVal.Enum.forString(pc.ooxmlId); STSystemColorVal.Enum sysVal = STSystemColorVal.Enum.forString(pc.ooxmlId); - assertTrue(pc.ooxmlId, preVal != null || sysVal != null); + assertTrue(preVal != null || sysVal != null, pc.ooxmlId); if (preVal != null) { xml.addNewPrstClr().setVal(preVal); } else { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java Thu Dec 24 18:42:29 2020 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr; import java.awt.Color; @@ -27,7 +27,7 @@ import java.io.IOException; import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape; import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize; import org.apache.poi.sl.usermodel.ShapeType; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTConnection; import org.openxmlformats.schemas.drawingml.x2006.main.CTNonVisualConnectorProperties; import org.openxmlformats.schemas.drawingml.x2006.main.STLineEndLength; @@ -152,7 +152,7 @@ public class TestXSLFConnectorShape { end.setId(rect2.getShapeId()); // side of the rectangle to attach the connector: left=1, bottom=2,right=3, top=4 end.setIdx(3); - + pptx.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFExamples.java Thu Dec 24 18:42:29 2020 @@ -34,7 +34,7 @@ import org.apache.poi.openxml4j.opc.Pack import org.apache.poi.openxml4j.opc.TargetMode; import org.apache.poi.sl.usermodel.PictureData; import org.apache.xmlbeans.XmlCursor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTHyperlink; import org.openxmlformats.schemas.presentationml.x2006.main.CTApplicationNonVisualDrawingProps; import org.openxmlformats.schemas.presentationml.x2006.main.CTExtension; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java Thu Dec 24 18:42:29 2020 @@ -18,7 +18,7 @@ package org.apache.poi.xslf.usermodel; import org.apache.poi.sl.draw.SLGraphics; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.presentationml.x2006.main.CTGroupShape; import java.awt.Color; @@ -34,7 +34,7 @@ import java.awt.image.BufferedImage; import java.io.IOException; import static org.apache.poi.xslf.usermodel.TestXSLFSimpleShape.getSpPr; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; public class TestXSLFFreeformShape { @@ -58,7 +58,7 @@ public class TestXSLFFreeformShape { shape2.setPath(path2); assertEquals(getSpPr(shape1).getCustGeom().toString(), getSpPr(shape2).getCustGeom().toString()); - + ppt.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java Thu Dec 24 18:42:29 2020 @@ -16,14 +16,14 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Dimension; import java.awt.geom.Rectangle2D; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Yegor Kozlov @@ -36,7 +36,7 @@ public class TestXSLFGroupShape { XSLFSlide slide = ppt.createSlide(); ppt.setPageSize(new Dimension(792, 612)); - + XSLFGroupShape group = slide.createGroup(); assertEquals(1, slide.getShapes().size()); @@ -85,7 +85,7 @@ public class TestXSLFGroupShape { group.removeShape(shape1); group.removeShape(shape4); assertTrue(group.getShapes().isEmpty()); - + ppt.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java Thu Dec 24 18:42:29 2020 @@ -16,8 +16,8 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import java.awt.geom.Rectangle2D; import java.io.IOException; @@ -28,7 +28,7 @@ import org.apache.poi.openxml4j.exceptio import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.openxml4j.opc.TargetMode; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestXSLFHyperlink { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFNotes.java Thu Dec 24 18:42:29 2020 @@ -16,15 +16,15 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import java.io.IOException; import org.apache.poi.sl.usermodel.Placeholder; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class TestXSLFNotes { @@ -51,7 +51,7 @@ public class TestXSLFNotes { } assertNotNull(note); assertEquals("New Note", note); - + ppt.close(); } @@ -74,7 +74,7 @@ public class TestXSLFNotes { } assertNotNull(note); assertEquals("New Note", note); - + ppt.close(); } @@ -100,7 +100,7 @@ public class TestXSLFNotes { assertNotNull(note); assertEquals("New Note", note); } - + ppt.close(); } } 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=1884783&r1=1884782&r2=1884783&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 Thu Dec 24 18:42:29 2020 @@ -16,12 +16,12 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.geom.Rectangle2D; import java.io.ByteArrayInputStream; @@ -42,7 +42,7 @@ import org.apache.poi.util.IOUtils; import org.apache.poi.util.TempFile; import org.apache.poi.xslf.XSLFTestDataSamples; import org.apache.poi.xslf.util.PPTX2PNG; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture; public class TestXSLFPictureShape { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java Thu Dec 24 18:42:29 2020 @@ -16,15 +16,15 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.IOException; import java.util.List; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType; public class TestXSLFShape { @@ -79,7 +79,7 @@ public class TestXSLFShape { assertEquals("Subtitle", paragraphs2.get(0).getTextRuns().get(0).getRawText()); assertTrue(paragraphs2.get(0).getTextRuns().get(0).getRPr(false).getB()); assertEquals("And second line", paragraphs2.get(1).getTextRuns().get(0).getRawText()); - + ppt.close(); } @@ -109,7 +109,7 @@ public class TestXSLFShape { textBox.addNewTextParagraph().addNewTextRun().setText("POI"); assertEquals("Apache\nPOI", textBox.getText()); assertEquals(3, textBox.getTextParagraphs().size()); - + ppt.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java Thu Dec 24 18:42:29 2020 @@ -18,11 +18,11 @@ */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.IOException; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * test common operations on containers of shapes (sheets and groups of shapes) Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java Thu Dec 24 18:42:29 2020 @@ -16,13 +16,13 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.*; +import static org.junit.jupiter.api.Assertions.*; import java.io.IOException; import java.util.List; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * test common properties for sheets (slides, masters, layouts, etc.) @@ -30,7 +30,7 @@ import org.junit.Test; * @author Yegor Kozlov */ public class TestXSLFSheet { - + @Test public void testCreateShapes() throws IOException { XMLSlideShow ppt = new XMLSlideShow(); @@ -68,7 +68,7 @@ public class TestXSLFSheet { assertTrue(shapes.get(1) instanceof XSLFTextBox); assertTrue(shapes.get(2) instanceof XSLFConnectorShape); assertTrue(shapes.get(3) instanceof XSLFGroupShape); - + ppt.close(); ppt2.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java Thu Dec 24 18:42:29 2020 @@ -16,11 +16,11 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Color; import java.io.File; @@ -35,7 +35,7 @@ import org.apache.poi.util.Units; import org.apache.poi.xslf.XSLFTestDataSamples; import org.apache.poi.xslf.util.PPTX2PNG; import org.apache.xmlbeans.XmlObject; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectStyleItem; import org.openxmlformats.schemas.drawingml.x2006.main.CTEffectStyleList; import org.openxmlformats.schemas.drawingml.x2006.main.CTOuterShadowEffect; Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java Thu Dec 24 18:42:29 2020 @@ -17,19 +17,19 @@ package org.apache.poi.xslf.usermodel; import static org.apache.poi.sl.usermodel.BaseTestSlideShow.getColor; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Color; import java.io.IOException; import java.util.List; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Yegor Kozlov Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java Thu Dec 24 18:42:29 2020 @@ -16,9 +16,9 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; import java.awt.Dimension; import java.io.IOException; @@ -26,7 +26,7 @@ import java.util.List; import org.apache.poi.ooxml.POIXMLDocumentPart; import org.apache.poi.xslf.XSLFTestDataSamples; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Yegor Kozlov @@ -56,7 +56,7 @@ public class TestXSLFSlideShow { XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt); assertEquals(2, ppt2.getSlides().size()); rels = ppt2.getSlides().get(0).getRelations(); - + ppt2.close(); ppt.close(); } @@ -81,7 +81,7 @@ public class TestXSLFSlideShow { XMLSlideShow ppt2 = XSLFTestDataSamples.writeOutAndReadBack(ppt); assertEquals(1, ppt2.getSlides().size()); - + ppt2.close(); ppt.close(); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShowFactory.java Thu Dec 24 18:42:29 2020 @@ -17,9 +17,9 @@ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.FileOutputStream; @@ -36,7 +36,7 @@ import org.apache.poi.poifs.filesystem.P import org.apache.poi.sl.usermodel.BaseTestSlideShowFactory; import org.apache.poi.util.IOUtils; import org.apache.poi.util.TempFile; -import org.junit.Test; +import org.junit.jupiter.api.Test; public final class TestXSLFSlideShowFactory extends BaseTestSlideShowFactory { private static final POIDataSamples _slTests = POIDataSamples.getSlideShowInstance(); @@ -50,11 +50,8 @@ public final class TestXSLFSlideShowFact public void testFactoryFromFile() { // Remove thrown.* when bug 58779 is resolved // In the mean time, this function will modify SampleShow.pptx on disk. - AssertionError ex = assertThrows( - "Bug 58779: " + removeExpectedExceptionMsg, - AssertionError.class, - () -> testFactoryFromFile(filename) - ); + AssertionError ex = assertThrows(AssertionError.class, () -> testFactoryFromFile(filename), + "Bug 58779: " + removeExpectedExceptionMsg); assertTrue(ex.getMessage().contains("SampleShow.pptx sample file was modified as a result of closing the slideshow")); } @@ -66,10 +63,8 @@ public final class TestXSLFSlideShowFact @Test public void testFactoryFromNative() { // Remove thrown.* when unit test for XSLF SlideShowFactory.create(OPCPackage) is implemented - UnsupportedOperationException ex = assertThrows( - removeExpectedExceptionMsg, - UnsupportedOperationException.class, - () -> testFactoryFromNative(filename) + UnsupportedOperationException ex = assertThrows(UnsupportedOperationException.class, + () -> testFactoryFromNative(filename), removeExpectedExceptionMsg ); assertEquals("Test not implemented", ex.getMessage()); } Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java?rev=1884783&r1=1884782&r2=1884783&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java Thu Dec 24 18:42:29 2020 @@ -16,12 +16,12 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.awt.Color; import java.awt.Dimension; @@ -42,7 +42,7 @@ import org.apache.poi.sl.usermodel.Verti import org.apache.poi.util.TempFile; import org.apache.poi.xslf.XSLFTestDataSamples; import org.apache.poi.xslf.util.PPTX2PNG; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell; import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame; --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
