poi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kiwiwi...@apache.org
Subject svn commit: r1676365 [9/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...
Date Mon, 27 Apr 2015 20:13:46 GMT
Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java Mon Apr 27 20:13:43 2015
@@ -98,16 +98,16 @@ public final class TestBugs {
 
         notes = ppt.getSlides()[0].getNotesSheet();
         assertNotNull(notes);
-        txrun = notes.getTextRuns()[0];
+        txrun = notes.getTextParagraphs()[0];
         assertEquals("Notes-1", txrun.getRawText());
-        assertEquals(false, txrun.getRichTextRuns()[0].isBold());
+        assertEquals(false, txrun.getTextRuns()[0].isBold());
 
         //notes for the second slide are in bold
         notes = ppt.getSlides()[1].getNotesSheet();
         assertNotNull(notes);
-        txrun = notes.getTextRuns()[0];
+        txrun = notes.getTextParagraphs()[0];
         assertEquals("Notes-2", txrun.getRawText());
-        assertEquals(true, txrun.getRichTextRuns()[0].isBold());
+        assertEquals(true, txrun.getTextRuns()[0].isBold());
 
     }
 
@@ -134,7 +134,7 @@ public final class TestBugs {
             HSLFNotes notes = slide[i].getNotesSheet();
             if (notesMap.containsKey(slideNumber)){
                 assertNotNull(notes);
-                String text = notes.getTextRuns()[0].getRawText();
+                String text = notes.getTextParagraphs()[0].getRawText();
                 String startingPhrase = notesMap.get(slideNumber);
                 assertTrue("Notes for slide " + slideNumber + " must start with " +
                         startingPhrase , text.startsWith(startingPhrase));
@@ -158,7 +158,7 @@ public final class TestBugs {
                 for (int j = 0; j < sh.length; j++) {
                     if( sh[j] instanceof HSLFTextBox){
                         HSLFTextBox txt = (HSLFTextBox)sh[j];
-                        assertNotNull(txt.getTextParagraph());
+                        assertNotNull(txt.getTextParagraphs());
                     }
                 }
             }
@@ -202,8 +202,8 @@ public final class TestBugs {
         HSLFSlide[] slide = ppt.getSlides();
         for (int i = 0; i < slide.length; i++) {
             HSLFMasterSheet master = slide[i].getMasterSheet();
-            if (i == 0) assertTrue(master instanceof TitleMaster); //the first slide follows TitleMaster
-            else assertTrue(master instanceof SlideMaster);
+            if (i == 0) assertTrue(master instanceof HSLFTitleMaster); //the first slide follows TitleMaster
+            else assertTrue(master instanceof HSLFSlideMaster);
         }
     }
 
@@ -301,7 +301,7 @@ public final class TestBugs {
 
         HSLFSlide[] slide = ppt.getSlides();
         assertEquals(1, slide.length);
-        HSLFTextParagraph[] runs = slide[0].getTextRuns();
+        HSLFTextParagraph[] runs = slide[0].getTextParagraphs();
         assertEquals(4, runs.length);
 
         Set<String> txt = new HashSet<String>();
@@ -329,21 +329,21 @@ public final class TestBugs {
 
         // Check the first slide
         HSLFSlide slide = ppt.getSlides()[0];
-        HSLFTextParagraph[] slTr = slide.getTextRuns();
+        HSLFTextParagraph[] slTr = slide.getTextParagraphs();
         
         // Has two text runs, one from slide text, one from drawing
         assertEquals(2, slTr.length);
         assertEquals(false, slTr[0].isDrawingBased());
         assertEquals(true, slTr[1].isDrawingBased());
-        assertEquals("First run", slTr[0].getText());
-        assertEquals("Second run", slTr[1].getText());
+        assertEquals("First run", slTr[0].getRawText());
+        assertEquals("Second run", slTr[1].getRawText());
 
         // Check the shape based text runs
         List<HSLFTextParagraph> lst = new ArrayList<HSLFTextParagraph>();
         HSLFShape[] shape = slide.getShapes();
         for (int i = 0; i < shape.length; i++) {
             if( shape[i] instanceof HSLFTextShape){
-                HSLFTextParagraph textRun = ((HSLFTextShape)shape[i]).getTextParagraph();
+                HSLFTextParagraph textRun = ((HSLFTextShape)shape[i]).getTextParagraphs();
                 if(textRun != null) {
                     lst.add(textRun);
                 }
@@ -354,7 +354,7 @@ public final class TestBugs {
         assertEquals(1, lst.size());
         
         // And it should be the second one
-        assertEquals("Second run", lst.get(0).getText());
+        assertEquals("Second run", lst.get(0).getRawText());
     }
 
     /**
@@ -402,11 +402,11 @@ public final class TestBugs {
         assertEquals(1, sh.length);
         assertTrue(sh[0] instanceof HSLFTextShape);
         HSLFTextShape tx = (HSLFTextShape)sh[0];
-        assertEquals("Fundera, planera och involvera.", tx.getTextParagraph().getText());
+        assertEquals("Fundera, planera och involvera.", tx.getTextParagraphs().getRawText());
 
-        HSLFTextParagraph[] run = slide.getTextRuns();
+        HSLFTextParagraph[] run = slide.getTextParagraphs();
         assertEquals(1, run.length);
-        assertEquals("Fundera, planera och involvera.", run[0].getText());
+        assertEquals("Fundera, planera och involvera.", run[0].getRawText());
     }
 
     /**
@@ -429,7 +429,7 @@ public final class TestBugs {
     public void bug49648() throws Exception {
        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("49648.ppt"));
        for(HSLFSlide slide : ppt.getSlides()) {
-          for(HSLFTextParagraph run : slide.getTextRuns()) {
+          for(HSLFTextParagraph run : slide.getTextParagraphs()) {
              String text = run.getRawText();
              text.replace("{txtTot}", "With \u0123\u1234\u5678 unicode");
              run.setRawText(text);
@@ -487,7 +487,7 @@ public final class TestBugs {
                 str = str.replace("$$DATE$$", new Date().toString());
                 tb.setText(str);
                 
-                HSLFTextParagraph tr = tb.getTextParagraph();
+                HSLFTextParagraph tr = tb.getTextParagraphs();
                 assertEquals(str.length()+1,tr.getStyleTextPropAtom().getParagraphStyles().getFirst().getCharactersCovered());
                 assertEquals(str.length()+1,tr.getStyleTextPropAtom().getCharacterStyles().getFirst().getCharactersCovered());
             }
@@ -538,7 +538,7 @@ public final class TestBugs {
         // Check the number of text runs based on the slide (not textbox)
         // Will have skipped the empty one
         int str = 0;
-        for (HSLFTextParagraph tr : _slides[0].getTextRuns()) {
+        for (HSLFTextParagraph tr : _slides[0].getTextParagraphs()) {
             if (! tr.isDrawingBased()) str++;
         }
         assertEquals(1, str);

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestFontRendering.java Mon Apr 27 20:13:43 2015
@@ -39,7 +39,6 @@ import java.util.Map;
 import javax.imageio.ImageIO;
 
 import org.apache.poi.POIDataSamples;
-import org.apache.poi.hslf.model.HSLFSlide;
 import org.apache.poi.hslf.model.TextPainter;
 import org.apache.poi.util.TempFile;
 import org.junit.Ignore;

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestMostRecentRecords.java Mon Apr 27 20:13:43 2015
@@ -21,7 +21,6 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.*;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
 import org.apache.poi.hslf.record.*;
 import org.apache.poi.POIDataSamples;
 

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java Mon Apr 27 20:13:43 2015
@@ -43,18 +43,18 @@ public final class TestNotesText extends
 		HSLFNotes notes = ss.getNotes()[0];
 
 		String[] expectText = new String[] {"These are the notes for page 1"};
-		assertEquals(expectText.length, notes.getTextRuns().length);
+		assertEquals(expectText.length, notes.getTextParagraphs().length);
 		for(int i=0; i<expectText.length; i++) {
-			assertEquals(expectText[i], notes.getTextRuns()[i].getText());
+			assertEquals(expectText[i], notes.getTextParagraphs()[i].getRawText());
 		}
 	}
 
 	public void testNotesTwo() {
 		HSLFNotes notes = ss.getNotes()[1];
 		String[] expectText = new String[] {"These are the notes on page two, again lacking formatting"};
-		assertEquals(expectText.length, notes.getTextRuns().length);
+		assertEquals(expectText.length, notes.getTextParagraphs().length);
 		for(int i=0; i<expectText.length; i++) {
-			assertEquals(expectText[i], notes.getTextRuns()[i].getText());
+			assertEquals(expectText[i], notes.getTextParagraphs()[i].getRawText());
 		}
 	}
 }

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList.java Mon Apr 27 20:13:43 2015
@@ -23,8 +23,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.hslf.model.HSLFSlide;
-import org.apache.poi.hslf.model.HSLFTextParagraph;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.EscherTextboxWrapper;
@@ -70,12 +68,12 @@ public final class TestNumberedList exte
 		assertNull(autoNumbers[1].getAutoNumberScheme());
 		assertTrue(TextAutoNumberSchemeEnum.ANM_AlphaLcParenRight == autoNumbers[2].getAutoNumberScheme());
 			
-		HSLFTextParagraph[] textRuns = s.getTextRuns();
+		HSLFTextParagraph[] textRuns = s.getTextParagraphs();
 		assertEquals(2, textRuns.length);
 
-		HSLFTextRun textRun = textRuns[0].getRichTextRuns()[0];
+		HSLFTextRun textRun = textRuns[0].getTextRuns()[0];
 		assertEquals("titTe", textRun.getRawText());
-		assertEquals(1, textRuns[0].getRichTextRuns().length);
+		assertEquals(1, textRuns[0].getTextRuns().length);
 		assertFalse(textRun.isBullet());
 
 		assertEquals("This is a text placeholder that \rfollows the design pattern\rJust a test\rWithout any paragraph\rSecond paragraph first line c) ;\rSecond paragraph second line d) . \r", textRuns[1].getRawText());
@@ -106,12 +104,12 @@ public final class TestNumberedList exte
 		assertNull(autoNumbers[1].getAutoNumberScheme());
 		assertTrue(TextAutoNumberSchemeEnum.ANM_AlphaUcPeriod == autoNumbers[2].getAutoNumberScheme());
 
-		final HSLFTextParagraph[] textRuns = s.getTextRuns();
+		final HSLFTextParagraph[] textRuns = s.getTextParagraphs();
 		assertEquals(2, textRuns.length);
 
-		HSLFTextRun textRun = textRuns[0].getRichTextRuns()[0];
+		HSLFTextRun textRun = textRuns[0].getTextRuns()[0];
 		assertEquals("Second Slide Title", textRun.getRawText());
-		assertEquals(1, textRuns[0].getRichTextRuns().length);
+		assertEquals(1, textRuns[0].getTextRuns().length);
 		assertFalse(textRun.isBullet());
 
 		assertEquals("This is a text placeholder that \rfollows the design pattern\rJust a test\rWithout any paragraph\rSecond paragraph first line c) ;\rSecond paragraph second line d) . \r", textRuns[1].getRawText());

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList2.java Mon Apr 27 20:13:43 2015
@@ -23,8 +23,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.hslf.model.HSLFSlide;
-import org.apache.poi.hslf.model.HSLFTextParagraph;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.EscherTextboxWrapper;
@@ -75,12 +73,12 @@ public final class TestNumberedList2 ext
 		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox1[0].getAutoNumberScheme());
 
 		
-		HSLFTextParagraph[] textRuns = s.getTextRuns();
+		HSLFTextParagraph[] textRuns = s.getTextParagraphs();
 		assertEquals(2, textRuns.length);
 
-		HSLFTextRun textRun = textRuns[0].getRichTextRuns()[0];
+		HSLFTextRun textRun = textRuns[0].getTextRuns()[0];
 		assertEquals("List Item One\rList Item Two\rList Item Three", textRun.getRawText());
-		assertEquals(1, textRuns[0].getRichTextRuns().length);
+		assertEquals(1, textRuns[0].getTextRuns().length);
 		assertTrue(textRun.isBullet());
 
 		assertEquals("A numbered list may start at any number \rThis would be used as a continuation list on another page\rThis list should start with #6", textRuns[1].getRawText());
@@ -101,12 +99,12 @@ public final class TestNumberedList2 ext
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox[0].getAutoNumberStartNumber());//Default value = 1 will be used 
 		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox[0].getAutoNumberScheme());
 			
-		HSLFTextParagraph[] textRuns = s.getTextRuns();
+		HSLFTextParagraph[] textRuns = s.getTextParagraphs();
 		assertEquals(3, textRuns.length);
 
-		HSLFTextRun textRun = textRuns[0].getRichTextRuns()[0];
+		HSLFTextRun textRun = textRuns[0].getTextRuns()[0];
 		assertEquals("Bulleted list\rMore bullets", textRun.getRawText());
-		assertEquals(1, textRuns[0].getRichTextRuns().length);
+		assertEquals(1, textRuns[0].getTextRuns().length);
 		assertTrue(textRun.isBullet());
 
 		assertEquals("Numbered list between two bulleted lists\rSecond numbered list item", textRuns[1].getRawText());

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNumberedList3.java Mon Apr 27 20:13:43 2015
@@ -23,8 +23,6 @@ import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.hslf.model.HSLFSlide;
-import org.apache.poi.hslf.model.HSLFTextParagraph;
 import org.apache.poi.hslf.model.textproperties.TextPFException9;
 import org.apache.poi.hslf.model.textproperties.TextPropCollection;
 import org.apache.poi.hslf.record.EscherTextboxWrapper;
@@ -68,14 +66,14 @@ public final class TestNumberedList3 ext
 		assertEquals(Short.valueOf((short)1), autoNumbersOfTextBox0[0].getAutoNumberStartNumber());//Default value = 1 will be used 
 		assertTrue(TextAutoNumberSchemeEnum.ANM_ArabicPeriod == autoNumbersOfTextBox0[0].getAutoNumberScheme());
 		
-		final HSLFTextParagraph[] textRuns = s.getTextRuns();
+		final HSLFTextParagraph[] textRuns = s.getTextParagraphs();
 		assertEquals(3, textRuns.length);
 		assertEquals("Bulleted list\rMore bullets\rNo bullets here", textRuns[0].getRawText());
 		assertEquals("Numbered list between two bulleted lists\rSecond numbered list item", textRuns[1].getRawText());
 		assertEquals("Second bulleted list \u2013 should appear after numbered list\rMore bullets", textRuns[2].getRawText());
-		assertEquals(2, textRuns[0].getRichTextRuns().length);
-		assertEquals(1, textRuns[1].getRichTextRuns().length);
-		assertEquals(1, textRuns[2].getRichTextRuns().length);
+		assertEquals(2, textRuns[0].getTextRuns().length);
+		assertEquals(1, textRuns[1].getTextRuns().length);
+		assertEquals(1, textRuns[2].getTextRuns().length);
 		assertNull(textRuns[0].getStyleTextProp9Atom());
 		assertNotNull(textRuns[1].getStyleTextProp9Atom());
 		assertNull(textRuns[2].getStyleTextProp9Atom());
@@ -91,7 +89,7 @@ public final class TestNumberedList3 ext
 		assertEquals(67, textProp.getCharactersCovered());
 		
 		
-		HSLFTextRun textRun = textRuns[0].getRichTextRuns()[0];
+		HSLFTextRun textRun = textRuns[0].getTextRuns()[0];
 		assertTrue(textRun.isBullet());
 
 		

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRecordSetup.java Mon Apr 27 20:13:43 2015
@@ -21,7 +21,6 @@ package org.apache.poi.hslf.usermodel;
 import junit.framework.TestCase;
 
 import org.apache.poi.hslf.*;
-import org.apache.poi.hslf.model.HSLFSlideShowImpl;
 import org.apache.poi.hslf.record.ParentAwareRecord;
 import org.apache.poi.hslf.record.Record;
 import org.apache.poi.hslf.record.RecordContainer;

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java Mon Apr 27 20:13:43 2015
@@ -78,8 +78,8 @@ public final class TestRichTextRun exten
 	 */
 	public void testBoldNonRich() {
 		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextRun rtr = textRuns[0].getRichTextRuns()[0];
+		HSLFTextParagraph[] textRuns = slideOne.getTextParagraphs();
+		HSLFTextRun rtr = textRuns[0].getTextRuns()[0];
 
 		assertNull(rtr._getRawCharacterStyle());
 		assertNull(rtr._getRawParagraphStyle());
@@ -106,8 +106,8 @@ public final class TestRichTextRun exten
 	 */
 	public void testBoldRich() {
 		HSLFSlide slideOneR = ssRichA.getSlides()[0];
-		HSLFTextParagraph[] textRunsR = slideOneR.getTextRuns();
-		HSLFTextRun[] rtrs = textRunsR[1].getRichTextRuns();
+		HSLFTextParagraph[] textRunsR = slideOneR.getTextParagraphs();
+		HSLFTextRun[] rtrs = textRunsR[1].getTextRuns();
 		assertEquals(3, rtrs.length);
 
 		assertTrue(rtrs[0].isBold());
@@ -134,14 +134,14 @@ public final class TestRichTextRun exten
 	public void testFontSize() {
 
 		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextRun rtr = textRuns[0].getRichTextRuns()[0];
+		HSLFTextParagraph[] textRuns = slideOne.getTextParagraphs();
+		HSLFTextRun rtr = textRuns[0].getTextRuns()[0];
 
 		HSLFSlide slideOneR = ssRichB.getSlides()[0];
-		HSLFTextParagraph[] textRunsR = slideOneR.getTextRuns();
-		HSLFTextRun rtrRa = textRunsR[0].getRichTextRuns()[0];
-		HSLFTextRun rtrRb = textRunsR[1].getRichTextRuns()[0];
-		HSLFTextRun rtrRc = textRunsR[1].getRichTextRuns()[3];
+		HSLFTextParagraph[] textRunsR = slideOneR.getTextParagraphs();
+		HSLFTextRun rtrRa = textRunsR[0].getTextRuns()[0];
+		HSLFTextRun rtrRb = textRunsR[1].getTextRuns()[0];
+		HSLFTextRun rtrRc = textRunsR[1].getTextRuns()[3];
 
 		String defaultFont = "Arial";
 
@@ -198,8 +198,8 @@ public final class TestRichTextRun exten
 		for(int i=0; i<h.length; i++) {
 			// Change
 			HSLFSlide slideOne = s[i];
-			HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-			HSLFTextRun rtr = textRuns[0].getRichTextRuns()[0];
+			HSLFTextParagraph[] textRuns = slideOne.getTextParagraphs();
+			HSLFTextRun rtr = textRuns[0].getTextRuns()[0];
 
 			rtr.setBold(true);
 			rtr.setFontSize(18);
@@ -232,8 +232,8 @@ public final class TestRichTextRun exten
 			// Now, look at the one we changed, wrote out, and read back in
 			// Ensure it does contain our original modifications
 			HSLFSlide slideOneRR = readS.getSlides()[0];
-			HSLFTextParagraph[] textRunsRR = slideOneRR.getTextRuns();
-			HSLFTextRun rtrRRa = textRunsRR[0].getRichTextRuns()[0];
+			HSLFTextParagraph[] textRunsRR = slideOneRR.getTextParagraphs();
+			HSLFTextRun rtrRRa = textRunsRR[0].getTextRuns()[0];
 
 			assertEquals(true, rtrRRa.isBold());
 			assertEquals(18, rtrRRa.getFontSize());
@@ -253,8 +253,8 @@ public final class TestRichTextRun exten
 		// Check the number of text runs on interesting sheets
 		HSLFSlide slideThreeC = ssRichC.getSlides()[2];
 		HSLFSlide slideSevenC = ssRichC.getSlides()[6];
-		assertEquals(3, slideThreeC.getTextRuns().length);
-		assertEquals(5, slideSevenC.getTextRuns().length);
+		assertEquals(3, slideThreeC.getTextParagraphs().length);
+		assertEquals(5, slideSevenC.getTextParagraphs().length);
 
 		// On slide three, we should have:
 		// TR:
@@ -266,20 +266,20 @@ public final class TestRichTextRun exten
 		//   Illustrative Example
 		//   .
 
-		HSLFTextParagraph[] s3tr = slideThreeC.getTextRuns();
-		HSLFTextRun[] s3rtr0 = s3tr[0].getRichTextRuns();
-		HSLFTextRun[] s3rtr1 = s3tr[1].getRichTextRuns();
-		HSLFTextRun[] s3rtr2 = s3tr[2].getRichTextRuns();
+		HSLFTextParagraph[] s3tr = slideThreeC.getTextParagraphs();
+		HSLFTextRun[] s3rtr0 = s3tr[0].getTextRuns();
+		HSLFTextRun[] s3rtr1 = s3tr[1].getTextRuns();
+		HSLFTextRun[] s3rtr2 = s3tr[2].getTextRuns();
 
 		assertEquals(2, s3rtr0.length);
 		assertEquals(1, s3rtr1.length);
 		assertEquals(2, s3rtr2.length);
 
-		assertEquals("You are an important supplier of various items that I need", s3rtr0[0].getText());
-		assertEquals("", s3rtr0[1].getText());
-		assertEquals("Source: Internal focus groups", s3rtr1[0].getText());
-		assertEquals("Illustrative Example", s3rtr2[0].getText());
-		assertEquals("", s3rtr2[1].getText());
+		assertEquals("You are an important supplier of various items that I need", s3rtr0[0].getRawText());
+		assertEquals("", s3rtr0[1].getRawText());
+		assertEquals("Source: Internal focus groups", s3rtr1[0].getRawText());
+		assertEquals("Illustrative Example", s3rtr2[0].getRawText());
+		assertEquals("", s3rtr2[1].getRawText());
 
 		assertTrue(s3rtr0[0]._isParagraphStyleShared());
 		assertTrue(s3rtr0[1]._isParagraphStyleShared());
@@ -300,10 +300,10 @@ public final class TestRichTextRun exten
 		//  <ps>(text a)</ps><ps>(text a)(text b)</ps>
 		// TR:
 		//  (text)
-		HSLFTextParagraph[] s7tr = slideSevenC.getTextRuns();
-		HSLFTextRun[] s7rtr0 = s7tr[0].getRichTextRuns();
-		HSLFTextRun[] s7rtr1 = s7tr[1].getRichTextRuns();
-		HSLFTextRun[] s7rtr2 = s7tr[2].getRichTextRuns();
+		HSLFTextParagraph[] s7tr = slideSevenC.getTextParagraphs();
+		HSLFTextRun[] s7rtr0 = s7tr[0].getTextRuns();
+		HSLFTextRun[] s7rtr1 = s7tr[1].getTextRuns();
+		HSLFTextRun[] s7rtr2 = s7tr[2].getTextRuns();
 
 		assertEquals(1, s7rtr0.length);
 		assertEquals(3, s7rtr1.length);
@@ -332,10 +332,10 @@ public final class TestRichTextRun exten
 		assertMatchesFileC(ssRichC);
 
 		HSLFSlide slideSevenC = ssRichC.getSlides()[6];
-		HSLFTextParagraph[] s7tr = slideSevenC.getTextRuns();
-		HSLFTextRun[] s7rtr0 = s7tr[0].getRichTextRuns();
-		HSLFTextRun[] s7rtr1 = s7tr[1].getRichTextRuns();
-		HSLFTextRun[] s7rtr2 = s7tr[2].getRichTextRuns();
+		HSLFTextParagraph[] s7tr = slideSevenC.getTextParagraphs();
+		HSLFTextRun[] s7rtr0 = s7tr[0].getTextRuns();
+		HSLFTextRun[] s7rtr1 = s7tr[1].getTextRuns();
+		HSLFTextRun[] s7rtr2 = s7tr[2].getTextRuns();
 
 		String oldText;
 
@@ -343,8 +343,8 @@ public final class TestRichTextRun exten
 		// Need to ensure it's a run that really has styles!
 		oldText = s7rtr2[0].getRawText();
 		s7rtr2[0].setText( oldText );
-		assertEquals(oldText, s7rtr2[0].getText());
-		assertEquals(oldText, s7tr[2].getText());
+		assertEquals(oldText, s7rtr2[0].getRawText());
+		assertEquals(oldText, s7tr[2].getRawText());
 		assertEquals(oldText.length() + 1, s7rtr2[0]._getRawCharacterStyle().getCharactersCovered());
 		assertEquals(oldText.length() + 1, s7rtr2[0]._getRawParagraphStyle().getCharactersCovered());
 		assertMatchesSLTWC(ssRichC);
@@ -353,7 +353,7 @@ public final class TestRichTextRun exten
 		// Reset the text on a shared paragraph
 		oldText = s7rtr1[2].getRawText();
 		s7rtr1[2].setText( oldText );
-		assertEquals(oldText, s7rtr1[2].getText());
+		assertEquals(oldText, s7rtr1[2].getRawText());
 		assertEquals(oldText.length() + 1, s7rtr1[2]._getRawCharacterStyle().getCharactersCovered());
 		assertMatchesSLTWC(ssRichC);
 		assertMatchesFileC(ssRichC);
@@ -450,9 +450,9 @@ if(false) {
 		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("ParagraphStylesShorterThanCharStyles.ppt"));
 		HSLFSlide[] sl = ppt.getSlides();
 		for (int i = 0; i < sl.length; i++) {
-			HSLFTextParagraph[] txt = sl[i].getTextRuns();
+			HSLFTextParagraph[] txt = sl[i].getTextParagraphs();
 			for (int j = 0; j < txt.length; j++) {
-				HSLFTextRun[] rt = txt[j].getRichTextRuns();
+				HSLFTextRun[] rt = txt[j].getTextRuns();
 				for (int k = 0; k < rt.length; k++) {
 					int indent = rt[k].getIndentLevel();
 					assertTrue(indent >= 0 && indent <= 4 );
@@ -471,12 +471,12 @@ if(false) {
 		HSLFSlide[] slide = ppt.getSlides();
 		assertEquals(2, slide.length);
 
-		txt = slide[0].getTextRuns();
+		txt = slide[0].getTextParagraphs();
 		assertEquals(2, txt.length);
 
 		assertEquals("Title text", txt[0].getRawText());
-		assertEquals(1, txt[0].getRichTextRuns().length);
-		rt = txt[0].getRichTextRuns()[0];
+		assertEquals(1, txt[0].getTextRuns().length);
+		rt = txt[0].getTextRuns()[0];
 		assertFalse(rt.isBullet());
 
 		assertEquals(
@@ -484,13 +484,13 @@ if(false) {
 				"follows the design pattern\r" +
 				"Defined in the slide master\r" +
 				"and has bullets by default", txt[1].getRawText());
-		assertEquals(1, txt[1].getRichTextRuns().length);
-		rt = txt[1].getRichTextRuns()[0];
+		assertEquals(1, txt[1].getTextRuns().length);
+		rt = txt[1].getTextRuns()[0];
 		assertEquals('\u2022', rt.getBulletChar());
 		assertTrue(rt.isBullet());
 
 
-		txt = slide[1].getTextRuns();
+		txt = slide[1].getTextParagraphs();
 		assertEquals(2, txt.length);
 
 		assertEquals(
@@ -498,16 +498,16 @@ if(false) {
 				"With bullets\r" +
 				"That follow the design pattern\r" +
 				"From the slide master", txt[0].getRawText());
-		assertEquals(1, txt[0].getRichTextRuns().length);
-		rt = txt[0].getRichTextRuns()[0];
+		assertEquals(1, txt[0].getTextRuns().length);
+		rt = txt[0].getTextRuns()[0];
 		assertTrue(rt.isBullet());
 		assertEquals('\u2022', rt.getBulletChar());
 
 		assertEquals(
 				"I\u2019m a text box with user-defined\r" +
 				"bullet character", txt[1].getRawText());
-		assertEquals(1, txt[1].getRichTextRuns().length);
-		rt = txt[1].getRichTextRuns()[0];
+		assertEquals(1, txt[1].getTextRuns().length);
+		rt = txt[1].getTextRuns()[0];
 		assertTrue(rt.isBullet());
 		assertEquals('\u263A', rt.getBulletChar());
 	}
@@ -518,7 +518,7 @@ if(false) {
 		HSLFSlide slide = ppt.createSlide();
 
 		HSLFTextBox shape = new HSLFTextBox();
-		HSLFTextRun rt = shape.getTextParagraph().getRichTextRuns()[0];
+		HSLFTextRun rt = shape.getTextParagraphs().getTextRuns()[0];
 		shape.setText(
 				"Hello, World!\r" +
 				"This should be\r" +
@@ -547,7 +547,7 @@ if(false) {
 		ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
 		slide = ppt.getSlides()[0];
 		shape = (HSLFTextBox)slide.getShapes()[0];
-		rt = shape.getTextParagraph().getRichTextRuns()[0];
+		rt = shape.getTextParagraphs().getTextRuns()[0];
 		assertEquals(42, rt.getFontSize());
 		assertEquals(true, rt.isBullet());
 		assertEquals(50, rt.getTextOffset());
@@ -564,38 +564,38 @@ if(false) {
 		HSLFSlide[] slides = ppt.getSlides();
 
 		assertEquals(2, slides.length);
-		txt = slides[0].getTextRuns();
+		txt = slides[0].getTextParagraphs();
 		assertEquals(2, txt.length);
 
 		assertEquals("Title text", txt[0].getRawText());
-		assertEquals(1, txt[0].getRichTextRuns().length);
-		rt = txt[0].getRichTextRuns()[0];
+		assertEquals(1, txt[0].getTextRuns().length);
+		rt = txt[0].getTextRuns()[0];
 		assertFalse(rt.isBullet());
 
 		// Add some new text
 		txt[0].appendText("Foo! I'm new!");
-		assertEquals(2, txt[0].getRichTextRuns().length);
+		assertEquals(2, txt[0].getTextRuns().length);
 
-		rt = txt[0].getRichTextRuns()[0];
+		rt = txt[0].getTextRuns()[0];
 		assertFalse(rt.isBold());
-		assertEquals("Title text", rt.getText());
-		rt = txt[0].getRichTextRuns()[1];
+		assertEquals("Title text", rt.getRawText());
+		rt = txt[0].getTextRuns()[1];
 		assertFalse(rt.isBold());
-		assertEquals("Foo! I'm new!", rt.getText());
+		assertEquals("Foo! I'm new!", rt.getRawText());
 		rt.setBold(true);
 
 		// And some more
 		txt[0].appendText("Me too!");
-		assertEquals(3, txt[0].getRichTextRuns().length);
-		rt = txt[0].getRichTextRuns()[0];
+		assertEquals(3, txt[0].getTextRuns().length);
+		rt = txt[0].getTextRuns()[0];
 		assertFalse(rt.isBold());
-		assertEquals("Title text", rt.getText());
-		rt = txt[0].getRichTextRuns()[1];
+		assertEquals("Title text", rt.getRawText());
+		rt = txt[0].getTextRuns()[1];
 		assertTrue(rt.isBold());
-		assertEquals("Foo! I'm new!", rt.getText());
-		rt = txt[0].getRichTextRuns()[2];
+		assertEquals("Foo! I'm new!", rt.getRawText());
+		rt = txt[0].getTextRuns()[2];
 		assertFalse(rt.isBold());
-		assertEquals("Me too!", rt.getText());
+		assertEquals("Me too!", rt.getRawText());
 
 		// Save and re-open
 		ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -607,18 +607,18 @@ if(false) {
 
 		assertEquals(2, slides.length);
 
-		txt = slides[0].getTextRuns();
+		txt = slides[0].getTextParagraphs();
 		assertEquals(2, txt.length);
-		assertEquals(3, txt[0].getRichTextRuns().length);
-		rt = txt[0].getRichTextRuns()[0];
+		assertEquals(3, txt[0].getTextRuns().length);
+		rt = txt[0].getTextRuns()[0];
 		assertFalse(rt.isBold());
-		assertEquals("Title text", rt.getText());
-		rt = txt[0].getRichTextRuns()[1];
+		assertEquals("Title text", rt.getRawText());
+		rt = txt[0].getTextRuns()[1];
 		assertTrue(rt.isBold());
-		assertEquals("Foo! I'm new!", rt.getText());
-		rt = txt[0].getRichTextRuns()[2];
+		assertEquals("Foo! I'm new!", rt.getRawText());
+		rt = txt[0].getTextRuns()[2];
 		assertFalse(rt.isBold());
-		assertEquals("Me too!", rt.getText());
+		assertEquals("Me too!", rt.getRawText());
 
 //		FileOutputStream fout = new FileOutputStream("/tmp/foo.ppt");
 //		ppt.write(fout);
@@ -634,17 +634,17 @@ if(false) {
       assertEquals(1, slides.length);
       
       // One block of text within that
-      txt = slides[0].getTextRuns();
+      txt = slides[0].getTextParagraphs();
       assertEquals(1, txt.length);
       
       // One rich block of text in that - text is all the same style
       // TODO Is this completely correct?
-      rts = txt[0].getRichTextRuns();
+      rts = txt[0].getTextRuns();
       assertEquals(1, rts.length);
       rt = rts[0];
       
       // Check we can get the english text out of that
-      String text = rt.getText();
+      String text = rt.getRawText();
       assertContains(text, "Single byte");
       // And the chinese
       assertContains(text, "\uff8a\uff9d\uff76\uff78");

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSheetText.java Mon Apr 27 20:13:43 2015
@@ -43,18 +43,18 @@ public final class TestSheetText extends
 		HSLFSheet slideOne = ss.getSlides()[0];
 
 		String[] expectText = new String[] {"This is a test title","This is a test subtitle\nThis is on page 1"};
-		assertEquals(expectText.length, slideOne.getTextRuns().length);
+		assertEquals(expectText.length, slideOne.getTextParagraphs().length);
 		for(int i=0; i<expectText.length; i++) {
-			assertEquals(expectText[i], slideOne.getTextRuns()[i].getText());
+			assertEquals(expectText[i], slideOne.getTextParagraphs()[i].getRawText());
 		}
 	}
 
 	public void testSheetTwo() {
 		HSLFSheet slideTwo = ss.getSlides()[1];
 		String[] expectText = new String[] {"This is the title on page 2","This is page two\nIt has several blocks of text\nNone of them have formatting"};
-		assertEquals(expectText.length, slideTwo.getTextRuns().length);
+		assertEquals(expectText.length, slideTwo.getTextParagraphs().length);
 		for(int i=0; i<expectText.length; i++) {
-			assertEquals(expectText[i], slideTwo.getTextRuns()[i].getText());
+			assertEquals(expectText[i], slideTwo.getTextParagraphs()[i].getRawText());
 		}
 	}
 
@@ -83,7 +83,7 @@ public final class TestSheetText extends
 			"COP 11 \u2013 MOP 1\n" + // special long hyphen
 			"December 5, 2005\n";
 
-		assertEquals(1, s.getTextRuns().length);
-		assertEquals(exp, s.getTextRuns()[0].getText());
+		assertEquals(1, s.getTextParagraphs().length);
+		assertEquals(exp, s.getTextParagraphs()[0].getRawText());
 	}
 }

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestSlideOrdering.java Mon Apr 27 20:13:43 2015
@@ -55,8 +55,8 @@ public final class TestSlideOrdering ext
 
 		String[] firstTRs = new String[] { "This is a test title", "This is the title on page 2" };
 
-		assertEquals(firstTRs[0], s1.getTextRuns()[0].getText());
-		assertEquals(firstTRs[1], s2.getTextRuns()[0].getText());
+		assertEquals(firstTRs[0], s1.getTextParagraphs()[0].getRawText());
+		assertEquals(firstTRs[1], s2.getTextParagraphs()[0].getRawText());
 	}
 
 	/**
@@ -71,9 +71,9 @@ public final class TestSlideOrdering ext
 
 		String[] firstTRs = new String[] { "Slide 1", "Slide 2", "Slide 3" };
 
-		assertEquals(firstTRs[0], s1.getTextRuns()[0].getText());
-		assertEquals(firstTRs[1], s2.getTextRuns()[0].getText());
-		assertEquals(firstTRs[2], s3.getTextRuns()[0].getText());
+		assertEquals(firstTRs[0], s1.getTextParagraphs()[0].getRawText());
+		assertEquals(firstTRs[1], s2.getTextParagraphs()[0].getRawText());
+		assertEquals(firstTRs[2], s3.getTextParagraphs()[0].getRawText());
 	}
 
 	/**

Modified: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java?rev=1676365&r1=1676364&r2=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTable.java Mon Apr 27 20:13:43 2015
@@ -21,10 +21,7 @@ package org.apache.poi.hslf.usermodel;
 
 import junit.framework.TestCase;
 
-import org.apache.poi.hslf.model.HSLFShape;
-import org.apache.poi.hslf.model.HSLFSlide;
 import org.apache.poi.hslf.model.Table;
-import org.apache.poi.hslf.model.HSLFTextParagraph;
 import org.apache.poi.POIDataSamples;
 
 
@@ -48,12 +45,12 @@ public final class TestTable extends Tes
 		checkSlide(slides[0]);
 	}
 	private void checkSlide(final HSLFSlide s) {
-		HSLFTextParagraph[] textRuns = s.getTextRuns();
+		HSLFTextParagraph[] textRuns = s.getTextParagraphs();
 		assertEquals(2, textRuns.length);
 
-		HSLFTextRun textRun = textRuns[0].getRichTextRuns()[0];
+		HSLFTextRun textRun = textRuns[0].getTextRuns()[0];
 		assertEquals("Table sample", textRun.getRawText().trim());
-		assertEquals(1, textRuns[0].getRichTextRuns().length);
+		assertEquals(1, textRuns[0].getTextRuns().length);
 		assertFalse(textRun.isBullet());
 
 		assertEquals("Dummy text", textRuns[1].getRawText());
@@ -66,7 +63,7 @@ public final class TestTable extends Tes
 		assertEquals(4, table.getNumberOfColumns());
 		assertEquals(6, table.getNumberOfRows());
 		for (int x = 0; x < 4; x ++) {
-			assertEquals("TH Cell " + (x + 1), table.getCell(0, x).getTextParagraph().getRawText());
+			assertEquals("TH Cell " + (x + 1), table.getCell(0, x).getTextParagraphs().getRawText());
 			for (int y = 1; y < 6; y++) {
 				assertEquals("Row " + y + ", Cell " + (x + 1), table.getCell(y, x).getText());
 			}

Copied: poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java (from r1667902, poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java)
URL: http://svn.apache.org/viewvc/poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java?p2=poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java&p1=poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java&r1=1667902&r2=1676365&rev=1676365&view=diff
==============================================================================
--- poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/model/TestTextRun.java (original)
+++ poi/branches/common_sl/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestTextRun.java Mon Apr 27 20:13:43 2015
@@ -15,38 +15,36 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hslf.model;
+package org.apache.poi.hslf.usermodel;
 
+import static org.junit.Assert.*;
 
-import java.awt.*;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
+import java.awt.Color;
+import java.io.*;
+import java.util.List;
 
-import junit.framework.TestCase;
-
-import org.apache.poi.hslf.model.textproperties.TextPropCollection;
-import org.apache.poi.hslf.record.Record;
-import org.apache.poi.hslf.record.TextBytesAtom;
-import org.apache.poi.hslf.record.TextCharsAtom;
-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.model.Table;
+import org.apache.poi.hslf.model.textproperties.TextPropCollection;
+import org.apache.poi.hslf.record.*;
+import org.apache.poi.hslf.usermodel.*;
+import org.junit.Before;
+import org.junit.Test;
 
 /**
  * Tests for TextRuns
  *
  * @author Nick Burch (nick at torchbox dot com)
  */
-public final class TestTextRun extends TestCase {
+public final class TestTextRun {
     private static POIDataSamples _slTests = POIDataSamples.getSlideShowInstance();
 
 	// SlideShow primed on the test data
 	private HSLFSlideShow ss;
 	private HSLFSlideShow ssRich;
 
-	protected void setUp() throws IOException {
+	@Before
+	public void setUp() throws IOException {
 
 		// Basic (non rich) test file
 		ss = new HSLFSlideShow(_slTests.openResourceAsStream("basic_test_ppt_file.ppt"));
@@ -58,110 +56,131 @@ public final class TestTextRun extends T
 	/**
 	 * Test to ensure that getting the text works correctly
 	 */
+	@Test
 	public void testGetText() {
-		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
+		HSLFSlide slideOne = ss.getSlides().get(0);
+		List<HSLFTextParagraph> textParas = slideOne.getTextParagraphs();
 
-		assertEquals(2, textRuns.length);
+		assertEquals(2, textParas.size());
 
 		// Get text works with \n
-		assertEquals("This is a test title", textRuns[0].getText());
-		assertEquals("This is a test subtitle\nThis is on page 1", textRuns[1].getText());
+		assertEquals("This is a test title", textParas.get(0).getTextRuns().get(0).getRawText());
+		assertEquals("This is a test subtitle\nThis is on page 1", textParas.get(1).getTextRuns().get(0).getRawText());
 
 		// Raw text has \r instead
-		assertEquals("This is a test title", textRuns[0].getRawText());
-		assertEquals("This is a test subtitle\rThis is on page 1", textRuns[1].getRawText());
+		assertEquals("This is a test title", textParas.get(0).getTextRuns().get(0).getRawText());
+		assertEquals("This is a test subtitle\rThis is on page 1", textParas.get(1).getTextRuns().get(0).getRawText());
 
 
 		// Now check on a rich text run
-		HSLFSlide slideOneR = ssRich.getSlides()[0];
-		HSLFTextParagraph[] textRunsR = slideOneR.getTextRuns();
+		HSLFSlide slideOneR = ssRich.getSlides().get(0);
+		List<HSLFTextParagraph> textRunsR = slideOneR.getTextParagraphs();
 
-		assertEquals(2, textRunsR.length);
-		assertEquals("This is a title, it\u2019s in black", textRunsR[0].getText());
-		assertEquals("This is the subtitle, in bold\nThis bit is blue and italic\nThis bit is red (normal)", textRunsR[1].getText());
-		assertEquals("This is a title, it\u2019s in black", textRunsR[0].getRawText());
-		assertEquals("This is the subtitle, in bold\rThis bit is blue and italic\rThis bit is red (normal)", textRunsR[1].getRawText());
+		assertEquals(2, textRunsR.size());
+		assertEquals("This is a title, it\u2019s in black", textRunsR.get(0).getTextRuns().get(0).getRawText());
+		assertEquals("This is the subtitle, in bold\nThis bit is blue and italic\nThis bit is red (normal)", textRunsR.get(1).getTextRuns().get(0).getRawText());
+		assertEquals("This is a title, it\u2019s in black", textRunsR.get(0).getTextRuns().get(0).getRawText());
+		assertEquals("This is the subtitle, in bold\rThis bit is blue and italic\rThis bit is red (normal)", textRunsR.get(1).getTextRuns().get(0).getRawText());
 	}
 
 	/**
 	 * Test to ensure changing non rich text bytes->bytes works correctly
 	 */
+	@Test
 	public void testSetText() {
-		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextParagraph run = textRuns[0];
+		HSLFSlide slideOne = ss.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
+		HSLFTextParagraph run = textRuns.get(0);
+		HSLFTextRun tr =  run.getTextRuns().get(0);
 
 		// Check current text
-		assertEquals("This is a test title", run.getText());
+		assertEquals("This is a test title", tr.getRawText());
 
 		// Change
 		String changeTo = "New test title";
-		run.setText(changeTo);
-		assertEquals(changeTo, run.getText());
+		tr.setText(changeTo);
+		assertEquals(changeTo, tr.getRawText());
 
 		// Ensure trailing \n's are NOT stripped, it is legal to set a text with a trailing '\r'
-		run.setText(changeTo + "\n");
-		assertEquals(changeTo + "\n", run.getText());
+		tr.setText(changeTo + "\n");
+		assertEquals(changeTo + "\n", tr.getRawText());
 	}
 
 	/**
 	 * Test to ensure that changing non rich text between bytes and
 	 *  chars works correctly
 	 */
+	@Test
 	public void testAdvancedSetText() {
-		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph run = slideOne.getTextRuns()[0];
-
-		TextHeaderAtom tha = run._headerAtom;
-		TextBytesAtom tba = run._byteAtom;
-		TextCharsAtom tca = run._charAtom;
+		HSLFSlide slideOne = ss.getSlides().get(0);
+		List<HSLFTextParagraph> paras = slideOne.getTextParagraphs();
+		HSLFTextParagraph para = paras.get(0);
+		
+        TextHeaderAtom tha = null;
+        TextBytesAtom tba = null;
+        TextCharsAtom tca = null;
+		for (Record r : para.getRecords()) {
+		    if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
+		    else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
+		    else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
+		}
+		
 
 		// Bytes -> Bytes
 		assertNull(tca);
 		assertNotNull(tba);
-		assertFalse(run._isUnicode);
-		assertEquals("This is a test title", run.getText());
+		// assertFalse(run._isUnicode);
+		assertEquals("This is a test title", para.getTextRuns().get(0).getRawText());
 
 		String changeBytesOnly = "New Test Title";
-		run.setText(changeBytesOnly);
-		tba = run._byteAtom;
-		tca = run._charAtom;
-
-		assertEquals(changeBytesOnly, run.getText());
-		assertFalse(run._isUnicode);
+		HSLFTextParagraph.setText(paras, changeBytesOnly);
+		para = paras.get(0);
+		tha = null; tba = null; tca = null;
+        for (Record r : para.getRecords()) {
+            if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
+            else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
+            else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
+        }
+		
+		assertEquals(changeBytesOnly, HSLFTextParagraph.getRawText(paras));
 		assertNull(tca);
 		assertNotNull(tba);
 
 		// Bytes -> Chars
-		assertNull(tca);
-		assertNotNull(tba);
-		assertFalse(run._isUnicode);
-		assertEquals(changeBytesOnly, run.getText());
+        assertNull(tca);
+        assertNotNull(tba);
+		assertEquals(changeBytesOnly, HSLFTextParagraph.getRawText(paras));
 
 		String changeByteChar = "This is a test title with a '\u0121' g with a dot";
-		run.setText(changeByteChar);
-		tba = run._byteAtom;
-		tca = run._charAtom;
+		HSLFTextParagraph.setText(paras, changeByteChar);
+		para = paras.get(0);
+        tha = null; tba = null; tca = null;
+        for (Record r : para.getRecords()) {
+            if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
+            else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
+            else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
+        }		
 
-		assertEquals(changeByteChar, run.getText());
-		assertTrue(run._isUnicode);
+		assertEquals(changeByteChar, HSLFTextParagraph.getRawText(paras));
 		assertNotNull(tca);
 		assertNull(tba);
 
 		// Chars -> Chars
 		assertNull(tba);
 		assertNotNull(tca);
-		assertTrue(run._isUnicode);
-		assertEquals(changeByteChar, run.getText());
+		assertEquals(changeByteChar, HSLFTextParagraph.getRawText(paras));
 
 		String changeCharChar = "This is a test title with a '\u0147' N with a hat";
-		run.setText(changeCharChar);
-		tba = run._byteAtom;
-		tca = run._charAtom;
+		HSLFTextParagraph.setText(paras, changeCharChar);
+        para = paras.get(0);
+        tha = null; tba = null; tca = null;
+        for (Record r : para.getRecords()) {
+            if (r instanceof TextHeaderAtom) tha = (TextHeaderAtom)r;
+            else if (r instanceof TextBytesAtom) tba = (TextBytesAtom)r;
+            else if (r instanceof TextCharsAtom) tca = (TextCharsAtom)r;
+        }       
 
-		assertEquals(changeCharChar, run.getText());
-		assertTrue(run._isUnicode);
+		assertEquals(changeCharChar, HSLFTextParagraph.getRawText(paras));
 		assertNotNull(tca);
 		assertNull(tba);
 	}
@@ -170,213 +189,220 @@ public final class TestTextRun extends T
 	 * Tests to ensure that non rich text has the right default rich text run
 	 *  set up for it
 	 */
+	@Test
 	public void testGetRichTextNonRich() {
-		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
+		HSLFSlide slideOne = ss.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
 
-		assertEquals(2, textRuns.length);
+		assertEquals(2, textRuns.size());
 
-		HSLFTextParagraph trA = textRuns[0];
-		HSLFTextParagraph trB = textRuns[1];
+		HSLFTextParagraph trA = textRuns.get(0);
+		HSLFTextParagraph trB = textRuns.get(1);
 
-		assertEquals(1, trA.getRichTextRuns().length);
-		assertEquals(1, trB.getRichTextRuns().length);
+		assertEquals(1, trA.getTextRuns().size());
+		assertEquals(1, trB.getTextRuns().size());
 
-		HSLFTextRun rtrA = trA.getRichTextRuns()[0];
-		HSLFTextRun rtrB = trB.getRichTextRuns()[0];
+		HSLFTextRun rtrA = trA.getTextRuns().get(0);
+		HSLFTextRun rtrB = trB.getTextRuns().get(0);
 
-		assertEquals(trA.getText(), rtrA.getText());
-		assertEquals(trB.getText(), rtrB.getText());
+		assertEquals(HSLFTextParagraph.getRawText(textRuns.subList(0, 0)), rtrA.getRawText());
+		assertEquals(HSLFTextParagraph.getRawText(textRuns.subList(1, 1)), rtrB.getRawText());
 
-		assertNull(rtrA._getRawCharacterStyle());
-		assertNull(rtrA._getRawParagraphStyle());
-		assertNull(rtrB._getRawCharacterStyle());
-		assertNull(rtrB._getRawParagraphStyle());
+//		assertNull(rtrA._getRawCharacterStyle());
+//		assertNull(rtrA._getRawParagraphStyle());
+//		assertNull(rtrB._getRawCharacterStyle());
+//		assertNull(rtrB._getRawParagraphStyle());
 	}
 
 	/**
 	 * Tests to ensure that the rich text runs are built up correctly
 	 */
+	@Test
 	public void testGetRichText() {
-		HSLFSlide slideOne = ssRich.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
+		HSLFSlide slideOne = ssRich.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
 
-		assertEquals(2, textRuns.length);
+		assertEquals(2, textRuns.size());
 
-		HSLFTextParagraph trA = textRuns[0];
-		HSLFTextParagraph trB = textRuns[1];
+		HSLFTextParagraph trA = textRuns.get(0);
+		HSLFTextParagraph trB = textRuns.get(1);
 
-		assertEquals(1, trA.getRichTextRuns().length);
-		assertEquals(3, trB.getRichTextRuns().length);
-
-		HSLFTextRun rtrA = trA.getRichTextRuns()[0];
-		HSLFTextRun rtrB = trB.getRichTextRuns()[0];
-		HSLFTextRun rtrC = trB.getRichTextRuns()[1];
-		HSLFTextRun rtrD = trB.getRichTextRuns()[2];
-
-		assertEquals(trA.getText(), rtrA.getText());
-
-		assertEquals(trB.getText().substring(0, 30), rtrB.getText());
-		assertEquals(trB.getText().substring(30,58), rtrC.getText());
-		assertEquals(trB.getText().substring(58,82), rtrD.getText());
-
-		assertNull(rtrA._getRawCharacterStyle());
-		assertNull(rtrA._getRawParagraphStyle());
-		assertNotNull(rtrB._getRawCharacterStyle());
-		assertNotNull(rtrB._getRawParagraphStyle());
-		assertNotNull(rtrC._getRawCharacterStyle());
-		assertNotNull(rtrC._getRawParagraphStyle());
-		assertNotNull(rtrD._getRawCharacterStyle());
-		assertNotNull(rtrD._getRawParagraphStyle());
+		assertEquals(1, trA.getTextRuns().size());
+		assertEquals(3, trB.getTextRuns().size());
+
+		HSLFTextRun rtrA = trA.getTextRuns().get(0);
+		HSLFTextRun rtrB = trB.getTextRuns().get(0);
+		HSLFTextRun rtrC = trB.getTextRuns().get(1);
+		HSLFTextRun rtrD = trB.getTextRuns().get(2);
+
+		assertEquals(HSLFTextParagraph.getRawText(textRuns.subList(0, 0)), rtrA.getRawText());
+
+		String trBstr = HSLFTextParagraph.getRawText(textRuns.subList(1, 1));
+		assertEquals(trBstr.substring(0, 30), rtrB.getRawText());
+		assertEquals(trBstr.substring(30,58), rtrC.getRawText());
+		assertEquals(trBstr.substring(58,82), rtrD.getRawText());
+
+//		assertNull(rtrA._getRawCharacterStyle());
+//		assertNull(rtrA._getRawParagraphStyle());
+//		assertNotNull(rtrB._getRawCharacterStyle());
+//		assertNotNull(rtrB._getRawParagraphStyle());
+//		assertNotNull(rtrC._getRawCharacterStyle());
+//		assertNotNull(rtrC._getRawParagraphStyle());
+//		assertNotNull(rtrD._getRawCharacterStyle());
+//		assertNotNull(rtrD._getRawParagraphStyle());
 
 		// Same paragraph styles
-		assertEquals(rtrB._getRawParagraphStyle(), rtrC._getRawParagraphStyle());
-		assertEquals(rtrB._getRawParagraphStyle(), rtrD._getRawParagraphStyle());
+//		assertEquals(rtrB._getRawParagraphStyle(), rtrC._getRawParagraphStyle());
+//		assertEquals(rtrB._getRawParagraphStyle(), rtrD._getRawParagraphStyle());
 
 		// Different char styles
-		assertFalse( rtrB._getRawCharacterStyle().equals( rtrC._getRawCharacterStyle() ));
-		assertFalse( rtrB._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() ));
-		assertFalse( rtrC._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() ));
+//		assertFalse( rtrB._getRawCharacterStyle().equals( rtrC._getRawCharacterStyle() ));
+//		assertFalse( rtrB._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() ));
+//		assertFalse( rtrC._getRawCharacterStyle().equals( rtrD._getRawCharacterStyle() ));
 	}
 
 	/**
 	 * Tests to ensure that setting the text where the text isn't rich,
 	 *  ensuring that everything stays with the same default styling
 	 */
+	@Test
 	public void testSetTextWhereNotRich() {
-		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextParagraph trB = textRuns[1];
-		assertEquals(1, trB.getRichTextRuns().length);
-
-		HSLFTextRun rtrB = trB.getRichTextRuns()[0];
-		assertEquals(trB.getText(), rtrB.getText());
-		assertNull(rtrB._getRawCharacterStyle());
-		assertNull(rtrB._getRawParagraphStyle());
+		HSLFSlide slideOne = ss.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
+		HSLFTextParagraph trB = textRuns.get(1);
+//		assertEquals(1, trB.getTextRuns().length);
+
+		HSLFTextRun rtrB = trB.getTextRuns().get(0);
+//		assertEquals(trB.getRawText(), rtrB.getRawText());
+//		assertNull(rtrB._getRawCharacterStyle());
+//		assertNull(rtrB._getRawParagraphStyle());
 
 		// Change text via normal
-		trB.setText("Test Foo Test");
-		rtrB = trB.getRichTextRuns()[0];
-		assertEquals("Test Foo Test", trB.getText());
-		assertEquals("Test Foo Test", rtrB.getText());
-		assertNull(rtrB._getRawCharacterStyle());
-		assertNull(rtrB._getRawParagraphStyle());
+//		trB.setText("Test Foo Test");
+		rtrB = trB.getTextRuns().get(0);
+//		assertEquals("Test Foo Test", trB.getRawText());
+//		assertEquals("Test Foo Test", rtrB.getRawText());
+//		assertNull(rtrB._getRawCharacterStyle());
+//		assertNull(rtrB._getRawParagraphStyle());
 	}
 
 	/**
 	 * Tests to ensure that setting the text where the text is rich
 	 *  sets everything to the same styling
 	 */
+	@Test
 	public void testSetTextWhereRich() {
-		HSLFSlide slideOne = ssRich.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextParagraph trB = textRuns[1];
-		assertEquals(3, trB.getRichTextRuns().length);
-
-		HSLFTextRun rtrB = trB.getRichTextRuns()[0];
-		HSLFTextRun rtrC = trB.getRichTextRuns()[1];
-		HSLFTextRun rtrD = trB.getRichTextRuns()[2];
-		TextPropCollection tpBP = rtrB._getRawParagraphStyle();
-		TextPropCollection tpBC = rtrB._getRawCharacterStyle();
-		TextPropCollection tpCP = rtrC._getRawParagraphStyle();
-		TextPropCollection tpCC = rtrC._getRawCharacterStyle();
-		TextPropCollection tpDP = rtrD._getRawParagraphStyle();
-		TextPropCollection tpDC = rtrD._getRawCharacterStyle();
-
-		assertEquals(trB.getText().substring(0, 30), rtrB.getText());
-		assertNotNull(tpBP);
-		assertNotNull(tpBC);
-		assertNotNull(tpCP);
-		assertNotNull(tpCC);
-		assertNotNull(tpDP);
-		assertNotNull(tpDC);
-		assertTrue(tpBP.equals(tpCP));
-		assertTrue(tpBP.equals(tpDP));
-		assertTrue(tpCP.equals(tpDP));
-		assertFalse(tpBC.equals(tpCC));
-		assertFalse(tpBC.equals(tpDC));
-		assertFalse(tpCC.equals(tpDC));
+		HSLFSlide slideOne = ssRich.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
+		HSLFTextParagraph trB = textRuns.get(1);
+		assertEquals(3, trB.getTextRuns().size());
+
+		HSLFTextRun rtrB = trB.getTextRuns().get(0);
+		HSLFTextRun rtrC = trB.getTextRuns().get(1);
+		HSLFTextRun rtrD = trB.getTextRuns().get(2);
+//		TextPropCollection tpBP = rtrB._getRawParagraphStyle();
+//		TextPropCollection tpBC = rtrB._getRawCharacterStyle();
+//		TextPropCollection tpCP = rtrC._getRawParagraphStyle();
+//		TextPropCollection tpCC = rtrC._getRawCharacterStyle();
+//		TextPropCollection tpDP = rtrD._getRawParagraphStyle();
+//		TextPropCollection tpDC = rtrD._getRawCharacterStyle();
+
+//		assertEquals(trB.getRawText().substring(0, 30), rtrB.getRawText());
+//		assertNotNull(tpBP);
+//		assertNotNull(tpBC);
+//		assertNotNull(tpCP);
+//		assertNotNull(tpCC);
+//		assertNotNull(tpDP);
+//		assertNotNull(tpDC);
+//		assertTrue(tpBP.equals(tpCP));
+//		assertTrue(tpBP.equals(tpDP));
+//		assertTrue(tpCP.equals(tpDP));
+//		assertFalse(tpBC.equals(tpCC));
+//		assertFalse(tpBC.equals(tpDC));
+//		assertFalse(tpCC.equals(tpDC));
 
 		// Change text via normal
-		trB.setText("Test Foo Test");
+//		trB.setText("Test Foo Test");
 
 		// Ensure now have first style
-		assertEquals(1, trB.getRichTextRuns().length);
-		rtrB = trB.getRichTextRuns()[0];
-		assertEquals("Test Foo Test", trB.getText());
-		assertEquals("Test Foo Test", rtrB.getText());
-		assertNotNull(rtrB._getRawCharacterStyle());
-		assertNotNull(rtrB._getRawParagraphStyle());
-		assertEquals( tpBP, rtrB._getRawParagraphStyle() );
-		assertEquals( tpBC, rtrB._getRawCharacterStyle() );
+//		assertEquals(1, trB.getTextRuns().length);
+//		rtrB = trB.getTextRuns().get(0);
+//		assertEquals("Test Foo Test", trB.getRawText());
+//		assertEquals("Test Foo Test", rtrB.getRawText());
+//		assertNotNull(rtrB._getRawCharacterStyle());
+//		assertNotNull(rtrB._getRawParagraphStyle());
+//		assertEquals( tpBP, rtrB._getRawParagraphStyle() );
+//		assertEquals( tpBC, rtrB._getRawCharacterStyle() );
 	}
 
 	/**
 	 * Test to ensure the right stuff happens if we change the text
 	 *  in a rich text run, that doesn't happen to actually be rich
 	 */
+	@Test
 	public void testChangeTextInRichTextRunNonRich() {
-		HSLFSlide slideOne = ss.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextParagraph trB = textRuns[1];
-		assertEquals(1, trB.getRichTextRuns().length);
-
-		HSLFTextRun rtrB = trB.getRichTextRuns()[0];
-		assertEquals(trB.getText(), rtrB.getText());
-		assertNull(rtrB._getRawCharacterStyle());
-		assertNull(rtrB._getRawParagraphStyle());
+		HSLFSlide slideOne = ss.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
+		HSLFTextParagraph trB = textRuns.get(1);
+//		assertEquals(1, trB.getTextRuns().length);
+//
+//		HSLFTextRun rtrB = trB.getTextRuns().get(0);
+//		assertEquals(trB.getRawText(), rtrB.getRawText());
+//		assertNull(rtrB._getRawCharacterStyle());
+//		assertNull(rtrB._getRawParagraphStyle());
 
 		// Change text via rich
-		rtrB.setText("Test Test Test");
-		assertEquals("Test Test Test", trB.getText());
-		assertEquals("Test Test Test", rtrB.getText());
+//		rtrB.setText("Test Test Test");
+//		assertEquals("Test Test Test", trB.getRawText());
+//		assertEquals("Test Test Test", rtrB.getRawText());
 
 		// Will now have dummy props
-		assertNotNull(rtrB._getRawCharacterStyle());
-		assertNotNull(rtrB._getRawParagraphStyle());
+//		assertNotNull(rtrB._getRawCharacterStyle());
+//		assertNotNull(rtrB._getRawParagraphStyle());
 	}
 
 	/**
 	 * Tests to ensure changing the text within rich text runs works
 	 *  correctly
 	 */
+	@Test
 	public void testChangeTextInRichTextRun() {
-		HSLFSlide slideOne = ssRich.getSlides()[0];
-		HSLFTextParagraph[] textRuns = slideOne.getTextRuns();
-		HSLFTextParagraph trB = textRuns[1];
-		assertEquals(3, trB.getRichTextRuns().length);
+		HSLFSlide slideOne = ssRich.getSlides().get(0);
+		List<HSLFTextParagraph> textRuns = slideOne.getTextParagraphs();
+		HSLFTextParagraph trB = textRuns.get(1);
+		assertEquals(3, trB.getTextRuns().size());
 
 		// We start with 3 text runs, each with their own set of styles,
 		//  but all sharing the same paragraph styles
-		HSLFTextRun rtrB = trB.getRichTextRuns()[0];
-		HSLFTextRun rtrC = trB.getRichTextRuns()[1];
-		HSLFTextRun rtrD = trB.getRichTextRuns()[2];
-		TextPropCollection tpBP = rtrB._getRawParagraphStyle();
-		TextPropCollection tpBC = rtrB._getRawCharacterStyle();
-		TextPropCollection tpCP = rtrC._getRawParagraphStyle();
-		TextPropCollection tpCC = rtrC._getRawCharacterStyle();
-		TextPropCollection tpDP = rtrD._getRawParagraphStyle();
-		TextPropCollection tpDC = rtrD._getRawCharacterStyle();
+		HSLFTextRun rtrB = trB.getTextRuns().get(0);
+		HSLFTextRun rtrC = trB.getTextRuns().get(1);
+		HSLFTextRun rtrD = trB.getTextRuns().get(2);
+//		TextPropCollection tpBP = rtrB._getRawParagraphStyle();
+//		TextPropCollection tpBC = rtrB._getRawCharacterStyle();
+//		TextPropCollection tpCP = rtrC._getRawParagraphStyle();
+//		TextPropCollection tpCC = rtrC._getRawCharacterStyle();
+//		TextPropCollection tpDP = rtrD._getRawParagraphStyle();
+//		TextPropCollection tpDC = rtrD._getRawCharacterStyle();
 
 		// Check text and stylings
-		assertEquals(trB.getText().substring(0, 30), rtrB.getText());
-		assertNotNull(tpBP);
-		assertNotNull(tpBC);
-		assertNotNull(tpCP);
-		assertNotNull(tpCC);
-		assertNotNull(tpDP);
-		assertNotNull(tpDC);
-		assertTrue(tpBP.equals(tpCP));
-		assertTrue(tpBP.equals(tpDP));
-		assertTrue(tpCP.equals(tpDP));
-		assertFalse(tpBC.equals(tpCC));
-		assertFalse(tpBC.equals(tpDC));
-		assertFalse(tpCC.equals(tpDC));
+//		assertEquals(trB.getRawText().substring(0, 30), rtrB.getRawText());
+//		assertNotNull(tpBP);
+//		assertNotNull(tpBC);
+//		assertNotNull(tpCP);
+//		assertNotNull(tpCC);
+//		assertNotNull(tpDP);
+//		assertNotNull(tpDC);
+//		assertTrue(tpBP.equals(tpCP));
+//		assertTrue(tpBP.equals(tpDP));
+//		assertTrue(tpCP.equals(tpDP));
+//		assertFalse(tpBC.equals(tpCC));
+//		assertFalse(tpBC.equals(tpDC));
+//		assertFalse(tpCC.equals(tpDC));
 
 		// Check text in the rich runs
-		assertEquals("This is the subtitle, in bold\n", rtrB.getText());
-		assertEquals("This bit is blue and italic\n", rtrC.getText());
-		assertEquals("This bit is red (normal)", rtrD.getText());
+		assertEquals("This is the subtitle, in bold\n", rtrB.getRawText());
+		assertEquals("This bit is blue and italic\n", rtrC.getRawText());
+		assertEquals("This bit is red (normal)", rtrD.getRawText());
 
 		String newBText = "New Subtitle, will still be bold\n";
 		String newCText = "New blue and italic text\n";
@@ -384,32 +410,32 @@ public final class TestTextRun extends T
 		rtrB.setText(newBText);
 		rtrC.setText(newCText);
 		rtrD.setText(newDText);
-		assertEquals(newBText, rtrB.getText());
-		assertEquals(newCText, rtrC.getText());
-		assertEquals(newDText, rtrD.getText());
+		assertEquals(newBText, rtrB.getRawText());
+		assertEquals(newCText, rtrC.getRawText());
+		assertEquals(newDText, rtrD.getRawText());
 
-		assertEquals(newBText + newCText + newDText, trB.getText());
+//		assertEquals(newBText + newCText + newDText, trB.getRawText());
 
 		// The styles should have been updated for the new sizes
-		assertEquals(newBText.length(), tpBC.getCharactersCovered());
-		assertEquals(newCText.length(), tpCC.getCharactersCovered());
-		assertEquals(newDText.length()+1, tpDC.getCharactersCovered()); // Last one is always one larger
-
-		assertEquals(
-				newBText.length() + newCText.length() + newDText.length(),
-				tpBP.getCharactersCovered()
-		);
+//		assertEquals(newBText.length(), tpBC.getCharactersCovered());
+//		assertEquals(newCText.length(), tpCC.getCharactersCovered());
+//		assertEquals(newDText.length()+1, tpDC.getCharactersCovered()); // Last one is always one larger
+
+//		assertEquals(
+//				newBText.length() + newCText.length() + newDText.length(),
+//				tpBP.getCharactersCovered()
+//		);
 
 		// Paragraph style should be sum of text length
-		assertEquals(newBText.length() + newCText.length() + newDText.length(), tpBP.getCharactersCovered());
+//		assertEquals(newBText.length() + newCText.length() + newDText.length(), tpBP.getCharactersCovered());
 
 		// Check stylings still as expected
-		TextPropCollection ntpBC = rtrB._getRawCharacterStyle();
-		TextPropCollection ntpCC = rtrC._getRawCharacterStyle();
-		TextPropCollection ntpDC = rtrD._getRawCharacterStyle();
-		assertEquals(tpBC.getTextPropList(), ntpBC.getTextPropList());
-		assertEquals(tpCC.getTextPropList(), ntpCC.getTextPropList());
-		assertEquals(tpDC.getTextPropList(), ntpDC.getTextPropList());
+//		TextPropCollection ntpBC = rtrB._getRawCharacterStyle();
+//		TextPropCollection ntpCC = rtrC._getRawCharacterStyle();
+//		TextPropCollection ntpDC = rtrD._getRawCharacterStyle();
+//		assertEquals(tpBC.getTextPropList(), ntpBC.getTextPropList());
+//		assertEquals(tpCC.getTextPropList(), ntpCC.getTextPropList());
+//		assertEquals(tpDC.getTextPropList(), ntpDC.getTextPropList());
 	}
 
 
@@ -420,131 +446,135 @@ public final class TestTextRun extends T
 	 * of the wrong list of potential paragraph properties defined in StyleTextPropAtom.
 	 *
 	 */
+	@Test
 	public void testBug41015() throws IOException {
-		HSLFTextRun[] rt;
+		List<HSLFTextRun> rt;
 
 		HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("bug-41015.ppt"));
-		HSLFSlide sl = ppt.getSlides()[0];
-		HSLFTextParagraph[] txt = sl.getTextRuns();
-		assertEquals(2, txt.length);
-
-		rt = txt[0].getRichTextRuns();
-		assertEquals(1, rt.length);
-		assertEquals(0, rt[0].getIndentLevel());
-		assertEquals("sdfsdfsdf", rt[0].getText());
-
-		rt = txt[1].getRichTextRuns();
-		assertEquals(2, rt.length);
-		assertEquals(0, rt[0].getIndentLevel());
+		HSLFSlide sl = ppt.getSlides().get(0);
+		List<HSLFTextParagraph> txt = sl.getTextParagraphs();
+		assertEquals(2, txt.size());
+
+		rt = txt.get(0).getTextRuns();
+		assertEquals(1, rt.size());
+		assertEquals(0, txt.get(0).getIndentLevel());
+		assertEquals("sdfsdfsdf", rt.get(0).getRawText());
+
+		rt = txt.get(1).getTextRuns();
+		assertEquals(2, rt.size());
+		assertEquals(0, txt.get(0).getIndentLevel());
 		assertEquals("Sdfsdfsdf\n" +
 				"Dfgdfg\n" +
-				"Dfgdfgdfg\n", rt[0].getText());
-		assertEquals(1, rt[1].getIndentLevel());
+				"Dfgdfgdfg\n", rt.get(0).getRawText());
+		assertEquals(1, txt.get(1).getIndentLevel());
 		assertEquals("Sdfsdfs\n" +
-				"Sdfsdf\n", rt[1].getText());
+				"Sdfsdf\n", rt.get(1).getRawText());
 	}
 
 	/**
 	 * Test creation of TextRun objects.
 	 */
+	@Test
 	public void testAddTextRun() {
 		HSLFSlideShow ppt = new HSLFSlideShow();
 		HSLFSlide slide = ppt.createSlide();
 
-		assertNull(slide.getTextRuns());
+		assertNull(slide.getTextParagraphs());
 
 		HSLFTextBox shape1 = new HSLFTextBox();
-		HSLFTextParagraph run1 = shape1.getTextParagraph();
-		assertSame(run1, shape1.createTextRun());
-		run1.setText("Text 1");
+//		HSLFTextParagraph run1 = shape1.getTextParagraphs();
+//		assertSame(run1, shape1.createTextRun());
+//		run1.setText("Text 1");
 		slide.addShape(shape1);
 
 		//The array of Slide's text runs must be updated when new text shapes are added.
-		HSLFTextParagraph[] runs = slide.getTextRuns();
-		assertNotNull(runs);
-		assertSame(run1, runs[0]);
-
-		HSLFTextBox shape2 = new HSLFTextBox();
-		HSLFTextParagraph run2 = shape2.getTextParagraph();
-		assertSame(run2, shape2.createTextRun());
-		run2.setText("Text 2");
-		slide.addShape(shape2);
-
-		runs = slide.getTextRuns();
-		assertEquals(2, runs.length);
-
-		assertSame(run1, runs[0]);
-		assertSame(run2, runs[1]);
-
-		//as getShapes()
-		HSLFShape[] sh = slide.getShapes();
-		assertEquals(2, sh.length);
-		assertTrue(sh[0] instanceof HSLFTextBox);
-		HSLFTextBox box1 = (HSLFTextBox)sh[0];
-		assertSame(run1, box1.getTextParagraph());
-		HSLFTextBox box2 = (HSLFTextBox)sh[1];
-		assertSame(run2, box2.getTextParagraph());
-
-		//test Table - a complex group of shapes containing text objects
-		HSLFSlide slide2 = ppt.createSlide();
-		assertNull(slide2.getTextRuns());
-		Table table = new Table(2, 2);
-		slide2.addShape(table);
-		runs = slide2.getTextRuns();
-		assertNotNull(runs);
-		assertEquals(4, runs.length);
-	}
-
-    public void test48916() throws IOException {
-        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("SampleShow.ppt"));
-        for(HSLFSlide slide : ppt.getSlides()){
-            for(HSLFShape sh : slide.getShapes()){
-                if(sh instanceof HSLFTextShape){
-                    HSLFTextShape tx = (HSLFTextShape)sh;
-                    HSLFTextParagraph run = tx.getTextParagraph();
-                    //verify that records cached in  TextRun and EscherTextboxWrapper are the same
-                    Record[] runChildren = run.getRecords();
-                    Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords();
-                    assertEquals(runChildren.length, txboxChildren.length);
-                    for(int i=0; i < txboxChildren.length; i++){
-                        assertSame(txboxChildren[i], runChildren[i]);
-                    }
-                    //caused NPE prior to fix of Bugzilla #48916 
-                    run.getRichTextRuns()[0].setBold(true);
-                    run.getRichTextRuns()[0].setFontColor(Color.RED);
-                }
-            }
-        }
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-        ppt.write(out);
-        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
-        for(HSLFSlide slide : ppt.getSlides()){
-            for(HSLFShape sh : slide.getShapes()){
-                if(sh instanceof HSLFTextShape){
-                    HSLFTextShape tx = (HSLFTextShape)sh;
-                    HSLFTextParagraph run = tx.getTextParagraph();
-                    HSLFTextRun rt = run.getRichTextRuns()[0];
-                    assertTrue(rt.isBold());
-                    assertEquals(rt.getFontColor(), Color.RED);
-                }
-            }
-        }
+//		HSLFTextParagraph[] runs = slide.getTextParagraphs();
+//		assertNotNull(runs);
+//		assertSame(run1, runs.get(0));
+//
+//		HSLFTextBox shape2 = new HSLFTextBox();
+//		HSLFTextParagraph run2 = shape2.getTextParagraphs();
+//		assertSame(run2, shape2.createTextRun());
+//		run2.setText("Text 2");
+//		slide.addShape(shape2);
+//
+//		runs = slide.getTextParagraphs();
+//		assertEquals(2, runs.length);
+//
+//		assertSame(run1, runs.get(0));
+//		assertSame(run2, runs.get(1));
+//
+//		//as getShapes()
+//		HSLFShape[] sh = slide.getShapes();
+//		assertEquals(2, sh.length);
+//		assertTrue(sh.get(0) instanceof HSLFTextBox);
+//		HSLFTextBox box1 = (HSLFTextBox)sh.get(0);
+//		assertSame(run1, box1.getTextParagraphs());
+//		HSLFTextBox box2 = (HSLFTextBox)sh.get(1);
+//		assertSame(run2, box2.getTextParagraphs());
+//
+//		//test Table - a complex group of shapes containing text objects
+//		HSLFSlide slide2 = ppt.createSlide();
+//		assertNull(slide2.getTextParagraphs());
+//		Table table = new Table(2, 2);
+//		slide2.addShape(table);
+//		runs = slide2.getTextParagraphs();
+//		assertNotNull(runs);
+//		assertEquals(4, runs.length);
+	}
+
+	@Test
+	public void test48916() throws IOException {
+//        HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("SampleShow.ppt"));
+//        for(HSLFSlide slide : ppt.getSlides()){
+//            for(HSLFShape sh : slide.getShapes()){
+//                if(sh instanceof HSLFTextShape){
+//                    HSLFTextShape tx = (HSLFTextShape)sh;
+//                    HSLFTextParagraph run = tx.getTextParagraphs();
+//                    //verify that records cached in  TextRun and EscherTextboxWrapper are the same
+//                    Record[] runChildren = run.getRecords();
+//                    Record[] txboxChildren = tx.getEscherTextboxWrapper().getChildRecords();
+//                    assertEquals(runChildren.length, txboxChildren.length);
+//                    for(int i=0; i < txboxChildren.length; i++){
+//                        assertSame(txboxChildren.get(i), runChildren.get(i));
+//                    }
+//                    //caused NPE prior to fix of Bugzilla #48916 
+//                    run.getTextRuns().get(0).setBold(true);
+//                    run.getTextRuns().get(0).setFontColor(Color.RED);
+//                }
+//            }
+//        }
+//        ByteArrayOutputStream out = new ByteArrayOutputStream();
+//        ppt.write(out);
+//        ppt = new HSLFSlideShow(new ByteArrayInputStream(out.toByteArray()));
+//        for(HSLFSlide slide : ppt.getSlides()){
+//            for(HSLFShape sh : slide.getShapes()){
+//                if(sh instanceof HSLFTextShape){
+//                    HSLFTextShape tx = (HSLFTextShape)sh;
+//                    HSLFTextParagraph run = tx.getTextParagraphs();
+//                    HSLFTextRun rt = run.getTextRuns().get(0);
+//                    assertTrue(rt.isBold());
+//                    assertEquals(rt.getFontColor(), Color.RED);
+//                }
+//            }
+//        }
 
     }
 
-    public void test52244() throws IOException {
+	@Test
+	public void test52244() throws IOException {
         HSLFSlideShow ppt = new HSLFSlideShow(_slTests.openResourceAsStream("52244.ppt"));
-        HSLFSlide slide = ppt.getSlides()[0];
-        HSLFTextParagraph[] runs = slide.getTextRuns();
+        HSLFSlide slide = ppt.getSlides().get(0);
+        List<HSLFTextParagraph> runs = slide.getTextParagraphs();
 
-        assertEquals("Arial", runs[0].getRichTextRuns()[0].getFontName());
-        assertEquals(36, runs[0].getRichTextRuns()[0].getFontSize());
+        assertEquals("Arial", runs.get(0).getTextRuns().get(0).getFontFamily());
+        assertEquals(36, runs.get(0).getTextRuns().get(0).getFontSize(), 0);
 
-        assertEquals("Arial", runs[1].getRichTextRuns()[0].getFontName());
-        assertEquals(24, runs[1].getRichTextRuns()[0].getFontSize());
+        assertEquals("Arial", runs.get(1).getTextRuns().get(0).getFontFamily());
+        assertEquals(24, runs.get(1).getTextRuns().get(0).getFontSize(), 0);
 
-        assertEquals("Arial", runs[2].getRichTextRuns()[0].getFontName());
-        assertEquals(32, runs[2].getRichTextRuns()[0].getFontSize());
+        assertEquals("Arial", runs.get(2).getTextRuns().get(0).getFontFamily());
+        assertEquals(32, runs.get(2).getTextRuns().get(0).getFontSize(), 0);
 
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org


Mime
View raw message