Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXMLSlideShow.java Mon Apr 27 20:13:43 2015 @@ -16,23 +16,25 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; import org.apache.poi.POIDataSamples; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.PackagePart; -import org.openxmlformats.schemas.presentationml.x2006.main.CTNotesMasterIdListEntry; -import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideIdListEntry; -import org.openxmlformats.schemas.presentationml.x2006.main.CTSlideMasterIdListEntry; +import org.junit.Before; +import org.junit.Test; +import org.openxmlformats.schemas.presentationml.x2006.main.*; -public class TestXMLSlideShow extends TestCase { +public class TestXMLSlideShow { private static final POIDataSamples slTests = POIDataSamples.getSlideShowInstance(); private OPCPackage pack; - protected void setUp() throws Exception { + @Before + public void setUp() throws Exception { pack = OPCPackage.open(slTests.openResourceAsStream("sample.pptx")); } + @Test public void testContainsMainContentType() throws Exception { boolean found = false; for(PackagePart part : pack.getParts()) { @@ -43,6 +45,7 @@ public class TestXMLSlideShow extends Te assertTrue(found); } + @Test public void testOpen() throws Exception { XMLSlideShow xml; @@ -52,22 +55,20 @@ public class TestXMLSlideShow extends Te assertNotNull(xml.getCTPresentation()); // Check it has some slides - assertNotNull(xml.getSlides().length); - assertTrue(xml.getSlides().length > 0); - - assertNotNull(xml.getSlideMasters().length); - assertTrue(xml.getSlideMasters().length > 0); + assertFalse(xml.getSlides().isEmpty()); + assertFalse(xml.getSlideMasters().isEmpty()); } + @Test @SuppressWarnings("deprecation") public void testSlideBasics() throws Exception { XMLSlideShow xml = new XMLSlideShow(pack); // Should have 1 master - assertEquals(1, xml.getSlideMasters().length); + assertEquals(1, xml.getSlideMasters().size()); // Should have two sheets - assertEquals(2, xml.getSlides().length); + assertEquals(2, xml.getSlides().size()); // Check they're as expected CTSlideIdListEntry[] slides = xml.getCTPresentation().getSldIdLst().getSldIdArray(); @@ -78,19 +79,19 @@ public class TestXMLSlideShow extends Te assertEquals("rId3", slides[1].getId2()); // Now get those objects - assertNotNull(xml.getSlides()[0]); - assertNotNull(xml.getSlides()[1]); + assertNotNull(xml.getSlides().get(0)); + assertNotNull(xml.getSlides().get(1)); // And check they have notes as expected - assertNotNull(xml.getSlides()[0].getNotes()); - assertNotNull(xml.getSlides()[1].getNotes()); + 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(); assertEquals(2147483648l, masters[0].getId()); assertEquals("rId1", masters[0].getId2()); - assertNotNull(xml.getSlideMasters()[0]); + assertNotNull(xml.getSlideMasters().get(0)); // Finally look for the notes master CTNotesMasterIdListEntry notesMaster = @@ -100,6 +101,7 @@ public class TestXMLSlideShow extends Te assertNotNull(xml.getNotesMaster()); } + @Test public void testMetadataBasics() throws Exception { XMLSlideShow xml = new XMLSlideShow(pack); @@ -114,6 +116,7 @@ public class TestXMLSlideShow extends Te assertEquals(null, xml.getProperties().getCoreProperties().getUnderlyingProperties().getSubjectProperty().getValue()); } + @Test public void testComments() throws Exception { // Default sample file has none XMLSlideShow xml = new XMLSlideShow(pack); @@ -134,8 +137,9 @@ public class TestXMLSlideShow extends Te assertEquals("XPVMWARE01", xmlComments.getCommentAuthors().getAuthorById(0).getName()); // First two slides have comments - for (int i=0; i<xmlComments.getSlides().length; i++) { - XSLFSlide slide = xmlComments.getSlides()[i]; + int i = -1; + for (XSLFSlide slide : xmlComments.getSlides()) { + i++; if(i == 0) { assertNotNull(slide.getComments());
Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFAutoShape.java Mon Apr 27 20:13:43 2015 @@ -16,20 +16,22 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; import org.apache.poi.sl.usermodel.*; import org.apache.poi.sl.usermodel.TextParagraph.TextAlign; import org.apache.poi.sl.usermodel.TextShape.TextAutofit; import org.apache.poi.sl.usermodel.TextShape.TextDirection; import org.apache.poi.util.Units; +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.STTextStrikeType; import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType; /** * @author Yegor Kozlov */ -public class TestXSLFAutoShape extends TestCase { +public class TestXSLFAutoShape { + @Test public void testTextBodyProperies() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -38,38 +40,38 @@ public class TestXSLFAutoShape extends T shape.addNewTextParagraph().addNewTextRun().setText("POI"); // default margins from slide master - assertEquals(3.6, shape.getBottomInset()); - assertEquals(3.6, shape.getTopInset()); - assertEquals(7.2, shape.getLeftInset()); - assertEquals(7.2, shape.getRightInset()); + assertEquals(3.6, shape.getBottomInset(), 0); + assertEquals(3.6, shape.getTopInset(), 0); + assertEquals(7.2, shape.getLeftInset(), 0); + assertEquals(7.2, shape.getRightInset(), 0); shape.setBottomInset(1.0); - assertEquals(1.0, shape.getBottomInset()); + assertEquals(1.0, shape.getBottomInset(), 0); shape.setTopInset(2.0); - assertEquals(2.0, shape.getTopInset()); + assertEquals(2.0, shape.getTopInset(), 0); shape.setLeftInset(3.0); - assertEquals(3.0, shape.getLeftInset()); + assertEquals(3.0, shape.getLeftInset(), 0); shape.setRightInset(4.0); - assertEquals(4.0, shape.getRightInset()); + assertEquals(4.0, shape.getRightInset(), 0); shape.setBottomInset(0.0); - assertEquals(0.0, shape.getBottomInset()); + assertEquals(0.0, shape.getBottomInset(), 0); shape.setTopInset(0.0); - assertEquals(0.0, shape.getTopInset()); + assertEquals(0.0, shape.getTopInset(), 0); shape.setLeftInset(0.0); - assertEquals(0.0, shape.getLeftInset()); + assertEquals(0.0, shape.getLeftInset(), 0); shape.setRightInset(0.0); - assertEquals(0.0, shape.getRightInset()); + assertEquals(0.0, shape.getRightInset(), 0); // unset to defauls shape.setBottomInset(-1); - assertEquals(3.6, shape.getBottomInset()); + assertEquals(3.6, shape.getBottomInset(), 0); shape.setTopInset(-1); - assertEquals(3.6, shape.getTopInset()); + assertEquals(3.6, shape.getTopInset(), 0); shape.setLeftInset(-1); - assertEquals(7.2, shape.getLeftInset()); + assertEquals(7.2, shape.getLeftInset(), 0); shape.setRightInset(-1); - assertEquals(7.2, shape.getRightInset()); + assertEquals(7.2, shape.getRightInset(), 0); // shape assertTrue(shape.getWordWrap()); @@ -102,31 +104,32 @@ public class TestXSLFAutoShape extends T assertEquals(TextDirection.HORIZONTAL, shape.getTextDirection()); } + @Test public void testTextParagraph() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); - assertEquals(0, slide.getShapes().length); + assertTrue(slide.getShapes().isEmpty()); XSLFAutoShape shape = slide.createAutoShape(); assertEquals(0, shape.getTextParagraphs().size()); XSLFTextParagraph p = shape.addNewTextParagraph(); assertEquals(1, shape.getTextParagraphs().size()); - assertEquals(0., p.getIndent()); - assertEquals(0., p.getLeftMargin()); - assertEquals(100., p.getLineSpacing()); - assertEquals(0., p.getSpaceAfter()); - assertEquals(0., p.getSpaceBefore()); + assertEquals(0., p.getIndent(), 0); + assertEquals(0., p.getLeftMargin(), 0); + assertEquals(100., p.getLineSpacing(), 0); + assertEquals(0., p.getSpaceAfter(), 0); + assertEquals(0., p.getSpaceBefore(), 0); assertEquals(0, p.getLevel()); p.setIndent(2.0); - assertEquals(2.0, p.getIndent()); + assertEquals(2.0, p.getIndent(), 0); assertTrue(p.getXmlObject().getPPr().isSetIndent()); p.setIndent(-1); - assertEquals(0.0, p.getIndent()); + assertEquals(0.0, p.getIndent(), 0); assertFalse(p.getXmlObject().getPPr().isSetIndent()); p.setIndent(10.0); - assertEquals(10., p.getIndent()); + assertEquals(10., p.getIndent(), 0); assertTrue(p.getXmlObject().getPPr().isSetIndent()); @@ -138,10 +141,10 @@ public class TestXSLFAutoShape extends T assertEquals(2, p.getLevel()); p.setLeftMargin(2.0); - assertEquals(2.0, p.getLeftMargin()); + assertEquals(2.0, p.getLeftMargin(), 0); assertTrue(p.getXmlObject().getPPr().isSetMarL()); p.setLeftMargin(10.0); - assertEquals(10., p.getLeftMargin()); + assertEquals(10., p.getLeftMargin(), 0); assertEquals(Units.toEMU(10), p.getXmlObject().getPPr().getMarL()); @@ -201,6 +204,7 @@ public class TestXSLFAutoShape extends T assertFalse(p.getXmlObject().getPPr().isSetAlgn()); } + @Test public void testTextRun() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -214,7 +218,7 @@ public class TestXSLFAutoShape extends T assertEquals(1, p.getTextRuns().size()); assertSame(r, p.getTextRuns().get(0)); - assertEquals(18.0, r.getFontSize()); // default font size for text boxes + assertEquals(18.0, r.getFontSize(), 0); // default font size for text boxes assertFalse(r.getXmlObject().getRPr().isSetSz()); r.setFontSize(10.0); assertTrue(r.getXmlObject().isSetRPr()); @@ -256,20 +260,21 @@ public class TestXSLFAutoShape extends T assertTrue(r.isItalic()); assertEquals(true, r.getXmlObject().getRPr().getI()); - assertFalse(r.isUnderline()); + assertFalse(r.isUnderlined()); assertFalse(r.getXmlObject().getRPr().isSetU()); r.setUnderline(true); - assertTrue(r.isUnderline()); + assertTrue(r.isUnderlined()); assertEquals(STTextUnderlineType.SNG, r.getXmlObject().getRPr().getU()); r.setText("Apache"); - assertEquals("Apache", r.getText()); + assertEquals("Apache", r.getRawText()); r.setText("POI"); - assertEquals("POI", r.getText()); + assertEquals("POI", r.getRawText()); r.setText(null); - assertNull(r.getText()); + assertNull(r.getRawText()); } + @Test public void testShapeType() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFChart.java Mon Apr 27 20:13:43 2015 @@ -46,7 +46,7 @@ public class TestXSLFChart extends TestC String chartTitle = "Apache POI"; // first line is chart title XMLSlideShow pptx = XSLFTestDataSamples.openSampleDocument("pie-chart.pptx"); - XSLFSlide slide = pptx.getSlides()[0]; + XSLFSlide slide = pptx.getSlides().get(0); // find chart in the slide XSLFChart chart = null; Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFConnectorShape.java Mon Apr 27 20:13:43 2015 @@ -16,28 +16,31 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + import java.awt.Color; import java.awt.Rectangle; -import junit.framework.TestCase; - import org.apache.poi.sl.usermodel.LineDecoration.DecorationShape; import org.apache.poi.sl.usermodel.LineDecoration.DecorationSize; import org.apache.poi.sl.usermodel.*; +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.*; import org.openxmlformats.schemas.presentationml.x2006.main.CTConnector; /** * @author Yegor Kozlov */ -public class TestXSLFConnectorShape extends TestCase { +public class TestXSLFConnectorShape { + @Test public void testLineDecorations() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); XSLFConnectorShape shape = slide.createConnector(); - assertEquals(1, slide.getShapes().length); + assertEquals(1, slide.getShapes().size()); assertFalse(shape.getSpPr().getLn().isSetHeadEnd()); assertFalse(shape.getSpPr().getLn().isSetTailEnd()); @@ -112,6 +115,7 @@ public class TestXSLFConnectorShape exte } + @Test public void testAddConnector(){ XMLSlideShow pptx = new XMLSlideShow(); XSLFSlide slide = pptx.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFFreeformShape.java Mon Apr 27 20:13:43 2015 @@ -16,17 +16,20 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; import java.awt.Rectangle; import java.awt.geom.Ellipse2D; import java.awt.geom.GeneralPath; +import org.junit.Test; + /** * @author Yegor Kozlov */ -public class TestXSLFFreeformShape extends TestCase { +public class TestXSLFFreeformShape { + @Test public void testSetPath() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFGroupShape.java Mon Apr 27 20:13:43 2015 @@ -16,16 +16,19 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; import java.awt.Dimension; import java.awt.geom.Rectangle2D; +import org.junit.Test; + /** * @author Yegor Kozlov */ -public class TestXSLFGroupShape extends TestCase { +public class TestXSLFGroupShape { + @Test public void testCreateShapes() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -33,7 +36,7 @@ public class TestXSLFGroupShape extends ppt.setPageSize(new Dimension(792, 612)); XSLFGroupShape group = slide.createGroup(); - assertEquals(1, slide.getShapes().length); + assertEquals(1, slide.getShapes().size()); Rectangle2D interior = new Rectangle2D.Double(-10, -10, 20, 20); group.setInteriorAnchor(interior); @@ -43,45 +46,46 @@ public class TestXSLFGroupShape extends group.setAnchor(anchor); assertEquals(anchor, group.getAnchor()); - assertEquals(0, group.getShapes().length); + assertTrue(group.getShapes().isEmpty()); XSLFTextBox shape1 = group.createTextBox(); - assertEquals(1, group.getShapes().length); - assertSame(shape1, group.getShapes()[0]); + assertEquals(1, group.getShapes().size()); + assertSame(shape1, group.getShapes().get(0)); assertEquals(3, shape1.getShapeId()); XSLFAutoShape shape2 = group.createAutoShape(); - assertEquals(2, group.getShapes().length); - assertSame(shape1, group.getShapes()[0]); - assertSame(shape2, group.getShapes()[1]); + assertEquals(2, group.getShapes().size()); + assertSame(shape1, group.getShapes().get(0)); + assertSame(shape2, group.getShapes().get(1)); assertEquals(4, shape2.getShapeId()); XSLFConnectorShape shape3 = group.createConnector(); - assertEquals(3, group.getShapes().length); - assertSame(shape3, group.getShapes()[2]); + assertEquals(3, group.getShapes().size()); + assertSame(shape3, group.getShapes().get(2)); assertEquals(5, shape3.getShapeId()); XSLFGroupShape shape4 = group.createGroup(); - assertEquals(4, group.getShapes().length); - assertSame(shape4, group.getShapes()[3]); + assertEquals(4, group.getShapes().size()); + assertSame(shape4, group.getShapes().get(3)); assertEquals(6, shape4.getShapeId()); group.removeShape(shape2); - assertEquals(3, group.getShapes().length); - assertSame(shape1, group.getShapes()[0]); - assertSame(shape3, group.getShapes()[1]); - assertSame(shape4, group.getShapes()[2]); + assertEquals(3, group.getShapes().size()); + assertSame(shape1, group.getShapes().get(0)); + assertSame(shape3, group.getShapes().get(1)); + assertSame(shape4, group.getShapes().get(2)); group.removeShape(shape3); - assertEquals(2, group.getShapes().length); - assertSame(shape1, group.getShapes()[0]); - assertSame(shape4, group.getShapes()[1]); + assertEquals(2, group.getShapes().size()); + assertSame(shape1, group.getShapes().get(0)); + assertSame(shape4, group.getShapes().get(1)); group.removeShape(shape1); group.removeShape(shape4); - assertEquals(0, group.getShapes().length); + assertTrue(group.getShapes().isEmpty()); } + @Test public void testRemoveShapes() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFHyperlink.java Mon Apr 27 20:13:43 2015 @@ -16,24 +16,29 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.net.URI; +import java.util.List; + import org.apache.poi.openxml4j.opc.PackageRelationship; import org.apache.poi.openxml4j.opc.TargetMode; import org.apache.poi.xslf.XSLFTestDataSamples; - -import java.net.URI; +import org.junit.Test; /** * @author Yegor Kozlov */ -public class TestXSLFHyperlink extends TestCase { +public class TestXSLFHyperlink { + @Test public void testRead(){ XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx"); - XSLFSlide slide = ppt.getSlides()[4]; - XSLFShape[] shapes = slide.getShapes(); - XSLFTable tbl = (XSLFTable)shapes[0]; + XSLFSlide slide = ppt.getSlides().get(4); + List<XSLFShape> shapes = slide.getShapes(); + XSLFTable tbl = (XSLFTable)shapes.get(0); XSLFTableCell cell1 = tbl.getRows().get(1).getCells().get(0); assertEquals("Web Page", cell1.getText()); XSLFHyperlink link1 = cell1.getTextParagraphs().get(0).getTextRuns().get(0).getHyperlink(); @@ -53,6 +58,7 @@ public class TestXSLFHyperlink extends T assertEquals(URI.create("mailto:d...@poi.apache.org?subject=Hi%20There";), link3.getTargetURI()); } + @Test public void testCreate() throws Exception { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide1 = ppt.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFPictureShape.java Mon Apr 27 20:13:43 2015 @@ -16,22 +16,20 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.*; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import junit.framework.TestCase; +import java.util.*; import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; import org.openxmlformats.schemas.presentationml.x2006.main.CTPicture; /** * @author Yegor Kozlov */ -public class TestXSLFPictureShape extends TestCase { +public class TestXSLFPictureShape { + @Test public void testCreate() { XMLSlideShow ppt = new XMLSlideShow(); assertEquals(0, ppt.getAllPictures().size()); @@ -61,11 +59,12 @@ public class TestXSLFPictureShape extend assertArrayEquals(data1, pics.get(0).getData()); assertArrayEquals(data2, pics.get(1).getData()); - XSLFShape[] shapes = ppt.getSlides()[0].getShapes(); - assertArrayEquals(data1, ((XSLFPictureShape) shapes[0]).getPictureData().getData()); - assertArrayEquals(data2, ((XSLFPictureShape) shapes[1]).getPictureData().getData()); + List<XSLFShape> shapes = ppt.getSlides().get(0).getShapes(); + assertArrayEquals(data1, ((XSLFPictureShape) shapes.get(0)).getPictureData().getData()); + assertArrayEquals(data2, ((XSLFPictureShape) shapes.get(1)).getPictureData().getData()); } + @Test public void testCreateMultiplePictures() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide1 = ppt.createSlide(); @@ -118,6 +117,7 @@ public class TestXSLFPictureShape extend } } + @Test public void testImageCaching() { XMLSlideShow ppt = new XMLSlideShow(); byte[] img1 = new byte[]{1,2,3}; @@ -137,6 +137,7 @@ public class TestXSLFPictureShape extend } + @Test public void testMerge() { XMLSlideShow ppt1 = new XMLSlideShow(); byte[] data1 = new byte[100]; @@ -150,7 +151,7 @@ public class TestXSLFPictureShape extend XMLSlideShow ppt2 = new XMLSlideShow(); XSLFSlide slide2 = ppt2.createSlide().importContent(slide1); - XSLFPictureShape shape2 = (XSLFPictureShape)slide2.getShapes()[0]; + XSLFPictureShape shape2 = (XSLFPictureShape)slide2.getShapes().get(0); assertArrayEquals(data1, shape2.getPictureData().getData()); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShape.java Mon Apr 27 20:13:43 2015 @@ -16,8 +16,10 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; + import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.STTextUnderlineType; import java.util.List; @@ -25,17 +27,18 @@ import java.util.List; /** * @author Yegor Kozlov */ -public class TestXSLFShape extends TestCase { +public class TestXSLFShape { + @Test public void testReadTextShapes() { XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx"); - XSLFSlide[] slides = ppt.getSlides(); + List<XSLFSlide> slides = ppt.getSlides(); - XSLFSlide slide1 = slides[0]; - XSLFShape[] shapes1 = slide1.getShapes(); - assertEquals(7, shapes1.length); - assertEquals("TextBox 3", shapes1[0].getShapeName()); - XSLFAutoShape sh0 = (XSLFAutoShape) shapes1[0]; + XSLFSlide slide1 = slides.get(0); + List<XSLFShape> shapes1 = slide1.getShapes(); + assertEquals(7, shapes1.size()); + assertEquals("TextBox 3", shapes1.get(0).getShapeName()); + XSLFAutoShape sh0 = (XSLFAutoShape) shapes1.get(0); assertEquals("Learning PPTX", sh0.getText()); List<XSLFTextParagraph> paragraphs0 = sh0.getTextParagraphs(); assertEquals(1, paragraphs0.size()); @@ -43,28 +46,28 @@ public class TestXSLFShape extends TestC assertEquals("Learning PPTX", p0.getText()); assertEquals(1, p0.getTextRuns().size()); XSLFTextRun r0 = p0.getTextRuns().get(0); - assertEquals("Learning PPTX", r0.getText()); + assertEquals("Learning PPTX", r0.getRawText()); - XSLFSlide slide2 = slides[1]; - XSLFShape[] shapes2 = slide2.getShapes(); - assertTrue(shapes2[0] instanceof XSLFAutoShape); - assertEquals("PPTX Title", ((XSLFAutoShape) shapes2[0]).getText()); - XSLFAutoShape sh1 = (XSLFAutoShape) shapes2[0]; + XSLFSlide slide2 = slides.get(1); + List<XSLFShape> shapes2 = slide2.getShapes(); + assertTrue(shapes2.get(0) instanceof XSLFAutoShape); + assertEquals("PPTX Title", ((XSLFAutoShape) shapes2.get(0)).getText()); + XSLFAutoShape sh1 = (XSLFAutoShape) shapes2.get(0); List<XSLFTextParagraph> paragraphs1 = sh1.getTextParagraphs(); assertEquals(1, paragraphs1.size()); XSLFTextParagraph p1 = paragraphs1.get(0); assertEquals("PPTX Title", p1.getText()); List<XSLFTextRun> r2 = paragraphs1.get(0).getTextRuns(); assertEquals(2, r2.size()); - assertEquals("PPTX ", r2.get(0).getText()); - assertEquals("Title", r2.get(1).getText()); + assertEquals("PPTX ", r2.get(0).getRawText()); + assertEquals("Title", r2.get(1).getRawText()); // Title is underlined assertEquals(STTextUnderlineType.SNG, r2.get(1).getXmlObject().getRPr().getU()); - assertTrue(shapes2[1] instanceof XSLFAutoShape); - assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape) shapes2[1]).getText()); - XSLFAutoShape sh2 = (XSLFAutoShape) shapes2[1]; + assertTrue(shapes2.get(1) instanceof XSLFAutoShape); + assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape) shapes2.get(1)).getText()); + XSLFAutoShape sh2 = (XSLFAutoShape) shapes2.get(1); List<XSLFTextParagraph> paragraphs2 = sh2.getTextParagraphs(); assertEquals(2, paragraphs2.size()); assertEquals("Subtitle", paragraphs2.get(0).getText()); @@ -73,20 +76,20 @@ public class TestXSLFShape extends TestC assertEquals(1, paragraphs2.get(0).getTextRuns().size()); assertEquals(1, paragraphs2.get(1).getTextRuns().size()); - assertEquals("Subtitle", paragraphs2.get(0).getTextRuns().get(0).getText()); + assertEquals("Subtitle", paragraphs2.get(0).getTextRuns().get(0).getRawText()); assertTrue(paragraphs2.get(0).getTextRuns().get(0).getXmlObject().getRPr().getB()); - assertEquals("And second line", paragraphs2.get(1).getTextRuns().get(0).getText()); + assertEquals("And second line", paragraphs2.get(1).getTextRuns().get(0).getRawText()); } public void testCreateShapes() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); - assertEquals(0, slide.getShapes().length); + assertTrue(slide.getShapes().isEmpty()); XSLFTextBox textBox = slide.createTextBox(); - assertEquals(1, slide.getShapes().length); - assertSame(textBox, slide.getShapes()[0]); + assertEquals(1, slide.getShapes().size()); + assertSame(textBox, slide.getShapes().get(0)); assertEquals("", textBox.getText()); assertEquals(0, textBox.getTextParagraphs().size()); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFShapeContainer.java Mon Apr 27 20:13:43 2015 @@ -18,35 +18,40 @@ */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; + +import org.junit.Test; /** * test common operations on containers of shapes (sheets and groups of shapes) * * @author Yegor Kozlov */ -public class TestXSLFShapeContainer extends TestCase { +public class TestXSLFShapeContainer { + @SuppressWarnings("unused") + @Test public void verifyContainer(XSLFShapeContainer container) { container.clear(); - assertEquals(0, container.getShapes().length); + assertEquals(0, container.getShapes().size()); XSLFGroupShape shape1 = container.createGroup(); - assertEquals(1, container.getShapes().length); + assertEquals(1, container.getShapes().size()); XSLFTextBox shape2 = container.createTextBox(); - assertEquals(2, container.getShapes().length); + assertEquals(2, container.getShapes().size()); XSLFAutoShape shape3 = container.createAutoShape(); - assertEquals(3, container.getShapes().length); + assertEquals(3, container.getShapes().size()); XSLFConnectorShape shape4 = container.createConnector(); - assertEquals(4, container.getShapes().length); + assertEquals(4, container.getShapes().size()); container.clear(); - assertEquals(0, container.getShapes().length); + assertEquals(0, container.getShapes().size()); } + @Test public void testSheet() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSheet sheet = ppt.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSheet.java Mon Apr 27 20:13:43 2015 @@ -16,50 +16,56 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; + +import java.util.List; + import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; /** * test common properties for sheets (slides, masters, layouts, etc.) * * @author Yegor Kozlov */ -public class TestXSLFSheet extends TestCase { +public class TestXSLFSheet { + + @Test public void testCreateShapes(){ XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); - assertEquals(0, slide.getShapes().length); + assertTrue(slide.getShapes().isEmpty()); XSLFSimpleShape shape1 = slide.createAutoShape(); - assertEquals(1, slide.getShapes().length); - assertSame(shape1, slide.getShapes()[0]); + assertEquals(1, slide.getShapes().size()); + assertSame(shape1, slide.getShapes().get(0)); XSLFTextBox shape2 = slide.createTextBox(); - assertEquals(2, slide.getShapes().length); - assertSame(shape1, slide.getShapes()[0]); - assertSame(shape2, slide.getShapes()[1]); + assertEquals(2, slide.getShapes().size()); + assertSame(shape1, slide.getShapes().get(0)); + assertSame(shape2, slide.getShapes().get(1)); XSLFConnectorShape shape3 = slide.createConnector(); - assertEquals(3, slide.getShapes().length); - assertSame(shape1, slide.getShapes()[0]); - assertSame(shape2, slide.getShapes()[1]); - assertSame(shape3, slide.getShapes()[2]); + assertEquals(3, slide.getShapes().size()); + assertSame(shape1, slide.getShapes().get(0)); + assertSame(shape2, slide.getShapes().get(1)); + assertSame(shape3, slide.getShapes().get(2)); XSLFGroupShape shape4 = slide.createGroup(); - assertEquals(4, slide.getShapes().length); - assertSame(shape1, slide.getShapes()[0]); - assertSame(shape2, slide.getShapes()[1]); - assertSame(shape3, slide.getShapes()[2]); - assertSame(shape4, slide.getShapes()[3]); + assertEquals(4, slide.getShapes().size()); + assertSame(shape1, slide.getShapes().get(0)); + assertSame(shape2, slide.getShapes().get(1)); + assertSame(shape3, slide.getShapes().get(2)); + assertSame(shape4, slide.getShapes().get(3)); ppt = XSLFTestDataSamples.writeOutAndReadBack(ppt); - slide = ppt.getSlides()[0]; - XSLFShape[] shapes = slide.getShapes(); - assertEquals(4, shapes.length); - - assertTrue(shapes[0] instanceof XSLFAutoShape); - assertTrue(shapes[1] instanceof XSLFTextBox); - assertTrue(shapes[2] instanceof XSLFConnectorShape); - assertTrue(shapes[3] instanceof XSLFGroupShape); + slide = ppt.getSlides().get(0); + List<XSLFShape> shapes = slide.getShapes(); + assertEquals(4, shapes.size()); + + assertTrue(shapes.get(0) instanceof XSLFAutoShape); + assertTrue(shapes.get(1) instanceof XSLFTextBox); + assertTrue(shapes.get(2) instanceof XSLFConnectorShape); + assertTrue(shapes.get(3) instanceof XSLFGroupShape); } } \ No newline at end of file Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSimpleShape.java Mon Apr 27 20:13:43 2015 @@ -16,30 +16,34 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import java.awt.Color; +import static org.junit.Assert.*; -import junit.framework.TestCase; +import java.awt.Color; +import java.util.List; import org.apache.poi.sl.usermodel.StrokeStyle.LineCap; import org.apache.poi.sl.usermodel.StrokeStyle.LineDash; import org.apache.poi.util.Units; import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.*; /** * @author Yegor Kozlov */ -public class TestXSLFSimpleShape extends TestCase { +public class TestXSLFSimpleShape { + + @Test public void testLineStyles() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); XSLFSimpleShape shape = slide.createAutoShape(); - assertEquals(1, slide.getShapes().length); + assertEquals(1, slide.getShapes().size()); // line properties are not set by default assertFalse(shape.getSpPr().isSetLn()); - assertEquals(0., shape.getLineWidth()); + assertEquals(0., shape.getLineWidth(), 0); assertEquals(null, shape.getLineColor()); assertEquals(null, shape.getLineDash()); assertEquals(null, shape.getLineCap()); @@ -54,10 +58,10 @@ public class TestXSLFSimpleShape extends // line width shape.setLineWidth(1.0); - assertEquals(1.0, shape.getLineWidth()); + assertEquals(1.0, shape.getLineWidth(), 0); assertEquals(Units.EMU_PER_POINT, shape.getSpPr().getLn().getW()); shape.setLineWidth(5.5); - assertEquals(5.5, shape.getLineWidth()); + assertEquals(5.5, shape.getLineWidth(), 0); assertEquals(Units.toEMU(5.5), shape.getSpPr().getLn().getW()); shape.setLineWidth(0.0); // setting line width to zero unsets the W attribute @@ -108,17 +112,18 @@ public class TestXSLFSimpleShape extends ln2.setLineDash(LineDash.DOT); assertEquals(LineDash.DOT, ln2.getLineDash()); ln2.setLineWidth(0.); - assertEquals(0., ln2.getLineWidth()); + assertEquals(0., ln2.getLineWidth(), 0); XSLFSimpleShape ln3 = slide.createAutoShape(); ln3.setLineWidth(1.); - assertEquals(1., ln3.getLineWidth()); + assertEquals(1., ln3.getLineWidth(), 0); ln3.setLineDash(null); assertEquals(null, ln3.getLineDash()); ln3.setLineCap(null); assertEquals(null, ln3.getLineDash()); } + @Test public void testFill() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -143,29 +148,30 @@ public class TestXSLFSimpleShape extends assertFalse(shape.getSpPr().isSetSolidFill()); } + @Test public void testDefaultProperties() { XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx"); - XSLFSlide slide6 = ppt.getSlides()[5]; - XSLFShape[] shapes = slide6.getShapes(); - for(int i = 1; i < shapes.length; i++){ - XSLFSimpleShape s = (XSLFSimpleShape) shapes[i]; + XSLFSlide slide6 = ppt.getSlides().get(5); + List<XSLFShape> shapes = slide6.getShapes(); + for(XSLFShape xs : shapes){ + XSLFSimpleShape s = (XSLFSimpleShape)xs; // all shapes have a theme color="accent1" assertEquals("accent1", s.getSpStyle().getFillRef().getSchemeClr().getVal().toString()); - assertEquals(2.0, s.getLineWidth()); + assertEquals(2.0, s.getLineWidth(), 0); assertEquals(LineCap.FLAT, s.getLineCap()); // YK: calculated color is slightly different from PowerPoint assertEquals(new Color(39, 64, 94), s.getLineColor()); } - XSLFSimpleShape s0 = (XSLFSimpleShape) shapes[0]; + XSLFSimpleShape s0 = (XSLFSimpleShape) shapes.get(0); // fill is not set assertNull(s0.getSpPr().getSolidFill()); //assertEquals(slide6.getTheme().getColor("accent1").getColor(), s0.getFillColor()); assertEquals(new Color(79, 129, 189), s0.getFillColor()); // lighter 80% - XSLFSimpleShape s1 = (XSLFSimpleShape)shapes[1]; + XSLFSimpleShape s1 = (XSLFSimpleShape)shapes.get(1); CTSchemeColor ref1 = s1.getSpPr().getSolidFill().getSchemeClr(); assertEquals(1, ref1.sizeOfLumModArray()); assertEquals(1, ref1.sizeOfLumOffArray()); @@ -175,7 +181,7 @@ public class TestXSLFSimpleShape extends assertEquals(new Color(220, 230, 242), s1.getFillColor()); // lighter 60% - XSLFSimpleShape s2 = (XSLFSimpleShape)shapes[2]; + XSLFSimpleShape s2 = (XSLFSimpleShape)shapes.get(2); CTSchemeColor ref2 = s2.getSpPr().getSolidFill().getSchemeClr(); assertEquals(1, ref2.sizeOfLumModArray()); assertEquals(1, ref2.sizeOfLumOffArray()); @@ -185,7 +191,7 @@ public class TestXSLFSimpleShape extends assertEquals(new Color(185, 205, 229), s2.getFillColor()); // lighter 40% - XSLFSimpleShape s3 = (XSLFSimpleShape)shapes[3]; + XSLFSimpleShape s3 = (XSLFSimpleShape)shapes.get(3); CTSchemeColor ref3 = s3.getSpPr().getSolidFill().getSchemeClr(); assertEquals(1, ref3.sizeOfLumModArray()); assertEquals(1, ref3.sizeOfLumOffArray()); @@ -195,7 +201,7 @@ public class TestXSLFSimpleShape extends assertEquals(new Color(149, 179, 215), s3.getFillColor()); // darker 25% - XSLFSimpleShape s4 = (XSLFSimpleShape)shapes[4]; + XSLFSimpleShape s4 = (XSLFSimpleShape)shapes.get(4); CTSchemeColor ref4 = s4.getSpPr().getSolidFill().getSchemeClr(); assertEquals(1, ref4.sizeOfLumModArray()); assertEquals(0, ref4.sizeOfLumOffArray()); @@ -204,7 +210,7 @@ public class TestXSLFSimpleShape extends // YK: calculated color is slightly different from PowerPoint assertEquals(new Color(59, 97, 142), s4.getFillColor()); - XSLFSimpleShape s5 = (XSLFSimpleShape)shapes[5]; + XSLFSimpleShape s5 = (XSLFSimpleShape)shapes.get(5); CTSchemeColor ref5 = s5.getSpPr().getSolidFill().getSchemeClr(); assertEquals(1, ref5.sizeOfLumModArray()); assertEquals(0, ref5.sizeOfLumOffArray()); @@ -214,26 +220,27 @@ public class TestXSLFSimpleShape extends assertEquals(new Color(40, 65, 95), s5.getFillColor()); } + @Test public void testAnchor(){ XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx"); - XSLFSlide[] slide = ppt.getSlides(); + List<XSLFSlide> slide = ppt.getSlides(); - XSLFSlide slide2 = slide[1]; + XSLFSlide slide2 = slide.get(1); XSLFSlideLayout layout2 = slide2.getSlideLayout(); - XSLFShape[] shapes2 = slide2.getShapes(); - XSLFTextShape sh1 = (XSLFTextShape)shapes2[0]; + List<XSLFShape> shapes2 = slide2.getShapes(); + XSLFTextShape sh1 = (XSLFTextShape)shapes2.get(0); assertEquals(Placeholder.CENTERED_TITLE, sh1.getTextType()); assertEquals("PPTX Title", sh1.getText()); assertNull(sh1.getSpPr().getXfrm()); // xfrm is not set, the query is delegated to the slide layout assertEquals(sh1.getAnchor(), layout2.getTextShapeByType(Placeholder.CENTERED_TITLE).getAnchor()); - XSLFTextShape sh2 = (XSLFTextShape)shapes2[1]; + XSLFTextShape sh2 = (XSLFTextShape)shapes2.get(1); assertEquals("Subtitle\nAnd second line", sh2.getText()); assertEquals(Placeholder.SUBTITLE, sh2.getTextType()); assertNull(sh2.getSpPr().getXfrm()); // xfrm is not set, the query is delegated to the slide layout assertEquals(sh2.getAnchor(), layout2.getTextShapeByType(Placeholder.SUBTITLE).getAnchor()); - XSLFSlide slide5 = slide[4]; + XSLFSlide slide5 = slide.get(4); XSLFSlideLayout layout5 = slide5.getSlideLayout(); XSLFTextShape shTitle = slide5.getTextShapeByType(Placeholder.TITLE); assertEquals("Hyperlinks", shTitle.getText()); @@ -247,6 +254,7 @@ public class TestXSLFSimpleShape extends } @SuppressWarnings({ "deprecation", "unused" }) + @Test public void testShadowEffects(){ XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlide.java Mon Apr 27 20:13:43 2015 @@ -16,88 +16,91 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.*; import java.awt.Color; - -import junit.framework.TestCase; +import java.util.List; import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; /** * @author Yegor Kozlov */ -public class TestXSLFSlide extends TestCase { +public class TestXSLFSlide { + + @Test public void testReadShapes(){ XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx"); - XSLFSlide[] slides = ppt.getSlides(); + List<XSLFSlide> slides = ppt.getSlides(); - XSLFSlide slide1 = slides[0]; - XSLFShape[] shapes1 = slide1.getShapes(); - assertEquals(7, shapes1.length); - assertEquals("TextBox 3", shapes1[0].getShapeName()); - assertTrue(shapes1[0] instanceof XSLFTextBox); - XSLFAutoShape sh0 = (XSLFAutoShape)shapes1[0]; + XSLFSlide slide1 = slides.get(0); + List<XSLFShape> shapes1 = slide1.getShapes(); + assertEquals(7, shapes1.size()); + assertEquals("TextBox 3", shapes1.get(0).getShapeName()); + assertTrue(shapes1.get(0) instanceof XSLFTextBox); + XSLFAutoShape sh0 = (XSLFAutoShape)shapes1.get(0); assertEquals("Learning PPTX", sh0.getText()); - assertEquals("Straight Connector 5", shapes1[1].getShapeName()); - assertTrue(shapes1[1] instanceof XSLFConnectorShape); + assertEquals("Straight Connector 5", shapes1.get(1).getShapeName()); + assertTrue(shapes1.get(1) instanceof XSLFConnectorShape); - assertEquals("Freeform 6", shapes1[2].getShapeName()); - assertTrue(shapes1[2] instanceof XSLFFreeformShape); - XSLFAutoShape sh2 = (XSLFAutoShape)shapes1[2]; + assertEquals("Freeform 6", shapes1.get(2).getShapeName()); + assertTrue(shapes1.get(2) instanceof XSLFFreeformShape); + XSLFAutoShape sh2 = (XSLFAutoShape)shapes1.get(2); assertEquals("Cloud", sh2.getText()); - assertEquals("Picture 1", shapes1[3].getShapeName()); - assertTrue(shapes1[3] instanceof XSLFPictureShape); + assertEquals("Picture 1", shapes1.get(3).getShapeName()); + assertTrue(shapes1.get(3) instanceof XSLFPictureShape); - assertEquals("Table 2", shapes1[4].getShapeName()); - assertTrue(shapes1[4] instanceof XSLFGraphicFrame); + assertEquals("Table 2", shapes1.get(4).getShapeName()); + assertTrue(shapes1.get(4) instanceof XSLFGraphicFrame); - assertEquals("Straight Arrow Connector 7", shapes1[5].getShapeName()); - assertTrue(shapes1[5] instanceof XSLFConnectorShape); + assertEquals("Straight Arrow Connector 7", shapes1.get(5).getShapeName()); + assertTrue(shapes1.get(5) instanceof XSLFConnectorShape); - assertEquals("Elbow Connector 9", shapes1[6].getShapeName()); - assertTrue(shapes1[6] instanceof XSLFConnectorShape); + assertEquals("Elbow Connector 9", shapes1.get(6).getShapeName()); + assertTrue(shapes1.get(6) instanceof XSLFConnectorShape); // titles on slide2 - XSLFSlide slide2 = slides[1]; - XSLFShape[] shapes2 = slide2.getShapes(); - assertEquals(2, shapes2.length); - assertTrue(shapes2[0] instanceof XSLFAutoShape); - assertEquals("PPTX Title", ((XSLFAutoShape)shapes2[0]).getText()); - assertTrue(shapes2[1] instanceof XSLFAutoShape); - assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape)shapes2[1]).getText()); + XSLFSlide slide2 = slides.get(1); + List<XSLFShape> shapes2 = slide2.getShapes(); + assertEquals(2, shapes2.size()); + assertTrue(shapes2.get(0) instanceof XSLFAutoShape); + assertEquals("PPTX Title", ((XSLFAutoShape)shapes2.get(0)).getText()); + assertTrue(shapes2.get(1) instanceof XSLFAutoShape); + assertEquals("Subtitle\nAnd second line", ((XSLFAutoShape)shapes2.get(1)).getText()); // group shape on slide3 - XSLFSlide slide3 = slides[2]; - XSLFShape[] shapes3 = slide3.getShapes(); - assertEquals(1, shapes3.length); - assertTrue(shapes3[0] instanceof XSLFGroupShape); - XSLFShape[] groupShapes = ((XSLFGroupShape)shapes3[0]).getShapes(); - assertEquals(3, groupShapes.length); - assertTrue(groupShapes[0] instanceof XSLFAutoShape); - assertEquals("Rectangle 1", groupShapes[0].getShapeName()); - - assertTrue(groupShapes[1] instanceof XSLFAutoShape); - assertEquals("Oval 2", groupShapes[1].getShapeName()); - - assertTrue(groupShapes[2] instanceof XSLFAutoShape); - assertEquals("Right Arrow 3", groupShapes[2].getShapeName()); - - XSLFSlide slide4 = slides[3]; - XSLFShape[] shapes4 = slide4.getShapes(); - assertEquals(1, shapes4.length); - assertTrue(shapes4[0] instanceof XSLFTable); - XSLFTable tbl = (XSLFTable)shapes4[0]; + XSLFSlide slide3 = slides.get(2); + List<XSLFShape> shapes3 = slide3.getShapes(); + assertEquals(1, shapes3.size()); + assertTrue(shapes3.get(0) instanceof XSLFGroupShape); + List<XSLFShape> groupShapes = ((XSLFGroupShape)shapes3.get(0)).getShapes(); + assertEquals(3, groupShapes.size()); + assertTrue(groupShapes.get(0) instanceof XSLFAutoShape); + assertEquals("Rectangle 1", groupShapes.get(0).getShapeName()); + + assertTrue(groupShapes.get(1) instanceof XSLFAutoShape); + assertEquals("Oval 2", groupShapes.get(1).getShapeName()); + + assertTrue(groupShapes.get(2) instanceof XSLFAutoShape); + assertEquals("Right Arrow 3", groupShapes.get(2).getShapeName()); + + XSLFSlide slide4 = slides.get(3); + List<XSLFShape> shapes4 = slide4.getShapes(); + assertEquals(1, shapes4.size()); + assertTrue(shapes4.get(0) instanceof XSLFTable); + XSLFTable tbl = (XSLFTable)shapes4.get(0); assertEquals(3, tbl.getNumberOfColumns()); assertEquals(6, tbl.getNumberOfRows()); } + @Test public void testCreateSlide(){ XMLSlideShow ppt = new XMLSlideShow(); - assertEquals(0, ppt.getSlides().length); + assertEquals(0, ppt.getSlides().size()); XSLFSlide slide = ppt.createSlide(); assertTrue(slide.getFollowMasterGraphics()); @@ -107,34 +110,35 @@ public class TestXSLFSlide extends TestC assertTrue(slide.getFollowMasterGraphics()); } + @Test public void testImportContent(){ XMLSlideShow ppt = new XMLSlideShow(); XMLSlideShow src = XSLFTestDataSamples.openSampleDocument("themes.pptx"); // create a blank slide and import content from the 4th slide of themes.pptx - XSLFSlide slide1 = ppt.createSlide().importContent(src.getSlides()[3]); - XSLFShape[] shapes1 = slide1.getShapes(); - assertEquals(2, shapes1.length); + XSLFSlide slide1 = ppt.createSlide().importContent(src.getSlides().get(3)); + List<XSLFShape> shapes1 = slide1.getShapes(); + assertEquals(2, shapes1.size()); - XSLFTextShape sh1 = (XSLFTextShape)shapes1[0]; + XSLFTextShape sh1 = (XSLFTextShape)shapes1.get(0); assertEquals("Austin Theme", sh1.getText()); XSLFTextRun r1 = sh1.getTextParagraphs().get(0).getTextRuns().get(0); assertEquals("Century Gothic", r1.getFontFamily()); - assertEquals(40.0, r1.getFontSize()); + assertEquals(40.0, r1.getFontSize(), 0); assertTrue(r1.isBold()); assertTrue(r1.isItalic()); assertEquals(new Color(148, 198, 0), r1.getFontColor()); assertNull(sh1.getFillColor()); assertNull(sh1.getLineColor()); - XSLFTextShape sh2 = (XSLFTextShape)shapes1[1]; + XSLFTextShape sh2 = (XSLFTextShape)shapes1.get(1); assertEquals( "Text in a autoshape is white\n" + "Fill: RGB(148, 198,0)", sh2.getText()); XSLFTextRun r2 = sh2.getTextParagraphs().get(0).getTextRuns().get(0); assertEquals("Century Gothic", r2.getFontFamily()); - assertEquals(18.0, r2.getFontSize()); + assertEquals(18.0, r2.getFontSize(), 0); assertFalse(r2.isBold()); assertFalse(r2.isItalic()); assertEquals(Color.white, r2.getFontColor()); @@ -142,11 +146,11 @@ public class TestXSLFSlide extends TestC assertEquals(new Color(74, 99, 0), sh2.getLineColor()); // slightly different from PowerPoint! // the 5th slide has a picture and a texture fill - XSLFSlide slide2 = ppt.createSlide().importContent(src.getSlides()[4]); - XSLFShape[] shapes2 = slide2.getShapes(); - assertEquals(2, shapes2.length); + XSLFSlide slide2 = ppt.createSlide().importContent(src.getSlides().get(4)); + List<XSLFShape> shapes2 = slide2.getShapes(); + assertEquals(2, shapes2.size()); - XSLFTextShape sh3 = (XSLFTextShape)shapes2[0]; + XSLFTextShape sh3 = (XSLFTextShape)shapes2.get(0); assertEquals("This slide overrides master background with a texture fill", sh3.getText()); XSLFTextRun r3 = sh3.getTextParagraphs().get(0).getTextRuns().get(0); assertEquals("Century Gothic", r3.getFontFamily()); @@ -157,11 +161,12 @@ public class TestXSLFSlide extends TestC assertNull(sh3.getFillColor()); assertNull(sh3.getLineColor()); - XSLFPictureShape sh4 = (XSLFPictureShape)shapes2[1]; - XSLFPictureShape srcPic = (XSLFPictureShape)src.getSlides()[4].getShapes()[1]; + XSLFPictureShape sh4 = (XSLFPictureShape)shapes2.get(1); + XSLFPictureShape srcPic = (XSLFPictureShape)src.getSlides().get(4).getShapes().get(1); assertArrayEquals(sh4.getPictureData().getData(), srcPic.getPictureData().getData()); } + @Test public void testMergeSlides(){ XMLSlideShow ppt = new XMLSlideShow(); String[] pptx = {"shapes.pptx", "themes.pptx", "layouts.pptx", "backgrounds.pptx"}; @@ -173,6 +178,6 @@ public class TestXSLFSlide extends TestC ppt.createSlide().importContent(srcSlide); } } - assertEquals(30, ppt.getSlides().length); + assertEquals(30, ppt.getSlides().size()); } } \ No newline at end of file Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFSlideShow.java Mon Apr 27 20:13:43 2015 @@ -16,63 +16,68 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; -import org.apache.poi.POIXMLDocumentPart; -import org.apache.poi.xslf.XSLFTestDataSamples; +import static org.junit.Assert.*; import java.awt.Dimension; import java.util.List; +import org.apache.poi.POIXMLDocumentPart; +import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; + /** * @author Yegor Kozlov */ -public class TestXSLFSlideShow extends TestCase { +public class TestXSLFSlideShow { + @Test public void testCreateSlide(){ XMLSlideShow ppt = new XMLSlideShow(); - assertEquals(0, ppt.getSlides().length); + assertEquals(0, ppt.getSlides().size()); XSLFSlide slide1 = ppt.createSlide(); - assertEquals(1, ppt.getSlides().length); - assertSame(slide1, ppt.getSlides()[0]); + assertEquals(1, ppt.getSlides().size()); + assertSame(slide1, ppt.getSlides().get(0)); List<POIXMLDocumentPart> rels = slide1.getRelations(); assertEquals(1, rels.size()); assertEquals(slide1.getSlideMaster().getLayout(SlideLayout.BLANK), rels.get(0)); XSLFSlide slide2 = ppt.createSlide(); - assertEquals(2, ppt.getSlides().length); - assertSame(slide2, ppt.getSlides()[1]); + assertEquals(2, ppt.getSlides().size()); + assertSame(slide2, ppt.getSlides().get(1)); ppt.setSlideOrder(slide2, 0); - assertSame(slide2, ppt.getSlides()[0]); - assertSame(slide1, ppt.getSlides()[1]); + assertSame(slide2, ppt.getSlides().get(0)); + assertSame(slide1, ppt.getSlides().get(1)); ppt = XSLFTestDataSamples.writeOutAndReadBack(ppt); - assertEquals(2, ppt.getSlides().length); - rels = ppt.getSlides()[0].getRelations(); + assertEquals(2, ppt.getSlides().size()); + rels = ppt.getSlides().get(0).getRelations(); } + @Test public void testRemoveSlide(){ XMLSlideShow ppt = new XMLSlideShow(); - assertEquals(0, ppt.getSlides().length); + assertEquals(0, ppt.getSlides().size()); XSLFSlide slide1 = ppt.createSlide(); XSLFSlide slide2 = ppt.createSlide(); - assertEquals(2, ppt.getSlides().length); - assertSame(slide1, ppt.getSlides()[0]); - assertSame(slide2, ppt.getSlides()[1]); + assertEquals(2, ppt.getSlides().size()); + assertSame(slide1, ppt.getSlides().get(0)); + assertSame(slide2, ppt.getSlides().get(1)); XSLFSlide removedSlide = ppt.removeSlide(0); assertSame(slide1, removedSlide); - assertEquals(1, ppt.getSlides().length); - assertSame(slide2, ppt.getSlides()[0]); + assertEquals(1, ppt.getSlides().size()); + assertSame(slide2, ppt.getSlides().get(0)); ppt = XSLFTestDataSamples.writeOutAndReadBack(ppt); - assertEquals(1, ppt.getSlides().length); + assertEquals(1, ppt.getSlides().size()); } + @Test public void testDimension(){ XMLSlideShow ppt = new XMLSlideShow(); Dimension sz = ppt.getPageSize(); @@ -84,24 +89,26 @@ public class TestXSLFSlideShow extends T assertEquals(612, sz.height); } + @Test public void testSlideMasters(){ XMLSlideShow ppt = new XMLSlideShow(); - XSLFSlideMaster[] masters = ppt.getSlideMasters(); - assertEquals(1, masters.length); + List<XSLFSlideMaster> masters = ppt.getSlideMasters(); + assertEquals(1, masters.size()); XSLFSlide slide = ppt.createSlide(); - assertSame(masters[0], slide.getSlideMaster()); + assertSame(masters.get(0), slide.getSlideMaster()); } + @Test public void testSlideLayout(){ XMLSlideShow ppt = new XMLSlideShow(); - XSLFSlideMaster[] masters = ppt.getSlideMasters(); - assertEquals(1, masters.length); + List<XSLFSlideMaster> masters = ppt.getSlideMasters(); + assertEquals(1, masters.size()); XSLFSlide slide = ppt.createSlide(); XSLFSlideLayout layout = slide.getSlideLayout(); assertNotNull(layout); - assertSame(masters[0], layout.getSlideMaster()); + assertSame(masters.get(0), layout.getSlideMaster()); } } Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTable.java Mon Apr 27 20:13:43 2015 @@ -16,10 +16,11 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.*; import org.apache.poi.sl.usermodel.VerticalAlignment; import org.apache.poi.xslf.XSLFTestDataSamples; +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTTableCell; import org.openxmlformats.schemas.presentationml.x2006.main.CTGraphicalObjectFrame; @@ -29,16 +30,16 @@ import java.util.List; /** * @author Yegor Kozlov */ -public class TestXSLFTable extends TestCase { - +public class TestXSLFTable { + @Test public void testRead(){ XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("shapes.pptx"); - XSLFSlide slide = ppt.getSlides()[3]; - XSLFShape[] shapes = slide.getShapes(); - assertEquals(1, shapes.length); - assertTrue(shapes[0] instanceof XSLFTable); - XSLFTable tbl = (XSLFTable)shapes[0]; + XSLFSlide slide = ppt.getSlides().get(3); + List<XSLFShape> shapes = slide.getShapes(); + assertEquals(1, shapes.size()); + assertTrue(shapes.get(0) instanceof XSLFTable); + XSLFTable tbl = (XSLFTable)shapes.get(0); assertEquals(3, tbl.getNumberOfColumns()); assertEquals(6, tbl.getNumberOfRows()); assertNotNull(tbl.getCTTable()); @@ -46,13 +47,13 @@ public class TestXSLFTable extends TestC List<XSLFTableRow> rows = tbl.getRows(); assertEquals(6, rows.size()); - assertEquals(90.0, tbl.getColumnWidth(0)); - assertEquals(240.0, tbl.getColumnWidth(1)); - assertEquals(150.0, tbl.getColumnWidth(2)); + assertEquals(90.0, tbl.getColumnWidth(0), 0); + assertEquals(240.0, tbl.getColumnWidth(1), 0); + assertEquals(150.0, tbl.getColumnWidth(2), 0); for(XSLFTableRow row : tbl){ // all rows have the same height - assertEquals(29.2, row.getHeight()); + assertEquals(29.2, row.getHeight(), 0); } XSLFTableRow row0 = rows.get(0); @@ -70,6 +71,7 @@ public class TestXSLFTable extends TestC assertEquals("C1", cells1.get(2).getText()); } + @Test public void testCreate() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -92,9 +94,9 @@ public class TestXSLFTable extends TestC assertNotNull(row0.getXmlObject()); assertEquals(1, tbl.getNumberOfRows()); assertSame(row0, tbl.getRows().get(0)); - assertEquals(20.0, row0.getHeight()); + assertEquals(20.0, row0.getHeight(), 0); row0.setHeight(30.0); - assertEquals(30.0, row0.getHeight()); + assertEquals(30.0, row0.getHeight(), 0); assertEquals(0, row0.getCells().size()); XSLFTableCell cell0 = row0.addCell(); @@ -108,41 +110,41 @@ public class TestXSLFTable extends TestC assertSame(cell0, row0.getCells().get(0)); assertEquals(1, tbl.getNumberOfColumns()); - assertEquals(100.0, tbl.getColumnWidth(0)); + assertEquals(100.0, tbl.getColumnWidth(0), 0); cell0.addNewTextParagraph().addNewTextRun().setText("POI"); assertEquals("POI", cell0.getText()); XSLFTableCell cell1 = row0.addCell(); assertSame(cell1, row0.getCells().get(1)); assertEquals(2, tbl.getNumberOfColumns()); - assertEquals(100.0, tbl.getColumnWidth(1)); + assertEquals(100.0, tbl.getColumnWidth(1), 0); cell1.addNewTextParagraph().addNewTextRun().setText("Apache"); assertEquals("Apache", cell1.getText()); - assertEquals(1.0, cell1.getBorderBottom()); + assertEquals(1.0, cell1.getBorderBottom(), 0); cell1.setBorderBottom(2.0); - assertEquals(2.0, cell1.getBorderBottom()); + assertEquals(2.0, cell1.getBorderBottom(), 0); assertNull(cell1.getBorderBottomColor()); cell1.setBorderBottomColor(Color.yellow); assertEquals(Color.yellow, cell1.getBorderBottomColor()); - assertEquals(1.0, cell1.getBorderTop()); + assertEquals(1.0, cell1.getBorderTop(), 0); cell1.setBorderTop(2.0); - assertEquals(2.0, cell1.getBorderTop()); + assertEquals(2.0, cell1.getBorderTop(), 0); assertNull(cell1.getBorderTopColor()); cell1.setBorderTopColor(Color.yellow); assertEquals(Color.yellow, cell1.getBorderTopColor()); - assertEquals(1.0, cell1.getBorderLeft()); + assertEquals(1.0, cell1.getBorderLeft(), 0); cell1.setBorderLeft(2.0); - assertEquals(2.0, cell1.getBorderLeft()); + assertEquals(2.0, cell1.getBorderLeft(), 0); assertNull(cell1.getBorderLeftColor()); cell1.setBorderLeftColor(Color.yellow); assertEquals(Color.yellow, cell1.getBorderLeftColor()); - assertEquals(1.0, cell1.getBorderRight()); + assertEquals(1.0, cell1.getBorderRight(), 0); cell1.setBorderRight(2.0); - assertEquals(2.0, cell1.getBorderRight()); + assertEquals(2.0, cell1.getBorderRight(), 0); assertNull(cell1.getBorderRightColor()); cell1.setBorderRightColor(Color.yellow); assertEquals(Color.yellow, cell1.getBorderRightColor()); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTableStyles.java Mon Apr 27 20:13:43 2015 @@ -16,14 +16,18 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTTableStyle; /** * @author Yegor Kozlov */ -public class TestXSLFTableStyles extends TestCase { +public class TestXSLFTableStyles { + @Test public void testRead(){ XMLSlideShow ppt = new XMLSlideShow(); XSLFTableStyles tblStyles = ppt.getTableStyles(); @@ -32,6 +36,8 @@ public class TestXSLFTableStyles extends assertEquals(0, tblStyles.getStyles().size()); } + @SuppressWarnings("unused") + @Test public void testStyle(){ CTTableStyle obj = CTTableStyle.Factory.newInstance(); XSLFTableStyle style = new XSLFTableStyle(obj); Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextBox.java Mon Apr 27 20:13:43 2015 @@ -16,14 +16,18 @@ ==================================================================== */ package org.apache.poi.xslf.usermodel; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; + +import org.junit.Test; import org.openxmlformats.schemas.drawingml.x2006.main.CTTextCharacterProperties; /** * @author Yegor Kozlov */ -public class TestXSLFTextBox extends TestCase { +public class TestXSLFTextBox { + @Test public void testPlaceholder() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -40,6 +44,7 @@ public class TestXSLFTextBox extends Tes /** * text box inherits default text proeprties from presentation.xml */ + @Test public void testDefaultTextStyle() { XMLSlideShow ppt = new XMLSlideShow(); XSLFSlide slide = ppt.createSlide(); @@ -55,12 +60,12 @@ public class TestXSLFTextBox extends Tes XSLFTextRun r = shape.getTextParagraphs().get(0).getTextRuns().get(0); assertEquals(1800, pPr.getSz()); - assertEquals(18.0, r.getFontSize()); + assertEquals(18.0, r.getFontSize(), 0); assertEquals("Calibri", r.getFontFamily()); pPr.setSz(900); pPr.getLatin().setTypeface("Arial"); - assertEquals(9.0, r.getFontSize()); + assertEquals(9.0, r.getFontSize(), 0); assertEquals("Arial", r.getFontFamily()); // unset font size in presentation.xml. The value should be taken from master slide @@ -68,12 +73,12 @@ public class TestXSLFTextBox extends Tes ppt.getCTPresentation().getDefaultTextStyle().getLvl1PPr().getDefRPr().unsetSz(); pPr = slide.getSlideMaster().getXmlObject().getTxStyles().getOtherStyle().getLvl1PPr().getDefRPr(); assertEquals(1800, pPr.getSz()); - assertEquals(18.0, r.getFontSize()); + assertEquals(18.0, r.getFontSize(), 0); pPr.setSz(2000); - assertEquals(20.0, r.getFontSize()); + assertEquals(20.0, r.getFontSize(), 0); pPr.unsetSz(); // Should never be - assertEquals(-1.0, r.getFontSize()); + assertEquals(-1.0, r.getFontSize(), 0); } } \ No newline at end of file Modified: poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java?rev=1676365&r1=1676364&r2=1676365&view=diff ============================================================================== --- poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java (original) +++ poi/branches/common_sl/src/ooxml/testcases/org/apache/poi/xslf/usermodel/TestXSLFTextParagraph.java Mon Apr 27 20:13:43 2015 @@ -242,14 +242,14 @@ public class TestXSLFTextParagraph { @Test public void testThemeInheritance(){ XMLSlideShow ppt = XSLFTestDataSamples.openSampleDocument("prProps.pptx"); - XSLFShape[] shapes = ppt.getSlides()[0].getShapes(); - XSLFTextShape sh1 = (XSLFTextShape)shapes[0]; + List<XSLFShape> shapes = ppt.getSlides().get(0).getShapes(); + XSLFTextShape sh1 = (XSLFTextShape)shapes.get(0); assertEquals("Apache", sh1.getText()); assertEquals(TextAlign.CENTER, sh1.getTextParagraphs().get(0).getTextAlign()); - XSLFTextShape sh2 = (XSLFTextShape)shapes[1]; + XSLFTextShape sh2 = (XSLFTextShape)shapes.get(1); assertEquals("Software", sh2.getText()); assertEquals(TextAlign.CENTER, sh2.getTextParagraphs().get(0).getTextAlign()); - XSLFTextShape sh3 = (XSLFTextShape)shapes[2]; + XSLFTextShape sh3 = (XSLFTextShape)shapes.get(2); assertEquals("Foundation", sh3.getText()); assertEquals(TextAlign.CENTER, sh3.getTextParagraphs().get(0).getTextAlign()); } @@ -350,7 +350,7 @@ public class TestXSLFTextParagraph { XSLFTextRun r1 = p.addNewTextRun(); r1.setText("Hello,"); XSLFTextRun r2 = p.addLineBreak(); - assertEquals("\n", r2.getText()); + assertEquals("\n", r2.getRawText()); r2.setFontSize(10.0); assertEquals(10.0, r2.getFontSize(), 0); XSLFTextRun r3 = p.addNewTextRun(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org
