From 49d363f1eed1d3b07b0d2ccd11150eb466ed1448 Mon Sep 17 00:00:00 2001
From: Josh Micich <josh@apache.org>
Date: Mon, 11 May 2009 00:50:45 +0000
Subject: [PATCH] Fix bug (broken junit) introduced in r773412. Also hooked up
 test.

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@773441 13f79535-47bb-0310-9956-ffa450edef68
---
 .../record/aggregates/ChartSubstreamRecordAggregate.java    | 6 ++++++
 src/testcases/org/apache/poi/hssf/HSSFTests.java            | 5 +----
 .../org/apache/poi/hssf/extractor/TestExcelExtractor.java   | 6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java b/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
index bb135174d5..9b1d14d562 100644
--- a/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
+++ b/src/java/org/apache/poi/hssf/record/aggregates/ChartSubstreamRecordAggregate.java
@@ -25,6 +25,7 @@ import org.apache.poi.hssf.record.BOFRecord;
 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 @@ public final class ChartSubstreamRecordAggregate extends RecordAggregate {
 		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");
 				}
diff --git a/src/testcases/org/apache/poi/hssf/HSSFTests.java b/src/testcases/org/apache/poi/hssf/HSSFTests.java
index fac6e0db30..856e31cb42 100644
--- a/src/testcases/org/apache/poi/hssf/HSSFTests.java
+++ b/src/testcases/org/apache/poi/hssf/HSSFTests.java
@@ -48,10 +48,7 @@ public final class HSSFTests {
         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());
diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java b/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
index c820f2c9bc..25909918b3 100644
--- a/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
+++ b/src/testcases/org/apache/poi/hssf/extractor/TestExcelExtractor.java
@@ -165,7 +165,7 @@ public final class TestExcelExtractor extends TestCase {
 		);
 	}
 	
-	public void testWithComments() throws Exception {
+	public void testWithComments() {
 		ExcelExtractor extractor = createExtractor("SimpleWithComments.xls");
 		extractor.setIncludeSheetNames(false);
 
@@ -187,7 +187,7 @@ public final class TestExcelExtractor extends TestCase {
 		);
 	}
 	
-	public void testWithBlank() throws Exception {
+	public void testWithBlank() {
 		ExcelExtractor extractor = createExtractor("MissingBits.xls");
 		String def = extractor.getText();
 		extractor.setIncludeBlankCells(true);
@@ -277,7 +277,7 @@ public final class TestExcelExtractor extends TestCase {
 	/**
 	 * 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"
-- 
2.39.5