You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2015/04/27 22:13:46 UTC
svn commit: r1676365 [8/9] - in /poi/branches/common_sl/src:
examples/src/org/apache/poi/hslf/examples/
examples/src/org/apache/poi/hssf/usermodel/examples/
examples/src/org/apache/poi/xslf/usermodel/tutorial/
examples/src/org/apache/poi/xssf/usermodel...
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestOleEmbedding.java Mon Apr 27 20:13:43 2015
@@ -18,32 +18,28 @@
package org.apache.poi.hslf.model;
import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
import java.awt.geom.Rectangle2D;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
+import java.io.*;
import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.usermodel.HSLFObjectData;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.*;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.hwpf.HWPFDocument;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.apache.poi.util.IOUtils;
+import org.junit.Test;
-public final class TestOleEmbedding extends TestCase {
+public final class TestOleEmbedding {
private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
/**
* Tests support for OLE objects.
*
* @throws Exception if an error occurs.
*/
+ @Test
public void testOleEmbedding2003() throws Exception {
HSLFSlideShowImpl slideShow = new HSLFSlideShowImpl(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
// Placeholder EMFs for clients that don't support the OLE components.
@@ -59,16 +55,16 @@ public final class TestOleEmbedding exte
//assertDigestEquals("Wrong data for object 2", "b323604b2003a7299c77c2693b641495", objects[1].getData());
}
+ @Test
public void testOLEShape() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("ole2-embedding-2003.ppt"));
- HSLFSlide slide = ppt.getSlides()[0];
- HSLFShape[] sh = slide.getShapes();
+ HSLFSlide slide = ppt.getSlides().get(0);
int cnt = 0;
- for (int i = 0; i < sh.length; i++) {
- if(sh[i] instanceof OLEShape){
+ for (HSLFShape sh : slide.getShapes()) {
+ if(sh instanceof OLEShape){
cnt++;
- OLEShape ole = (OLEShape)sh[i];
+ OLEShape ole = (OLEShape)sh;
HSLFObjectData data = ole.getObjectData();
if("Worksheet".equals(ole.getInstanceName())){
//Voila! we created a workbook from the embedded OLE data
@@ -80,6 +76,7 @@ public final class TestOleEmbedding exte
assertEquals(2, sheet.getRow(2).getCell(0).getNumericCellValue(), 0);
assertEquals(3, sheet.getRow(3).getCell(0).getNumericCellValue(), 0);
assertEquals(8, sheet.getRow(5).getCell(0).getNumericCellValue(), 0);
+ wb.close();
} else if ("Document".equals(ole.getInstanceName())){
//creating a HWPF document
HWPFDocument doc = new HWPFDocument(data.getData());
@@ -92,6 +89,7 @@ public final class TestOleEmbedding exte
assertEquals("Expected 2 OLE shapes", 2, cnt);
}
+ @Test
public void testEmbedding() throws Exception {
HSLFSlideShowImpl _hslfSlideShow = HSLFSlideShowImpl.create();
HSLFSlideShow ppt = new HSLFSlideShow(_hslfSlideShow);
@@ -129,7 +127,7 @@ public final class TestOleEmbedding exte
ppt.write(bos);
ppt = new HSLFSlideShow(new ByteArrayInputStream(bos.toByteArray()));
- OLEShape comp = (OLEShape)ppt.getSlides()[0].getShapes()[0];
+ OLEShape comp = (OLEShape)ppt.getSlides().get(0).getShapes().get(0);
byte compData[] = IOUtils.toByteArray(comp.getObjectData().getData());
bos.reset();
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPFont.java Mon Apr 27 20:13:43 2015
@@ -17,16 +17,20 @@
package org.apache.poi.hslf.model;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.junit.Test;
+
/**
* Test adding fonts to the presenataion resources
*
* @author Yegor Kozlov
*/
-public final class TestPPFont extends TestCase{
+public final class TestPPFont {
+ @Test
public void testCreate() {
HSLFSlideShow ppt = new HSLFSlideShow();
assertEquals(1, ppt.getNumberOfFonts());
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPPGraphics2D.java Mon Apr 27 20:13:43 2015
@@ -17,35 +17,41 @@
package org.apache.poi.hslf.model;
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.POIDataSamples;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.awt.*;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.List;
+
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Before;
+import org.junit.Test;
/**
* Test drawing shapes via Graphics2D
*
* @author Yegor Kozlov
*/
-public final class TestPPGraphics2D extends TestCase {
+public final class TestPPGraphics2D {
private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
private HSLFSlideShow ppt;
+ @Before
protected void setUp() throws Exception {
ppt = new HSLFSlideShow(_slTests.openResourceAsStream("empty.ppt"));
}
+ @Test
public void testGraphics() throws Exception {
// Starts off empty
- assertEquals(0, ppt.getSlides().length);
+ assertTrue(ppt.getSlides().isEmpty());
// Add a slide
HSLFSlide slide = ppt.createSlide();
- assertEquals(1, ppt.getSlides().length);
+ assertEquals(1, ppt.getSlides().size());
// Add some stuff into it
HSLFGroupShape group = new HSLFGroupShape();
@@ -73,17 +79,17 @@ public final class TestPPGraphics2D exte
// And read it back in
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- assertEquals(1, ppt.getSlides().length);
+ assertEquals(1, ppt.getSlides().size());
- slide = ppt.getSlides()[0];
- HSLFShape[] shape = slide.getShapes();
- assertEquals(shape.length, 1); //group shape
+ slide = ppt.getSlides().get(0);
+ List<HSLFShape> shape = slide.getShapes();
+ assertEquals(shape.size(), 1); //group shape
- assertTrue(shape[0] instanceof HSLFGroupShape); //group shape
+ assertTrue(shape.get(0) instanceof HSLFGroupShape); //group shape
- group = (HSLFGroupShape)shape[0];
+ group = (HSLFGroupShape)shape.get(0);
shape = group.getShapes();
- assertEquals(shape.length, 3);
+ assertEquals(shape.size(), 3);
}
}
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestPicture.java Mon Apr 27 20:13:43 2015
@@ -36,8 +36,7 @@ import javax.imageio.ImageIO;
import org.apache.poi.POIDataSamples;
import org.apache.poi.ddf.EscherBSERecord;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.*;
import org.apache.poi.util.JvmBugs;
import org.junit.Ignore;
import org.junit.Test;
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSetBoldItalic.java Mon Apr 27 20:13:43 2015
@@ -17,24 +17,25 @@
package org.apache.poi.hslf.model;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Test;
/**
* Test setting text properties of newly added TextBoxes
*
* @author Yegor Kozlov
*/
-public final class TestSetBoldItalic extends TestCase {
+public final class TestSetBoldItalic {
/**
* Verify that we can add TextBox shapes to a slide
* and set some of the style attributes
*/
+ @Test
public void testTextBoxWrite() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow();
HSLFSlide sl = ppt.createSlide();
@@ -44,7 +45,7 @@ public final class TestSetBoldItalic ext
// Create a new textbox, and give it lots of properties
HSLFTextBox txtbox = new HSLFTextBox();
- rt = txtbox.getTextParagraph().getRichTextRuns()[0];
+ rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
txtbox.setText(val);
rt.setFontSize(42);
rt.setBold(true);
@@ -53,9 +54,9 @@ public final class TestSetBoldItalic ext
sl.addShape(txtbox);
// Check it before save
- rt = txtbox.getTextParagraph().getRichTextRuns()[0];
- assertEquals(val, rt.getText());
- assertEquals(42, rt.getFontSize());
+ rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
+ assertEquals(val, rt.getRawText());
+ assertEquals(42, rt.getFontSize(), 0);
assertTrue(rt.isBold());
assertTrue(rt.isItalic());
@@ -65,14 +66,14 @@ public final class TestSetBoldItalic ext
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- sl = ppt.getSlides()[0];
+ sl = ppt.getSlides().get(0);
- txtbox = (HSLFTextBox)sl.getShapes()[0];
- rt = txtbox.getTextParagraph().getRichTextRuns()[0];
+ txtbox = (HSLFTextBox)sl.getShapes().get(0);
+ rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
// Check after save
- assertEquals(val, rt.getText());
- assertEquals(42, rt.getFontSize());
+ assertEquals(val, rt.getRawText());
+ assertEquals(42, rt.getFontSize(), 0);
assertTrue(rt.isBold());
assertTrue(rt.isItalic());
assertFalse(rt.isUnderlined());
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java Mon Apr 27 20:13:43 2015
@@ -17,30 +17,18 @@
package org.apache.poi.hslf.model;
-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 java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Rectangle;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import static org.junit.Assert.*;
+
+import java.awt.*;
+import java.io.*;
import java.util.ArrayList;
+import java.util.List;
import org.apache.poi.POIDataSamples;
-import org.apache.poi.ddf.EscherDgRecord;
-import org.apache.poi.ddf.EscherDggRecord;
-import org.apache.poi.ddf.EscherOptRecord;
-import org.apache.poi.ddf.EscherProperties;
-import org.apache.poi.ddf.EscherSimpleProperty;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.ddf.*;
+import org.apache.poi.hslf.usermodel.*;
import org.apache.poi.sl.usermodel.ShapeType;
+import org.apache.poi.sl.usermodel.StrokeStyle.LineDash;
import org.junit.Before;
import org.junit.Test;
@@ -77,7 +65,7 @@ public final class TestShapes {
java.awt.Rectangle lineAnchor = new java.awt.Rectangle(100, 200, 50, 60);
line.setAnchor(lineAnchor);
line.setLineWidth(3);
- line.setLineStyle(Line.PEN_DASH);
+ line.setLineDashing(LineDash.DASH);
line.setLineColor(Color.red);
slide.addShape(line);
@@ -85,7 +73,7 @@ public final class TestShapes {
java.awt.Rectangle ellipseAnchor = new Rectangle(320, 154, 55, 111);
ellipse.setAnchor(ellipseAnchor);
ellipse.setLineWidth(2);
- ellipse.setLineStyle(Line.PEN_SOLID);
+ ellipse.setLineDashing(LineDash.SOLID);
ellipse.setLineColor(Color.green);
ellipse.setFillColor(Color.lightGray);
slide.addShape(ellipse);
@@ -97,17 +85,17 @@ public final class TestShapes {
//read ppt from byte array
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- assertEquals(1, ppt.getSlides().length);
+ assertEquals(1, ppt.getSlides().size());
- slide = ppt.getSlides()[0];
- HSLFShape[] shape = slide.getShapes();
- assertEquals(2, shape.length);
+ slide = ppt.getSlides().get(0);
+ List<HSLFShape> shape = slide.getShapes();
+ assertEquals(2, shape.size());
- assertTrue(shape[0] instanceof Line); //group shape
- assertEquals(lineAnchor, shape[0].getAnchor()); //group shape
+ assertTrue(shape.get(0) instanceof Line); //group shape
+ assertEquals(lineAnchor, shape.get(0).getAnchor()); //group shape
- assertTrue(shape[1] instanceof HSLFAutoShape); //group shape
- assertEquals(ellipseAnchor, shape[1].getAnchor()); //group shape
+ assertTrue(shape.get(1) instanceof HSLFAutoShape); //group shape
+ assertEquals(ellipseAnchor, shape.get(1).getAnchor()); //group shape
}
/**
@@ -117,31 +105,30 @@ public final class TestShapes {
@Test
public void textBoxRead() throws Exception {
ppt = new HSLFSlideShow(_slTests.openResourceAsStream("with_textbox.ppt"));
- HSLFSlide sl = ppt.getSlides()[0];
- HSLFShape[] sh = sl.getShapes();
- for (int i = 0; i < sh.length; i++) {
- assertTrue(sh[i] instanceof HSLFTextBox);
- HSLFTextBox txtbox = (HSLFTextBox)sh[i];
+ HSLFSlide sl = ppt.getSlides().get(0);
+ for (HSLFShape sh : sl.getShapes()) {
+ assertTrue(sh instanceof HSLFTextBox);
+ HSLFTextBox txtbox = (HSLFTextBox)sh;
String text = txtbox.getText();
assertNotNull(text);
- assertEquals(txtbox.getTextParagraph().getRichTextRuns().length, 1);
- HSLFTextRun rt = txtbox.getTextParagraph().getRichTextRuns()[0];
+ assertEquals(txtbox.getTextParagraphs().get(0).getTextRuns().size(), 1);
+ HSLFTextRun rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
if (text.equals("Hello, World!!!")){
- assertEquals(32, rt.getFontSize());
+ assertEquals(32, rt.getFontSize(), 0);
assertTrue(rt.isBold());
assertTrue(rt.isItalic());
} else if (text.equals("I am just a poor boy")){
- assertEquals(44, rt.getFontSize());
+ assertEquals(44, rt.getFontSize(), 0);
assertTrue(rt.isBold());
} else if (text.equals("This is Times New Roman")){
- assertEquals(16, rt.getFontSize());
+ assertEquals(16, rt.getFontSize(), 0);
assertTrue(rt.isBold());
assertTrue(rt.isItalic());
assertTrue(rt.isUnderlined());
} else if (text.equals("Plain Text")){
- assertEquals(18, rt.getFontSize());
+ assertEquals(18, rt.getFontSize(), 0);
}
}
}
@@ -160,7 +147,7 @@ public final class TestShapes {
// Create a new textbox, and give it lots of properties
HSLFTextBox txtbox = new HSLFTextBox();
- rt = txtbox.getTextParagraph().getRichTextRuns()[0];
+ rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
txtbox.setText(val);
rt.setFontName("Arial");
rt.setFontSize(42);
@@ -171,13 +158,13 @@ public final class TestShapes {
sl.addShape(txtbox);
// Check it before save
- rt = txtbox.getTextParagraph().getRichTextRuns()[0];
- assertEquals(val, rt.getText());
- assertEquals(42, rt.getFontSize());
+ rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
+ assertEquals(val, rt.getRawText());
+ assertEquals(42, rt.getFontSize(), 0);
assertTrue(rt.isBold());
assertTrue(rt.isItalic());
assertFalse(rt.isUnderlined());
- assertEquals("Arial", rt.getFontName());
+ assertEquals("Arial", rt.getFontFamily());
assertEquals(Color.red, rt.getFontColor());
// Serialize and read again
@@ -186,18 +173,18 @@ public final class TestShapes {
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- sl = ppt.getSlides()[0];
+ sl = ppt.getSlides().get(0);
- txtbox = (HSLFTextBox)sl.getShapes()[0];
- rt = txtbox.getTextParagraph().getRichTextRuns()[0];
+ txtbox = (HSLFTextBox)sl.getShapes().get(0);
+ rt = txtbox.getTextParagraphs().get(0).getTextRuns().get(0);
// Check after save
- assertEquals(val, rt.getText());
- assertEquals(42, rt.getFontSize());
+ assertEquals(val, rt.getRawText());
+ assertEquals(42, rt.getFontSize(), 0);
assertTrue(rt.isBold());
assertTrue(rt.isItalic());
assertFalse(rt.isUnderlined());
- assertEquals("Arial", rt.getFontName());
+ assertEquals("Arial", rt.getFontFamily());
assertEquals(Color.red, rt.getFontColor());
}
@@ -206,13 +193,13 @@ public final class TestShapes {
*/
@Test
public void emptyTextBox() {
- assertEquals(2, pptB.getSlides().length);
- HSLFSlide s1 = pptB.getSlides()[0];
- HSLFSlide s2 = pptB.getSlides()[1];
+ assertEquals(2, pptB.getSlides().size());
+ HSLFSlide s1 = pptB.getSlides().get(0);
+ HSLFSlide s2 = pptB.getSlides().get(1);
// Check we can get the shapes count
- assertEquals(2, s1.getShapes().length);
- assertEquals(2, s2.getShapes().length);
+ assertEquals(2, s1.getShapes().size());
+ assertEquals(2, s2.getShapes().size());
}
/**
@@ -231,19 +218,20 @@ public final class TestShapes {
private void textBoxSet(String filename) throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream(filename));
- HSLFSlide[] sl = ppt.getSlides();
- for (int k = 0; k < sl.length; k++) {
+ for (HSLFSlide sld : ppt.getSlides()) {
ArrayList<String> lst1 = new ArrayList<String>();
- HSLFTextParagraph[] txt = sl[k].getTextRuns();
- for (int i = 0; i < txt.length; i++) {
- lst1.add(txt[i].getText());
+ for (List<HSLFTextParagraph> txt : sld.getTextParagraphs()) {
+ for (HSLFTextParagraph p : txt) {
+ for (HSLFTextRun r : p) {
+ lst1.add(r.getRawText());
+ }
+ }
}
ArrayList<String> lst2 = new ArrayList<String>();
- HSLFShape[] sh = sl[k].getShapes();
- for (int i = 0; i < sh.length; i++) {
- if (sh[i] instanceof HSLFTextShape){
- HSLFTextShape tbox = (HSLFTextShape)sh[i];
+ for (HSLFShape sh : sld.getShapes()) {
+ if (sh instanceof HSLFTextShape){
+ HSLFTextShape tbox = (HSLFTextShape)sh;
lst2.add(tbox.getText());
}
}
@@ -285,22 +273,22 @@ public final class TestShapes {
ppt = new HSLFSlideShow(is);
is.close();
- slide = ppt.getSlides()[0];
+ slide = ppt.getSlides().get(0);
- HSLFShape[] shape = slide.getShapes();
- assertEquals(1, shape.length);
- assertTrue(shape[0] instanceof HSLFGroupShape);
-
- group = (HSLFGroupShape)shape[0];
- HSLFShape[] grshape = group.getShapes();
- assertEquals(2, grshape.length);
- assertTrue(grshape[0] instanceof HSLFPictureShape);
- assertTrue(grshape[1] instanceof Line);
+ List<HSLFShape> shape = slide.getShapes();
+ assertEquals(1, shape.size());
+ assertTrue(shape.get(0) instanceof HSLFGroupShape);
+
+ group = (HSLFGroupShape)shape.get(0);
+ List<HSLFShape> grshape = group.getShapes();
+ assertEquals(2, grshape.size());
+ assertTrue(grshape.get(0) instanceof HSLFPictureShape);
+ assertTrue(grshape.get(1) instanceof Line);
- pict = (HSLFPictureShape)grshape[0];
+ pict = (HSLFPictureShape)grshape.get(0);
assertEquals(new Rectangle(0, 0, 200, 200), pict.getAnchor());
- line = (Line)grshape[1];
+ line = (Line)grshape.get(1);
assertEquals(new Rectangle(300, 300, 500, 0), line.getAnchor());
}
@@ -311,16 +299,16 @@ public final class TestShapes {
public void removeShapes() throws IOException {
String file = "with_textbox.ppt";
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream(file));
- HSLFSlide sl = ppt.getSlides()[0];
- HSLFShape[] sh = sl.getShapes();
- assertEquals("expected four shaped in " + file, 4, sh.length);
+ HSLFSlide sl = ppt.getSlides().get(0);
+ List<HSLFShape> sh = sl.getShapes();
+ assertEquals("expected four shaped in " + file, 4, sh.size());
//remove all
- for (int i = 0; i < sh.length; i++) {
- boolean ok = sl.removeShape(sh[i]);
+ for (int i = 0; i < sh.size(); i++) {
+ boolean ok = sl.removeShape(sh.get(i));
assertTrue("Failed to delete shape #" + i, ok);
}
//now Slide.getShapes() should return an empty array
- assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().length);
+ assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().size());
//serialize and read again. The file should be readable and contain no shapes
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -328,8 +316,8 @@ public final class TestShapes {
out.close();
ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
- sl = ppt.getSlides()[0];
- assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().length);
+ sl = ppt.getSlides().get(0);
+ assertEquals("expected 0 shaped in " + file, 0, sl.getShapes().size());
}
@Test
@@ -400,24 +388,24 @@ public final class TestShapes {
@Test
public void lineColor() throws IOException {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("51731.ppt"));
- HSLFShape[] shape = ppt.getSlides()[0].getShapes();
+ List<HSLFShape> shape = ppt.getSlides().get(0).getShapes();
- assertEquals(4, shape.length);
+ assertEquals(4, shape.size());
- HSLFTextShape sh1 = (HSLFTextShape)shape[0];
+ HSLFTextShape sh1 = (HSLFTextShape)shape.get(0);
assertEquals("Hello Apache POI", sh1.getText());
assertNull(sh1.getLineColor());
- HSLFTextShape sh2 = (HSLFTextShape)shape[1];
+ HSLFTextShape sh2 = (HSLFTextShape)shape.get(1);
assertEquals("Why are you showing this border?", sh2.getText());
assertNull(sh2.getLineColor());
- HSLFTextShape sh3 = (HSLFTextShape)shape[2];
+ HSLFTextShape sh3 = (HSLFTextShape)shape.get(2);
assertEquals("Text in a black border", sh3.getText());
assertEquals(Color.black, sh3.getLineColor());
assertEquals(0.75, sh3.getLineWidth(), 0);
- HSLFTextShape sh4 = (HSLFTextShape)shape[3];
+ HSLFTextShape sh4 = (HSLFTextShape)shape.get(3);
assertEquals("Border width is 5 pt", sh4.getText());
assertEquals(Color.black, sh4.getLineColor());
assertEquals(5.0, sh4.getLineWidth(), 0);
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSheet.java Mon Apr 27 20:13:43 2015
@@ -17,14 +17,17 @@
package org.apache.poi.hslf.model;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import java.util.List;
+
+import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
import org.apache.poi.hslf.record.ColorSchemeAtom;
import org.apache.poi.hslf.record.PPDrawing;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Test;
/**
* Test common functionality of the <code>Sheet</code> object.
@@ -32,12 +35,13 @@ import org.apache.poi.POIDataSamples;
*
* @author Yegor Kozlov
*/
-public final class TestSheet extends TestCase {
+public final class TestSheet {
private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
/**
* For each ppt in the test directory check that all sheets are properly initialized
*/
+ @Test
public void testSheet() throws Exception {
String[] tests = {"SampleShow.ppt", "backgrounds.ppt", "text_shapes.ppt", "pictures.ppt"};
for (String file : tests) {
@@ -51,14 +55,13 @@ public final class TestSheet extends Tes
}
private void doSlideShow(HSLFSlideShow ppt) {
- HSLFSlide[] slide = ppt.getSlides();
- for (int i = 0; i < slide.length; i++) {
- verify(slide[i]);
+ for (HSLFSlide slide : ppt.getSlides()) {
+ verify(slide);
- HSLFNotes notes = slide[i].getNotesSheet();
+ HSLFNotes notes = slide.getNotes();
if(notes != null) verify(notes);
- HSLFMasterSheet master = slide[i].getMasterSheet();
+ HSLFMasterSheet master = slide.getMasterSheet();
assertNotNull(master);
verify(master);
}
@@ -79,23 +82,19 @@ public final class TestSheet extends Tes
assertTrue(sheet._getSheetNumber() != 0);
assertTrue(sheet._getSheetRefId() != 0);
- HSLFTextParagraph[] txt = sheet.getTextRuns();
- if (txt == null) {
- throw new AssertionFailedError("no text runs");
- }
- for (int i = 0; i < txt.length; i++) {
- assertNotNull(txt[i].getSheet());
+ List<HSLFTextParagraph> txt = sheet.getTextParagraphs();
+ assertTrue("no text runs", txt != null && !txt.isEmpty());
+ for (HSLFTextParagraph t : txt) {
+ assertNotNull(t.getSheet());
}
- HSLFShape[] shape = sheet.getShapes();
- if (shape == null) {
- throw new AssertionFailedError("no shapes");
- }
- for (int i = 0; i < shape.length; i++) {
- assertNotNull(shape[i].getSpContainer());
- assertNotNull(shape[i].getSheet());
- assertNotNull(shape[i].getShapeName());
- assertNotNull(shape[i].getAnchor());
+ List<HSLFShape> shape = sheet.getShapes();
+ assertTrue("no shapes", shape != null && !shape.isEmpty());
+ for (HSLFShape s : shape) {
+ assertNotNull(s.getSpContainer());
+ assertNotNull(s.getSheet());
+ assertNotNull(s.getShapeName());
+ assertNotNull(s.getAnchor());
}
}
}
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java Mon Apr 27 20:13:43 2015
@@ -18,29 +18,33 @@
package org.apache.poi.hslf.model;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-import org.apache.poi.hslf.record.SlideAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.record.SlideAtom;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests that changing a slide's idea of what notes sheet is its works right
*
* @author Nick Burch (nick at torchbox dot com)
*/
-public final class TestSlideChangeNotes extends TestCase {
+public final class TestSlideChangeNotes {
// SlideShow primed on the test data
private HSLFSlideShow ss;
- public TestSlideChangeNotes() throws Exception {
+ @Before
+ public void init() throws Exception {
POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
HSLFSlideShowImpl hss = new HSLFSlideShowImpl(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
ss = new HSLFSlideShow(hss);
}
+ @Test
public void testSetToNone() {
- HSLFSlide slideOne = ss.getSlides()[0];
+ HSLFSlide slideOne = ss.getSlides().get(0);
SlideAtom sa = slideOne.getSlideRecord().getSlideAtom();
slideOne.setNotes(null);
@@ -48,9 +52,10 @@ public final class TestSlideChangeNotes
assertEquals(0, sa.getNotesID());
}
+ @Test
public void testSetToSomething() {
- HSLFSlide slideOne = ss.getSlides()[0];
- HSLFNotes notesOne = ss.getNotes()[1];
+ HSLFSlide slideOne = ss.getSlides().get(0);
+ HSLFNotes notesOne = ss.getNotes().get(1);
SlideAtom sa = slideOne.getSlideRecord().getSlideAtom();
slideOne.setNotes(notesOne);
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideMaster.java Mon Apr 27 20:13:43 2015
@@ -17,63 +17,66 @@
package org.apache.poi.hslf.model;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.util.List;
-import junit.framework.TestCase;
-
+import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.model.textproperties.CharFlagsTextProp;
import org.apache.poi.hslf.record.Environment;
import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Test;
/**
* Tests for SlideMaster
*
* @author Yegor Kozlov
*/
-public final class TestSlideMaster extends TestCase{
+public final class TestSlideMaster {
private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
/**
* The reference ppt has two masters.
* Check we can read their attributes.
*/
+ @Test
public void testSlideMaster() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
Environment env = ppt.getDocumentRecord().getEnvironment();
- SlideMaster[] master = ppt.getSlidesMasters();
- assertEquals(2, master.length);
+ List<HSLFSlideMaster> master = ppt.getSlideMasters();
+ assertEquals(2, master.size());
//character attributes
- assertEquals(40, master[0].getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.size", true).getValue());
- assertEquals(48, master[1].getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.size", true).getValue());
+ assertEquals(40, master.get(0).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.size", true).getValue());
+ assertEquals(48, master.get(1).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.size", true).getValue());
- int font1 = master[0].getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.index", true).getValue();
- int font2 = master[1].getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.index", true).getValue();
+ int font1 = master.get(0).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.index", true).getValue();
+ int font2 = master.get(1).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "font.index", true).getValue();
assertEquals("Arial", env.getFontCollection().getFontWithId(font1));
assertEquals("Georgia", env.getFontCollection().getFontWithId(font2));
- CharFlagsTextProp prop1 = (CharFlagsTextProp)master[0].getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "char_flags", true);
+ CharFlagsTextProp prop1 = (CharFlagsTextProp)master.get(0).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "char_flags", true);
assertEquals(false, prop1.getSubValue(CharFlagsTextProp.BOLD_IDX));
assertEquals(false, prop1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
assertEquals(true, prop1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
- CharFlagsTextProp prop2 = (CharFlagsTextProp)master[1].getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "char_flags", true);
+ CharFlagsTextProp prop2 = (CharFlagsTextProp)master.get(1).getStyleAttribute(TextHeaderAtom.TITLE_TYPE, 0, "char_flags", true);
assertEquals(false, prop2.getSubValue(CharFlagsTextProp.BOLD_IDX));
assertEquals(true, prop2.getSubValue(CharFlagsTextProp.ITALIC_IDX));
assertEquals(false, prop2.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
//now paragraph attributes
- assertEquals(0x266B, master[0].getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.char", false).getValue());
- assertEquals(0x2022, master[1].getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.char", false).getValue());
+ assertEquals(0x266B, master.get(0).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.char", false).getValue());
+ assertEquals(0x2022, master.get(1).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.char", false).getValue());
- int b1 = master[0].getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.font", false).getValue();
- int b2 = master[1].getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.font", false).getValue();
+ int b1 = master.get(0).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.font", false).getValue();
+ int b2 = master.get(1).getStyleAttribute(TextHeaderAtom.BODY_TYPE, 0, "bullet.font", false).getValue();
assertEquals("Arial", env.getFontCollection().getFontWithId(b1));
assertEquals("Georgia", env.getFontCollection().getFontWithId(b2));
}
@@ -81,19 +84,20 @@ public final class TestSlideMaster exten
/**
* Test we can read default text attributes for a title master sheet
*/
+ @Test
public void testTitleMasterTextAttributes() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
- TitleMaster[] master = ppt.getTitleMasters();
- assertEquals(1, master.length);
+ List<HSLFTitleMaster> master = ppt.getTitleMasters();
+ assertEquals(1, master.size());
- assertEquals(32, master[0].getStyleAttribute(TextHeaderAtom.CENTER_TITLE_TYPE, 0, "font.size", true).getValue());
- CharFlagsTextProp prop1 = (CharFlagsTextProp)master[0].getStyleAttribute(TextHeaderAtom.CENTER_TITLE_TYPE, 0, "char_flags", true);
+ assertEquals(32, master.get(0).getStyleAttribute(TextHeaderAtom.CENTER_TITLE_TYPE, 0, "font.size", true).getValue());
+ CharFlagsTextProp prop1 = (CharFlagsTextProp)master.get(0).getStyleAttribute(TextHeaderAtom.CENTER_TITLE_TYPE, 0, "char_flags", true);
assertEquals(true, prop1.getSubValue(CharFlagsTextProp.BOLD_IDX));
assertEquals(false, prop1.getSubValue(CharFlagsTextProp.ITALIC_IDX));
assertEquals(true, prop1.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
- assertEquals(20, master[0].getStyleAttribute(TextHeaderAtom.CENTRE_BODY_TYPE, 0, "font.size", true).getValue());
- CharFlagsTextProp prop2 = (CharFlagsTextProp)master[0].getStyleAttribute(TextHeaderAtom.CENTRE_BODY_TYPE, 0, "char_flags", true);
+ assertEquals(20, master.get(0).getStyleAttribute(TextHeaderAtom.CENTRE_BODY_TYPE, 0, "font.size", true).getValue());
+ CharFlagsTextProp prop2 = (CharFlagsTextProp)master.get(0).getStyleAttribute(TextHeaderAtom.CENTRE_BODY_TYPE, 0, "char_flags", true);
assertEquals(true, prop2.getSubValue(CharFlagsTextProp.BOLD_IDX));
assertEquals(false, prop2.getSubValue(CharFlagsTextProp.ITALIC_IDX));
assertEquals(false, prop2.getSubValue(CharFlagsTextProp.UNDERLINE_IDX));
@@ -102,25 +106,26 @@ public final class TestSlideMaster exten
/**
* Slide 3 has title layout and follows the TitleMaster. Verify that.
*/
+ @Test
public void testTitleMaster() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
- HSLFSlide slide = ppt.getSlides()[2];
+ HSLFSlide slide = ppt.getSlides().get(2);
HSLFMasterSheet masterSheet = slide.getMasterSheet();
- assertTrue(masterSheet instanceof TitleMaster);
+ assertTrue(masterSheet instanceof HSLFTitleMaster);
- HSLFTextParagraph[] txt = slide.getTextRuns();
- for (int i = 0; i < txt.length; i++) {
- HSLFTextRun rt = txt[i].getRichTextRuns()[0];
- switch(txt[i].getRunType()){
+ List<HSLFTextParagraph> txt = slide.getTextParagraphs();
+ for (int i = 0; i < txt.size(); i++) {
+ HSLFTextRun rt = txt.get(i).getTextRuns().get(0);
+ switch(txt.get(i).getRunType()){
case TextHeaderAtom.CENTER_TITLE_TYPE:
- assertEquals("Arial", rt.getFontName());
- assertEquals(32, rt.getFontSize());
+ assertEquals("Arial", rt.getFontFamily());
+ assertEquals(32, rt.getFontSize(), 0);
assertEquals(true, rt.isBold());
assertEquals(true, rt.isUnderlined());
break;
case TextHeaderAtom.CENTRE_BODY_TYPE:
- assertEquals("Courier New", rt.getFontName());
- assertEquals(20, rt.getFontSize());
+ assertEquals("Courier New", rt.getFontFamily());
+ assertEquals(20, rt.getFontSize(), 0);
assertEquals(true, rt.isBold());
assertEquals(false, rt.isUnderlined());
break;
@@ -131,47 +136,44 @@ public final class TestSlideMaster exten
/**
* If a style attribute is not set ensure it is read from the master
*/
+ @Test
public void testMasterAttributes() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
- HSLFSlide[] slide = ppt.getSlides();
- assertEquals(3, slide.length);
- HSLFTextParagraph[] trun;
-
- trun = slide[0].getTextRuns();
- for (int i = 0; i < trun.length; i++) {
- if (trun[i].getRunType() == TextHeaderAtom.TITLE_TYPE){
- HSLFTextRun rt = trun[i].getRichTextRuns()[0];
- assertEquals(40, rt.getFontSize());
+ List<HSLFSlide> slide = ppt.getSlides();
+ assertEquals(3, slide.size());
+ for (HSLFTextParagraph trun : slide.get(0).getTextParagraphs()) {
+ if (trun.getRunType() == TextHeaderAtom.TITLE_TYPE){
+ HSLFTextRun rt = trun.getTextRuns().get(0);
+ assertEquals(40, rt.getFontSize(), 0);
assertEquals(true, rt.isUnderlined());
- assertEquals("Arial", rt.getFontName());
- } else if (trun[i].getRunType() == TextHeaderAtom.BODY_TYPE){
- HSLFTextRun rt;
- rt = trun[i].getRichTextRuns()[0];
- assertEquals(0, rt.getIndentLevel());
- assertEquals(32, rt.getFontSize());
- assertEquals("Arial", rt.getFontName());
-
- rt = trun[i].getRichTextRuns()[1];
- assertEquals(1, rt.getIndentLevel());
- assertEquals(28, rt.getFontSize());
- assertEquals("Arial", rt.getFontName());
+ assertEquals("Arial", rt.getFontFamily());
+ } else if (trun.getRunType() == TextHeaderAtom.BODY_TYPE){
+ HSLFTextRun rt = trun.getTextRuns().get(0);
+ assertEquals(0, trun.getIndentLevel());
+ assertEquals(32, rt.getFontSize(), 0);
+ assertEquals("Arial", rt.getFontFamily());
+
+ rt = trun.getTextRuns().get(1);
+ assertEquals(1, trun.getIndentLevel());
+ assertEquals(28, rt.getFontSize(), 0);
+ assertEquals("Arial", rt.getFontFamily());
}
}
- trun = slide[1].getTextRuns();
- for (int i = 0; i < trun.length; i++) {
- if (trun[i].getRunType() == TextHeaderAtom.TITLE_TYPE){
- HSLFTextRun rt = trun[i].getRichTextRuns()[0];
- assertEquals(48, rt.getFontSize());
+ ;
+ for (HSLFTextParagraph trun : slide.get(1).getTextParagraphs()) {
+ if (trun.getRunType() == TextHeaderAtom.TITLE_TYPE){
+ HSLFTextRun rt = trun.getTextRuns().get(0);
+ assertEquals(48, rt.getFontSize(), 0);
assertEquals(true, rt.isItalic());
- assertEquals("Georgia", rt.getFontName());
- } else if (trun[i].getRunType() == TextHeaderAtom.BODY_TYPE){
+ assertEquals("Georgia", rt.getFontFamily());
+ } else if (trun.getRunType() == TextHeaderAtom.BODY_TYPE){
HSLFTextRun rt;
- rt = trun[i].getRichTextRuns()[0];
- assertEquals(0, rt.getIndentLevel());
- assertEquals(32, rt.getFontSize());
- assertEquals("Courier New", rt.getFontName());
+ rt = trun.getTextRuns().get(0);
+ assertEquals(0, trun.getIndentLevel());
+ assertEquals(32, rt.getFontSize(), 0);
+ assertEquals("Courier New", rt.getFontFamily());
}
}
@@ -180,20 +182,21 @@ public final class TestSlideMaster exten
/**
* Check we can dynamically assign a slide master to a slide.
*/
+ @Test
public void testChangeSlideMaster() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
- SlideMaster[] master = ppt.getSlidesMasters();
- HSLFSlide[] slide = ppt.getSlides();
+ List<HSLFSlideMaster> master = ppt.getSlideMasters();
+ List<HSLFSlide> slide = ppt.getSlides();
int sheetNo;
//each slide uses its own master
- assertEquals(slide[0].getMasterSheet()._getSheetNumber(), master[0]._getSheetNumber());
- assertEquals(slide[1].getMasterSheet()._getSheetNumber(), master[1]._getSheetNumber());
+ assertEquals(slide.get(0).getMasterSheet()._getSheetNumber(), master.get(0)._getSheetNumber());
+ assertEquals(slide.get(1).getMasterSheet()._getSheetNumber(), master.get(1)._getSheetNumber());
//all slides use the first master slide
- sheetNo = master[0]._getSheetNumber();
- for (int i = 0; i < slide.length; i++) {
- slide[i].setMasterSheet(master[0]);
+ sheetNo = master.get(0)._getSheetNumber();
+ for (HSLFSlide s : slide) {
+ s.setMasterSheet(master.get(0));
}
ByteArrayOutputStream out;
@@ -203,10 +206,10 @@ public final class TestSlideMaster exten
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- master = ppt.getSlidesMasters();
+ master = ppt.getSlideMasters();
slide = ppt.getSlides();
- for (int i = 0; i < slide.length; i++) {
- assertEquals(sheetNo, slide[i].getMasterSheet()._getSheetNumber());
+ for (HSLFSlide s : slide) {
+ assertEquals(sheetNo, s.getMasterSheet()._getSheetNumber());
}
}
@@ -214,33 +217,22 @@ public final class TestSlideMaster exten
* Varify we can read attrubutes for different identtation levels.
* (typical for the "bullted body" placeholder)
*/
+ @Test
public void testIndentation() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("slide_master.ppt"));
- HSLFSlide slide = ppt.getSlides()[0];
- HSLFTextParagraph[] trun;
-
- trun = slide.getTextRuns();
- for (int i = 0; i < trun.length; i++) {
- if (trun[i].getRunType() == TextHeaderAtom.TITLE_TYPE){
- HSLFTextRun rt = trun[i].getRichTextRuns()[0];
- assertEquals(40, rt.getFontSize());
+ HSLFSlide slide = ppt.getSlides().get(0);
+
+ for (HSLFTextParagraph trun : slide.getTextParagraphs()) {
+ if (trun.getRunType() == TextHeaderAtom.TITLE_TYPE){
+ HSLFTextRun rt = trun.getTextRuns().get(0);
+ assertEquals(40, rt.getFontSize(), 0);
assertEquals(true, rt.isUnderlined());
- assertEquals("Arial", rt.getFontName());
- } else if (trun[i].getRunType() == TextHeaderAtom.BODY_TYPE){
- HSLFTextRun[] rt = trun[i].getRichTextRuns();
- for (int j = 0; j < rt.length; j++) {
- int indent = rt[j].getIndentLevel();
- switch (indent){
- case 0:
- assertEquals(32, rt[j].getFontSize());
- break;
- case 1:
- assertEquals(28, rt[j].getFontSize());
- break;
- case 2:
- assertEquals(24, rt[j].getFontSize());
- break;
- }
+ assertEquals("Arial", rt.getFontFamily());
+ } else if (trun.getRunType() == TextHeaderAtom.BODY_TYPE){
+ int indents[] = { 32, 28, 24 };
+ for (HSLFTextRun rt : trun.getTextRuns()) {
+ int indent = trun.getIndentLevel();
+ assertEquals(indents[indent], rt.getFontSize(), 0);
}
}
}
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java Mon Apr 27 20:13:43 2015
@@ -17,13 +17,15 @@
package org.apache.poi.hslf.model;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.POIDataSamples;
-
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+
+import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Test;
/**
* Test adding new slides to a ppt.
@@ -32,18 +34,19 @@ import java.io.ByteArrayInputStream;
* stuff does
* @author Yegor Kozlov
*/
-public final class TestSlides extends TestCase {
+public final class TestSlides {
/**
* Add 1 slide to an empty ppt.
* @throws Exception
*/
+ @Test
public void testAddSlides1() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl( TestSlides.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt") ));
- assertTrue(ppt.getSlides().length == 0);
+ assertTrue(ppt.getSlides().isEmpty());
HSLFSlide s1 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 1);
+ assertEquals(1, ppt.getSlides().size());
assertEquals(3, s1._getSheetRefId());
assertEquals(256, s1._getSheetNumber());
assertEquals(1, s1.getSlideNumber());
@@ -54,60 +57,62 @@ public final class TestSlides extends Te
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- assertTrue(ppt.getSlides().length == 1);
+ assertEquals(1, ppt.getSlides().size());
}
/**
* Add 2 slides to an empty ppt
* @throws Exception
*/
+ @Test
public void testAddSlides2() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl( TestSlides.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt") ));
- assertTrue(ppt.getSlides().length == 0);
+ assertTrue(ppt.getSlides().isEmpty());
HSLFSlide s1 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 1);
+ assertEquals(1, ppt.getSlides().size());
assertEquals(3, s1._getSheetRefId());
assertEquals(256, s1._getSheetNumber());
assertEquals(1, s1.getSlideNumber());
HSLFSlide s2 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 2);
+ assertEquals(2, ppt.getSlides().size());
assertEquals(4, s2._getSheetRefId());
assertEquals(257, s2._getSheetNumber());
assertEquals(2, s2.getSlideNumber());
//serialize and read again
- ByteArrayOutputStream out = new ByteArrayOutputStream();
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
ppt.write(out);
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- assertTrue(ppt.getSlides().length == 2);
+ assertEquals(2, ppt.getSlides().size());
}
/**
* Add 3 slides to an empty ppt
* @throws Exception
*/
+ @Test
public void testAddSlides3() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow(new HSLFSlideShowImpl( TestSlides.class.getResourceAsStream("/org/apache/poi/hslf/data/empty.ppt") ));
- assertTrue(ppt.getSlides().length == 0);
+ assertTrue(ppt.getSlides().isEmpty());
HSLFSlide s1 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 1);
+ assertEquals(1, ppt.getSlides().size());
assertEquals(3, s1._getSheetRefId());
assertEquals(256, s1._getSheetNumber());
assertEquals(1, s1.getSlideNumber());
HSLFSlide s2 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 2);
+ assertEquals(2, ppt.getSlides().size());
assertEquals(4, s2._getSheetRefId());
assertEquals(257, s2._getSheetNumber());
assertEquals(2, s2.getSlideNumber());
HSLFSlide s3 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 3);
+ assertEquals(3, ppt.getSlides().size());
assertEquals(5, s3._getSheetRefId());
assertEquals(258, s3._getSheetNumber());
assertEquals(3, s3.getSlideNumber());
@@ -119,17 +124,17 @@ public final class TestSlides extends Te
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- assertTrue(ppt.getSlides().length == 3);
+ assertEquals(3, ppt.getSlides().size());
// Check IDs are still right
- s1 = ppt.getSlides()[0];
+ s1 = ppt.getSlides().get(0);
assertEquals(256, s1._getSheetNumber());
assertEquals(3, s1._getSheetRefId());
- s2 = ppt.getSlides()[1];
+ s2 = ppt.getSlides().get(1);
assertEquals(257, s2._getSheetNumber());
assertEquals(4, s2._getSheetRefId());
- s3 = ppt.getSlides()[2];;
- assertTrue(ppt.getSlides().length == 3);
+ s3 = ppt.getSlides().get(2);;
+ assertEquals(3, ppt.getSlides().size());
assertEquals(258, s3._getSheetNumber());
assertEquals(5, s3._getSheetRefId());
}
@@ -137,25 +142,26 @@ public final class TestSlides extends Te
/**
* Add slides to ppt which already has two slides
*/
+ @Test
public void testAddSlides2to3() throws Exception {
POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
HSLFSlideShow ppt = new HSLFSlideShow(slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
- assertTrue(ppt.getSlides().length == 2);
+ assertEquals(2, ppt.getSlides().size());
// First slide is 256 / 4
- HSLFSlide s1 = ppt.getSlides()[0];
+ HSLFSlide s1 = ppt.getSlides().get(0);
assertEquals(256, s1._getSheetNumber());
assertEquals(4, s1._getSheetRefId());
// Last slide is 257 / 6
- HSLFSlide s2 = ppt.getSlides()[1];
+ HSLFSlide s2 = ppt.getSlides().get(1);
assertEquals(257, s2._getSheetNumber());
assertEquals(6, s2._getSheetRefId());
// Add another slide, goes in at the end
HSLFSlide s3 = ppt.createSlide();
- assertTrue(ppt.getSlides().length == 3);
+ assertEquals(3, ppt.getSlides().size());
assertEquals(258, s3._getSheetNumber());
assertEquals(8, s3._getSheetRefId());
@@ -166,18 +172,18 @@ public final class TestSlides extends Te
out.close();
ppt = new HSLFSlideShow(new HSLFSlideShowImpl(new ByteArrayInputStream(out.toByteArray())));
- assertTrue(ppt.getSlides().length == 3);
+ assertEquals(3, ppt.getSlides().size());
// Check IDs are still right
- s1 = ppt.getSlides()[0];
+ s1 = ppt.getSlides().get(0);
assertEquals(256, s1._getSheetNumber());
assertEquals(4, s1._getSheetRefId());
- s2 = ppt.getSlides()[1];
+ s2 = ppt.getSlides().get(1);
assertEquals(257, s2._getSheetNumber());
assertEquals(6, s2._getSheetRefId());
- s3 = ppt.getSlides()[2];;
- assertTrue(ppt.getSlides().length == 3);
+ s3 = ppt.getSlides().get(2);
+ assertEquals(3, ppt.getSlides().size());
assertEquals(258, s3._getSheetNumber());
assertEquals(8, s3._getSheetRefId());
}
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTable.java Mon Apr 27 20:13:43 2015
@@ -17,24 +17,27 @@
package org.apache.poi.hslf.model;
+import static org.junit.Assert.*;
+
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-
-import junit.framework.TestCase;
+import java.util.List;
import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Test;
/**
* Test <code>Table</code> object.
*
* @author Yegor Kozlov
*/
-public final class TestTable extends TestCase {
+public final class TestTable {
/**
* Test that ShapeFactory works properly and returns <code>Table</code>
*/
+ @Test
public void testShapeFactory() throws Exception {
HSLFSlideShow ppt = new HSLFSlideShow();
@@ -45,10 +48,10 @@ public final class TestTable extends Tes
TableCell cell = tbl.getCell(0, 0);
//table cells have type=TextHeaderAtom.OTHER_TYPE, see bug #46033
- assertEquals(TextHeaderAtom.OTHER_TYPE, cell.getTextParagraph().getRunType());
+ assertEquals(TextHeaderAtom.OTHER_TYPE, cell.getTextParagraphs().get(0).getRunType());
- assertTrue(slide.getShapes()[0] instanceof Table);
- Table tbl2 = (Table)slide.getShapes()[0];
+ assertTrue(slide.getShapes().get(0) instanceof Table);
+ Table tbl2 = (Table)slide.getShapes().get(0);
assertEquals(tbl.getNumberOfColumns(), tbl2.getNumberOfColumns());
assertEquals(tbl.getNumberOfRows(), tbl2.getNumberOfRows());
@@ -57,9 +60,9 @@ public final class TestTable extends Tes
out.close();
ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
- slide = ppt.getSlides()[0];
- assertTrue(slide.getShapes()[0] instanceof Table);
- Table tbl3 = (Table)slide.getShapes()[0];
+ slide = ppt.getSlides().get(0);
+ assertTrue(slide.getShapes().get(0) instanceof Table);
+ Table tbl3 = (Table)slide.getShapes().get(0);
assertEquals(tbl.getNumberOfColumns(), tbl3.getNumberOfColumns());
assertEquals(tbl.getNumberOfRows(), tbl3.getNumberOfRows());
}
@@ -67,25 +70,27 @@ public final class TestTable extends Tes
/**
* Error constructing Table when rownum=1
*/
+ @Test
public void test45889(){
HSLFSlideShow ppt = new HSLFSlideShow();
HSLFSlide slide = ppt.createSlide();
- HSLFShape[] shapes;
+ List<HSLFShape> shapes;
Table tbl1 = new Table(1, 5);
assertEquals(5, tbl1.getNumberOfColumns());
assertEquals(1, tbl1.getNumberOfRows());
slide.addShape(tbl1);
shapes = slide.getShapes();
- assertEquals(1, shapes.length);
+ assertEquals(1, shapes.size());
- Table tbl2 = (Table)shapes[0];
+ Table tbl2 = (Table)shapes.get(0);
assertSame(tbl1.getSpContainer(), tbl2.getSpContainer());
assertEquals(tbl1.getNumberOfColumns(), tbl2.getNumberOfColumns());
assertEquals(tbl1.getNumberOfRows(), tbl2.getNumberOfRows());
}
+ @Test
public void testIllegalCOnstruction(){
try {
new Table(0, 5);
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRunReWrite.java Mon Apr 27 20:13:43 2015
@@ -17,15 +17,17 @@
package org.apache.poi.hslf.model;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
-import java.io.*;
-
-import org.apache.poi.hslf.usermodel.HSLFTextRun;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
-import org.apache.poi.poifs.filesystem.*;
import org.apache.poi.POIDataSamples;
+import org.apache.poi.hslf.usermodel.*;
+import org.apache.poi.poifs.filesystem.DocumentEntry;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.junit.Before;
+import org.junit.Test;
/**
* Tests that if we load something up, get a TextRun, set the text
@@ -34,7 +36,7 @@ import org.apache.poi.POIDataSamples;
*
* @author Nick Burch (nick at torchbox dot com)
*/
-public final class TestTextRunReWrite extends TestCase {
+public final class TestTextRunReWrite {
// HSLFSlideShow primed on the test data
private HSLFSlideShowImpl hss;
// HSLFSlideShow primed on the test data
@@ -45,6 +47,7 @@ public final class TestTextRunReWrite ex
/**
* Load up a test PPT file with rich data
*/
+ @Before
public void setUp() throws Exception {
POIDataSamples slTests = POIDataSamples.getSlideShowInstance();
String filename = "Single_Coloured_Page_With_Fonts_and_Alignments.ppt";
@@ -53,35 +56,36 @@ public final class TestTextRunReWrite ex
ss = new HSLFSlideShow(hss);
}
- public void testWritesOutTheSameNonRich() throws Exception {
+ @Test
+ public void testWritesOutTheSameNonRich() throws Exception {
// Grab the first text run on the first sheet
- HSLFTextParagraph tr1 = ss.getSlides()[0].getTextRuns()[0];
- HSLFTextParagraph tr2 = ss.getSlides()[0].getTextRuns()[1];
+ HSLFTextParagraph tr1 = ss.getSlides().get(0).getTextParagraphs().get(0);
+ HSLFTextParagraph tr2 = ss.getSlides().get(0).getTextParagraphs().get(1);
// Ensure the text lengths are as we'd expect to start with
assertEquals(1, ss.getSlides().length);
- assertEquals(2, ss.getSlides()[0].getTextRuns().length);
- assertEquals(30, tr1.getText().length());
- assertEquals(179, tr2.getText().length());
-
- assertEquals(1, tr1.getRichTextRuns().length);
- assertEquals(30, tr1.getRichTextRuns()[0].getLength());
- assertEquals(30, tr1.getRichTextRuns()[0].getText().length());
- assertEquals(31, tr1.getRichTextRuns()[0]._getRawCharacterStyle().getCharactersCovered());
- assertEquals(31, tr1.getRichTextRuns()[0]._getRawParagraphStyle().getCharactersCovered());
+ assertEquals(2, ss.getSlides().get(0).getTextParagraphs().length);
+ assertEquals(30, tr1.getRawText().length());
+ assertEquals(179, tr2.getRawText().length());
+
+ assertEquals(1, tr1.getTextRuns().length);
+ assertEquals(30, tr1.getTextRuns().get(0).getLength());
+ assertEquals(30, tr1.getTextRuns().get(0).getRawText().length());
+ assertEquals(31, tr1.getTextRuns().get(0)._getRawCharacterStyle().getCharactersCovered());
+ assertEquals(31, tr1.getTextRuns().get(0)._getRawParagraphStyle().getCharactersCovered());
// Set the text to be as it is now
- tr1.setText( tr1.getText() );
+ tr1.setText( tr1.getRawText() );
// Check the text lengths are still right
- assertEquals(30, tr1.getText().length());
- assertEquals(179, tr2.getText().length());
+ assertEquals(30, tr1.getRawText().length());
+ assertEquals(179, tr2.getRawText().length());
- assertEquals(1, tr1.getRichTextRuns().length);
- assertEquals(30, tr1.getRichTextRuns()[0].getLength());
- assertEquals(30, tr1.getRichTextRuns()[0].getText().length());
- assertEquals(31, tr1.getRichTextRuns()[0]._getRawCharacterStyle().getCharactersCovered());
- assertEquals(31, tr1.getRichTextRuns()[0]._getRawParagraphStyle().getCharactersCovered());
+ assertEquals(1, tr1.getTextRuns().length);
+ assertEquals(30, tr1.getTextRuns().get(0).getLength());
+ assertEquals(30, tr1.getTextRuns().get(0).getRawText().length());
+ assertEquals(31, tr1.getTextRuns().get(0)._getRawCharacterStyle().getCharactersCovered());
+ assertEquals(31, tr1.getTextRuns().get(0)._getRawParagraphStyle().getCharactersCovered());
// Write the slideshow out to a byte array
@@ -110,33 +114,34 @@ public final class TestTextRunReWrite ex
}
}
+ @Test
public void testWritesOutTheSameRich() throws Exception {
// Grab the first text run on the first sheet
- HSLFTextParagraph tr1 = ss.getSlides()[0].getTextRuns()[0];
+ HSLFTextParagraph tr1 = ss.getSlides().get(0).getTextParagraphs().get(0);
// Get the first rich text run
- HSLFTextRun rtr1 = tr1.getRichTextRuns()[0];
+ HSLFTextRun rtr1 = tr1.getTextRuns().get(0);
// Check that the text sizes are as expected
- assertEquals(1, tr1.getRichTextRuns().length);
- assertEquals(30, tr1.getText().length());
- assertEquals(30, tr1.getRichTextRuns()[0].getText().length());
+ assertEquals(1, tr1.getTextRuns().length);
+ assertEquals(30, tr1.getRawText().length());
+ assertEquals(30, tr1.getTextRuns().get(0).getRawText().length());
assertEquals(30, rtr1.getLength());
- assertEquals(30, rtr1.getText().length());
+ assertEquals(30, rtr1.getRawText().length());
assertEquals(31, rtr1._getRawCharacterStyle().getCharactersCovered());
assertEquals(31, rtr1._getRawParagraphStyle().getCharactersCovered());
// Set the text to be as it is now
- rtr1.setText( rtr1.getText() );
- rtr1 = tr1.getRichTextRuns()[0];
+ rtr1.setText( rtr1.getRawText() );
+ rtr1 = tr1.getTextRuns().get(0);
// Check that the text sizes are still as expected
- assertEquals(1, tr1.getRichTextRuns().length);
- assertEquals(30, tr1.getText().length());
- assertEquals(30, tr1.getRichTextRuns()[0].getText().length());
+ assertEquals(1, tr1.getTextRuns().length);
+ assertEquals(30, tr1.getRawText().length());
+ assertEquals(30, tr1.getTextRuns().get(0).getRawText().length());
assertEquals(30, rtr1.getLength());
- assertEquals(30, rtr1.getText().length());
+ assertEquals(30, rtr1.getRawText().length());
assertEquals(31, rtr1._getRawCharacterStyle().getCharactersCovered());
assertEquals(31, rtr1._getRawParagraphStyle().getCharactersCovered());
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextShape.java Mon Apr 27 20:13:43 2015
@@ -34,7 +34,7 @@ import java.util.Map;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.*;
import org.apache.poi.sl.usermodel.ShapeType;
import org.junit.Test;
@@ -49,13 +49,13 @@ public final class TestTextShape {
@Test
public void createAutoShape(){
HSLFTextShape shape = new HSLFAutoShape(ShapeType.TRAPEZOID);
- assertNull(shape.getTextParagraph());
+ assertNull(shape.getTextParagraphs());
assertNull(shape.getText());
assertNull(shape.getEscherTextboxWrapper());
HSLFTextParagraph run = shape.createTextRun();
assertNotNull(run);
- assertNotNull(shape.getTextParagraph());
+ assertNotNull(shape.getTextParagraphs());
assertNotNull(shape.getEscherTextboxWrapper());
assertEquals("", shape.getText());
assertSame(run, shape.createTextRun());
@@ -65,13 +65,13 @@ public final class TestTextShape {
@Test
public void createTextBox(){
HSLFTextShape shape = new HSLFTextBox();
- HSLFTextParagraph run = shape.getTextParagraph();
+ HSLFTextParagraph run = shape.getTextParagraphs();
assertNotNull(run);
assertNotNull(shape.getText());
assertNotNull(shape.getEscherTextboxWrapper());
assertSame(run, shape.createTextRun());
- assertNotNull(shape.getTextParagraph());
+ assertNotNull(shape.getTextParagraphs());
assertNotNull(shape.getEscherTextboxWrapper());
assertEquals("", shape.getText());
@@ -93,41 +93,41 @@ public final class TestTextShape {
for (int i = 0; i < shape.length; i++) {
assertTrue("Expected TextShape but found " + shape[i].getClass().getName(), shape[i] instanceof HSLFTextShape);
HSLFTextShape tx = (HSLFTextShape)shape[i];
- HSLFTextParagraph run = tx.getTextParagraph();
+ HSLFTextParagraph run = tx.getTextParagraphs();
assertNotNull(run);
int runType = run.getRunType();
ShapeType type = shape[i].getShapeType();
switch (type){
case TEXT_BOX:
- assertEquals("Text in a TextBox", run.getText());
+ assertEquals("Text in a TextBox", run.getRawText());
break;
case RECT:
if(runType == TextHeaderAtom.OTHER_TYPE)
- assertEquals("Rectangle", run.getText());
+ assertEquals("Rectangle", run.getRawText());
else if(runType == TextHeaderAtom.TITLE_TYPE)
- assertEquals("Title Placeholder", run.getText());
+ assertEquals("Title Placeholder", run.getRawText());
break;
case OCTAGON:
- assertEquals("Octagon", run.getText());
+ assertEquals("Octagon", run.getRawText());
break;
case ELLIPSE:
- assertEquals("Ellipse", run.getText());
+ assertEquals("Ellipse", run.getRawText());
break;
case ROUND_RECT:
- assertEquals("RoundRectangle", run.getText());
+ assertEquals("RoundRectangle", run.getRawText());
break;
default:
fail("Unexpected shape: " + shape[i].getShapeName());
}
- lst1.add(run.getText());
+ lst1.add(run.getRawText());
}
List<String> lst2 = new ArrayList<String>();
- HSLFTextParagraph[] run = slide.getTextRuns();
+ HSLFTextParagraph[] run = slide.getTextParagraphs();
for (int i = 0; i < run.length; i++) {
- lst2.add(run[i].getText());
+ lst2.add(run[i].getRawText());
}
assertTrue(lst1.containsAll(lst2));
@@ -162,12 +162,12 @@ public final class TestTextShape {
assertTrue(shape[0] instanceof HSLFTextShape);
shape1 = (HSLFTextShape)shape[0];
assertEquals(ShapeType.TEXT_BOX, shape1.getShapeType());
- assertEquals("Hello, World!", shape1.getTextParagraph().getText());
+ assertEquals("Hello, World!", shape1.getTextParagraphs().getRawText());
assertTrue(shape[1] instanceof HSLFTextShape);
shape1 = (HSLFTextShape)shape[1];
assertEquals(ShapeType.RIGHT_ARROW, shape1.getShapeType());
- assertEquals("Testing TextShape", shape1.getTextParagraph().getText());
+ assertEquals("Testing TextShape", shape1.getTextParagraphs().getRawText());
}
@Test
@@ -188,28 +188,28 @@ public final class TestTextShape {
HSLFTextShape tx;
tx = map.get("TEST1");
- assertEquals(0.1, tx.getMarginLeft()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.1, tx.getMarginRight()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.39, tx.getMarginTop()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.05, tx.getMarginBottom()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.1, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.1, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.39, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.05, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
tx = map.get("TEST2");
- assertEquals(0.1, tx.getMarginLeft()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.1, tx.getMarginRight()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.05, tx.getMarginTop()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.39, tx.getMarginBottom()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.1, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.1, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.05, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.39, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
tx = map.get("TEST3");
- assertEquals(0.39, tx.getMarginLeft()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.1, tx.getMarginRight()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.05, tx.getMarginTop()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.05, tx.getMarginBottom()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.39, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.1, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.05, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.05, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
tx = map.get("TEST4");
- assertEquals(0.1, tx.getMarginLeft()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.39, tx.getMarginRight()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.05, tx.getMarginTop()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
- assertEquals(0.05, tx.getMarginBottom()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.1, tx.getLeftInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.39, tx.getRightInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.05, tx.getTopInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
+ assertEquals(0.05, tx.getBottomInset()*HSLFShape.EMU_PER_POINT/HSLFShape.EMU_PER_INCH, 0.01);
}
@Test
@@ -222,14 +222,14 @@ public final class TestTextShape {
HSLFTextShape sh0 = (HSLFTextShape)sh[0];
assertEquals(null, sh0.getText());
- assertEquals(null, sh0.getTextParagraph());
+ assertEquals(null, sh0.getTextParagraphs());
HSLFTextShape sh1 = (HSLFTextShape)sh[1];
assertEquals(null, sh1.getText());
- assertEquals(null, sh1.getTextParagraph());
+ assertEquals(null, sh1.getTextParagraphs());
HSLFTextShape sh2 = (HSLFTextShape)sh[2];
assertEquals("this box should be shown just once", sh2.getText());
- assertEquals(-1, sh2.getTextParagraph().getIndex());
+ assertEquals(-1, sh2.getTextParagraphs().getIndex());
}
}
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TextPainterTest.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TextPainterTest.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TextPainterTest.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TextPainterTest.java Mon Apr 27 20:13:43 2015
@@ -19,7 +19,7 @@ package org.apache.poi.hslf.model;
import org.apache.poi.hslf.record.StyleTextPropAtom;
import org.apache.poi.hslf.record.TextCharsAtom;
import org.apache.poi.hslf.record.TextHeaderAtom;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.*;
import org.apache.poi.hssf.usermodel.DummyGraphics2d;
import org.junit.Test;
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestCurrentUserAtom.java Mon Apr 27 20:13:43 2015
@@ -25,7 +25,7 @@ import java.io.InputStream;
import org.apache.poi.POIDataSamples;
import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
+import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.poifs.filesystem.DocumentEntry;
import org.apache.poi.poifs.filesystem.POIFSFileSystem;
import org.junit.Test;
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocument.java Mon Apr 27 20:13:43 2015
@@ -19,7 +19,7 @@ package org.apache.poi.hslf.record;
import junit.framework.TestCase;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
+import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.poifs.filesystem.*;
import org.apache.poi.POIDataSamples;
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestDocumentEncryption.java Mon Apr 27 20:13:43 2015
@@ -34,10 +34,7 @@ import org.apache.poi.hpsf.PropertySet;
import org.apache.poi.hpsf.PropertySetFactory;
import org.apache.poi.hpsf.SummaryInformation;
import org.apache.poi.hslf.exceptions.EncryptedPowerPointFileException;
-import org.apache.poi.hslf.model.HSLFSlide;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
-import org.apache.poi.hslf.usermodel.HSLFPictureData;
-import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.*;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
import org.apache.poi.poifs.crypt.CryptoFunctions;
import org.apache.poi.poifs.crypt.EncryptionInfo;
@@ -147,7 +144,7 @@ public class TestDocumentEncryption {
HSLFSlideShow ss = new HSLFSlideShow(hss);
HSLFSlide slide = ss.getSlides()[0];
- assertEquals("Dominic Salemno", slide.getTextRuns()[0].getText());
+ assertEquals("Dominic Salemno", slide.getTextParagraphs()[0].getRawText());
String picCmp[][] = {
{"0","nKsDTKqxTCR8LFkVVWlP9GSTvZ0="},
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExHyperlink.java Mon Apr 27 20:13:43 2015
@@ -25,8 +25,8 @@ import java.util.List;
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.POIDataSamples;
/**
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestExObjList.java Mon Apr 27 20:13:43 2015
@@ -20,8 +20,8 @@ package org.apache.poi.hslf.record;
import junit.framework.TestCase;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
import org.apache.poi.hslf.usermodel.HSLFSlideShow;
+import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.POIDataSamples;
/**
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestRecordContainer.java Mon Apr 27 20:13:43 2015
@@ -20,7 +20,7 @@ package org.apache.poi.hslf.record;
import junit.framework.TestCase;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
+import org.apache.poi.hslf.usermodel.HSLFSlideShowImpl;
import org.apache.poi.POIDataSamples;
/**
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/record/TestSlideAtom.java Mon Apr 27 20:13:43 2015
@@ -78,7 +78,7 @@ public final class TestSlideAtom extends
public void testSSSlideInfoAtom() throws Exception {
HSLFSlideShow ss = new HSLFSlideShow();
- org.apache.poi.hslf.model.HSLFSlide slide1 = ss.createSlide(), slide2 = ss.createSlide();
+ org.apache.poi.hslf.usermodel.HSLFSlide slide1 = ss.createSlide(), slide2 = ss.createSlide();
slide2.setHidden(true);
ByteArrayOutputStream bos = new ByteArrayOutputStream(4096);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org