Author: nick
Date: Mon Mar 27 13:36:00 2006
New Revision: 389287
URL: http://svn.apache.org/viewcvs?rev=389287&view=rev
Log:
Fixes/Updates to tests to go with big change in how slides/notes are tied to
their text
Modified:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
Modified:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java?rev=389287&r1=389286&r2=389287&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlideChangeNotes.java
Mon Mar 27 13:36:00 2006
@@ -58,6 +58,6 @@
slideOne.setNotes(notesOne);
- assertEquals(notesOne.getSheetNumber(), sa.getNotesID());
+ assertEquals(notesOne._getSheetNumber(), sa.getNotesID());
}
}
Modified:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java?rev=389287&r1=389286&r2=389287&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/model/TestSlides.java
Mon Mar 27 13:36:00 2006
@@ -42,7 +42,8 @@
Slide s1 = ppt.createSlide();
assertTrue(ppt.getSlides().length == 1);
- assertEquals(3, s1.getSheetNumber());
+ assertEquals(3, s1._getSheetRefId());
+ assertEquals(256, s1._getSheetNumber());
assertEquals(1, s1.getSlideNumber());
//serialize and read again
@@ -64,12 +65,14 @@
Slide s1 = ppt.createSlide();
assertTrue(ppt.getSlides().length == 1);
- assertEquals(3, s1.getSheetNumber());
+ assertEquals(3, s1._getSheetRefId());
+ assertEquals(256, s1._getSheetNumber());
assertEquals(1, s1.getSlideNumber());
Slide s2 = ppt.createSlide();
assertTrue(ppt.getSlides().length == 2);
- assertEquals(4, s2.getSheetNumber());
+ assertEquals(4, s2._getSheetRefId());
+ assertEquals(257, s2._getSheetNumber());
assertEquals(2, s2.getSlideNumber());
//serialize and read again
@@ -91,17 +94,20 @@
Slide s1 = ppt.createSlide();
assertTrue(ppt.getSlides().length == 1);
- assertEquals(3, s1.getSheetNumber());
+ assertEquals(3, s1._getSheetRefId());
+ assertEquals(256, s1._getSheetNumber());
assertEquals(1, s1.getSlideNumber());
Slide s2 = ppt.createSlide();
assertTrue(ppt.getSlides().length == 2);
- assertEquals(4, s2.getSheetNumber());
+ assertEquals(4, s2._getSheetRefId());
+ assertEquals(257, s2._getSheetNumber());
assertEquals(2, s2.getSlideNumber());
Slide s3 = ppt.createSlide();
assertTrue(ppt.getSlides().length == 3);
- assertEquals(5, s3.getSheetNumber());
+ assertEquals(5, s3._getSheetRefId());
+ assertEquals(258, s3._getSheetNumber());
assertEquals(3, s3.getSlideNumber());
//serialize and read again
Modified:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java?rev=389287&r1=389286&r2=389287&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestCounts.java
Mon Mar 27 13:36:00 2006
@@ -49,25 +49,31 @@
assertEquals(1, slides[0].getSlideNumber());
assertEquals(2, slides[1].getSlideNumber());
- // The internal IDs are 4 and 6
- assertEquals(4, slides[0].getSheetNumber());
- assertEquals(6, slides[1].getSheetNumber());
+ // The ref IDs are 4 and 6
+ assertEquals(4, slides[0]._getSheetRefId());
+ assertEquals(6, slides[1]._getSheetRefId());
+
+ // These are slides 1+2 -> 256+257
+ assertEquals(256, slides[0]._getSheetNumber());
+ assertEquals(257, slides[1]._getSheetNumber());
}
public void testNotesCount() throws Exception {
Notes[] notes = ss.getNotes();
- // Two sheets -> two notes, plus the notes on the slide master
- assertEquals(3, notes.length);
+ // Two sheets -> two notes
+ // Note: there are also notes on the slide master
+ //assertEquals(3, notes.length); // When we do slide masters
+ assertEquals(2, notes.length);
// First is for master
- assertEquals(-2147483648, notes[0].getSlideInternalNumber());
+ //assertEquals(-2147483648, notes[0]._getSheetNumber()); //
When we do slide masters
// Next two are for the two slides
- assertEquals(256, notes[1].getSlideInternalNumber());
- assertEquals(257, notes[2].getSlideInternalNumber());
+ assertEquals(256, notes[0]._getSheetNumber());
+ assertEquals(257, notes[1]._getSheetNumber());
- // They go between the slides
- assertEquals(5, notes[1].getSheetNumber());
- assertEquals(7, notes[2].getSheetNumber());
+ // They happen to go between the two slides in Ref terms
+ assertEquals(5, notes[0]._getSheetRefId());
+ assertEquals(7, notes[1]._getSheetRefId());
}
}
Modified:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java?rev=389287&r1=389286&r2=389287&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestNotesText.java
Mon Mar 27 13:36:00 2006
@@ -41,7 +41,7 @@
}
public void testNotesOne() throws Exception {
- Notes notes = ss.getNotes()[1];
+ Notes notes = ss.getNotes()[0];
String[] expectText = new String[] {"These are the notes for
page 1"};
assertEquals(expectText.length, notes.getTextRuns().length);
@@ -51,7 +51,7 @@
}
public void testNotesTwo() throws Exception {
- Notes notes = ss.getNotes()[2];
+ Notes notes = ss.getNotes()[1];
String[] expectText = new String[] {"These are the notes on
page two, again lacking formatting"};
assertEquals(expectText.length, notes.getTextRuns().length);
for(int i=0; i<expectText.length; i++) {
Modified:
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
URL:
http://svn.apache.org/viewcvs/jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java?rev=389287&r1=389286&r2=389287&view=diff
==============================================================================
---
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
(original)
+++
jakarta/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
Mon Mar 27 13:36:00 2006
@@ -20,9 +20,11 @@
private SlideShow ss;
private SlideShow ssRichA;
private SlideShow ssRichB;
+ private SlideShow ssRichC;
private HSLFSlideShow hss;
private HSLFSlideShow hssRichA;
private HSLFSlideShow hssRichB;
+ private HSLFSlideShow hssRichC;
protected void setUp() throws Exception {
String dirname = System.getProperty("HSLF.testdata.path");
@@ -41,6 +43,12 @@
filename = dirname +
"/Single_Coloured_Page_With_Fonts_and_Alignments.ppt";
hssRichB = new HSLFSlideShow(filename);
ssRichB = new SlideShow(hssRichB);
+
+ // Rich test file C - has paragraph styles that run out before
+ // the character ones do
+ filename = dirname +
"/ParagraphStylesShorterThanCharStyles.ppt";
+ hssRichC = new HSLFSlideShow(filename);
+ ssRichC = new SlideShow(hssRichC);
}
/**
@@ -193,5 +201,14 @@
assertEquals(18, rtrRRa.getFontSize());
assertEquals("Courier", rtrRRa.getFontName());
}
+ }
+
+ /**
+ * Test that we can do the right things when the paragraph styles
+ * run out before the character styles do
+ * NOTE: Disabled, as we can't currently do this!
+ */
+ public void BROKENtestParagraphStylesShorterTheCharStyles() {
+ // TODO
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
Mailing List: http://jakarta.apache.org/site/mail2.html#poi
The Apache Jakarta POI Project: http://jakarta.apache.org/poi/
