Updated test from Yegor, to also test creating text boxes with properties

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

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
index 1ceaa9e00fc1095d2d5b03df064ae7bda4ba087f..6ed7b7fce4e527b5e561eaced2b000a87612de99 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/model/TestShapes.java
@@ -120,51 +120,47 @@ public class TestShapes extends TestCase {
 \r
     /**\r
      * Verify that we can add TextBox shapes to a slide\r
-     * @throws Exception\r
+     * and set some of the style attributes\r
      */\r
     public void testTextBoxWrite() throws Exception {\r
         ppt = new SlideShow();\r
         Slide sl = ppt.createSlide();\r
+        RichTextRun rt;\r
+\r
+        String val = "Hello, World!";\r
 \r
+        // Create a new textbox, and give it lots of properties\r
         TextBox txtbox = new TextBox();\r
-        txtbox.setText("Hello, World!");\r
+        txtbox.setText(val);\r
         txtbox.setFontSize(42);\r
         txtbox.setBold(true);\r
         txtbox.setItalic(true);\r
-\r
+        txtbox.setUnderline(false);\r
         sl.addShape(txtbox);\r
 \r
-        txtbox = new TextBox();\r
-        txtbox.setText("Plain text in default font");\r
-        sl.addShape(txtbox);\r
+        // Check it before save\r
+        rt = txtbox.getRichTextRuns()[0];\r
+        assertEquals(val, rt.getText());\r
+        assertEquals(42, rt.getFontSize());\r
+        assertTrue(rt.isBold());\r
+        assertTrue(rt.isItalic());\r
+        assertFalse(rt.isUnderlined());\r
 \r
-        assertEquals(sl.getShapes().length, 2);\r
-        \r
-        //serialize and read again\r
+        // Serialize and read again\r
         ByteArrayOutputStream out = new ByteArrayOutputStream();\r
         ppt.write(out);\r
         out.close();\r
 \r
         ppt = new SlideShow(new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray())));\r
-        sl = ppt.getSlides()[0];\r
-        assertEquals(sl.getShapes().length, 2);\r
 \r
-        Shape[] sh = sl.getShapes();\r
-        for (int i = 0; i < sh.length; i++) {\r
-            assertTrue(sh[i] instanceof TextBox);\r
-            txtbox = (TextBox)sh[i];\r
-            String text = txtbox.getText();\r
-            assertNotNull(text);\r
+        txtbox = (TextBox)sl.getShapes()[0];\r
+        rt = txtbox.getRichTextRuns()[0];\r
 \r
-            assertEquals(txtbox.getRichTextRuns().length, 1);\r
-            RichTextRun rt = txtbox.getRichTextRuns()[0];\r
-\r
-            if (text.equals("Hello, World!")){\r
-                assertEquals(42, rt.getFontSize());\r
-                assertTrue(rt.isBold());\r
-                assertTrue(rt.isItalic());\r
-            }\r
-        }\r
+        // Check after save\r
+        assertEquals(val, rt.getText());\r
+        assertEquals(42, rt.getFontSize());\r
+        assertTrue(rt.isBold());\r
+        assertTrue(rt.isItalic());\r
+        assertFalse(rt.isUnderlined());\r
     }\r
-\r
 }\r