You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by jo...@apache.org on 2009/05/11 02:50:46 UTC
svn commit: r773441 - in /poi/trunk/src:
java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
testcases/org/apache/poi/hssf/HSSFTests.java
testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
Author: josh
Date: Mon May 11 00:50:45 2009
New Revision: 773441
URL: http://svn.apache.org/viewvc?rev=773441&view=rev
Log:
Fix bug (broken junit) introduced in r773412. Also hooked up test.
Modified:
poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java
poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
Modified: poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java?rev=773441&r1=773440&r2=773441&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java (original)
+++ poi/trunk/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java Mon May 11 00:50:45 2009
@@ -25,6 +25,7 @@
import org.apache.poi.hssf.record.EOFRecord;
import org.apache.poi.hssf.record.Record;
import org.apache.poi.hssf.record.RecordBase;
+import org.apache.poi.hssf.record.UnknownRecord;
/**
* Manages the all the records associated with a chart sub-stream.<br/>
@@ -47,6 +48,11 @@
while (rs.peekNextClass() != EOFRecord.class) {
if (PageSettingsBlock.isComponentRecord(rs.peekNextSid())) {
if (_psBlock != null) {
+ if (rs.peekNextSid() == UnknownRecord.HEADER_FOOTER_089C) {
+ // test samples: 45538_classic_Footer.xls, 45538_classic_Header.xls
+ _psBlock.addLateHeaderFooter(rs.getNext());
+ continue;
+ }
throw new IllegalStateException(
"Found more than one PageSettingsBlock in chart sub-stream");
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java?rev=773441&r1=773440&r2=773441&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/HSSFTests.java Mon May 11 00:50:45 2009
@@ -48,10 +48,7 @@
suite.addTest(AllUserModelTests.suite());
suite.addTest(AllRecordTests.suite());
suite.addTest(AllHSSFUtilTests.suite());
-
- if (false) { // TODO - hook this test up
- suite.addTest(new TestSuite(TestExcelExtractor.class));
- }
+ suite.addTest(new TestSuite(TestExcelExtractor.class));
suite.addTest(new TestSuite(TestEventRecordFactory.class));
suite.addTest(new TestSuite(TestModelFactory.class));
suite.addTest(AllSSFormulaTests.suite());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java?rev=773441&r1=773440&r2=773441&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java Mon May 11 00:50:45 2009
@@ -165,7 +165,7 @@
);
}
- public void testWithComments() throws Exception {
+ public void testWithComments() {
ExcelExtractor extractor = createExtractor("SimpleWithComments.xls");
extractor.setIncludeSheetNames(false);
@@ -187,7 +187,7 @@
);
}
- public void testWithBlank() throws Exception {
+ public void testWithBlank() {
ExcelExtractor extractor = createExtractor("MissingBits.xls");
String def = extractor.getText();
extractor.setIncludeBlankCells(true);
@@ -277,7 +277,7 @@
/**
* Test that we get text from headers and footers
*/
- public void test45538() throws Exception {
+ public void test45538() {
String[] files = {
"45538_classic_Footer.xls", "45538_form_Footer.xls",
"45538_classic_Header.xls", "45538_form_Header.xls"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org