moving other chart records into dedicated package

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

38 files changed, 181 insertions, 73 deletions

diff --git a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
index edf62a9ad1..db6c7ff3f2 100755
--- a/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
+++ b/src/testcases/org/apache/poi/hssf/record/AllRecordTests.java
@@ -22,11 +22,12 @@ import junit.framework.TestSuite;
 
 import org.apache.poi.hssf.record.aggregates.AllRecordAggregateTests;
 import org.apache.poi.hssf.record.cf.TestCellRange;
+import org.apache.poi.hssf.record.chart.AllChartRecordTests;
 import org.apache.poi.hssf.record.constant.TestConstantValueParser;
 import org.apache.poi.hssf.record.formula.AllFormulaTests;
 
 /**
- * Collects all tests for package <tt>org.apache.poi.hssf.record</tt>.
+ * Collects all tests for package <tt>org.apache.poi.hssf.record</tt> and sub-packages.
  * 
  * @author Josh Micich
  */
@@ -35,28 +36,15 @@ public final class AllRecordTests {
 	public static Test suite() {
 		TestSuite result = new TestSuite(AllRecordTests.class.getName());
 
+		result.addTest(AllChartRecordTests.suite());
 		result.addTest(AllFormulaTests.suite());
 		result.addTest(AllRecordAggregateTests.suite());
 
-		result.addTestSuite(TestAreaFormatRecord.class);
-		result.addTestSuite(TestAreaRecord.class);
-		result.addTestSuite(TestAxisLineFormatRecord.class);
-		result.addTestSuite(TestAxisOptionsRecord.class);
-		result.addTestSuite(TestAxisParentRecord.class);
-		result.addTestSuite(TestAxisRecord.class);
-		result.addTestSuite(TestAxisUsedRecord.class);
 		result.addTestSuite(TestBOFRecord.class);
-		result.addTestSuite(TestBarRecord.class);
 		result.addTestSuite(TestBoundSheetRecord.class);
-		result.addTestSuite(TestCategorySeriesAxisRecord.class);
 		result.addTestSuite(TestCFHeaderRecord.class);
 		result.addTestSuite(TestCFRuleRecord.class);
-		result.addTestSuite(TestChartRecord.class);
-		result.addTestSuite(TestChartTitleFormatRecord.class);
 		result.addTestSuite(TestCommonObjectDataSubRecord.class);
-		result.addTestSuite(TestDatRecord.class);
-		result.addTestSuite(TestDataFormatRecord.class);
-		result.addTestSuite(TestDefaultDataLabelTextPropertiesRecord.class);
 		result.addTestSuite(TestDrawingGroupRecord.class);
 		result.addTestSuite(TestEmbeddedObjectRefSubRecord.class);
 		result.addTestSuite(TestEndSubRecord.class);
@@ -64,40 +52,22 @@ public final class AllRecordTests {
 		result.addTestSuite(TestExtendedFormatRecord.class);
 		result.addTestSuite(TestExternalNameRecord.class);
 		result.addTestSuite(TestFontRecord.class);
-		result.addTestSuite(TestFontBasisRecord.class);
-		result.addTestSuite(TestFontIndexRecord.class);
 		result.addTestSuite(TestFormulaRecord.class);
-		result.addTestSuite(TestFrameRecord.class);
 		result.addTestSuite(TestHyperlinkRecord.class);
 		result.addTestSuite(TestLabelRecord.class);
-		result.addTestSuite(TestLegendRecord.class);
-		result.addTestSuite(TestLineFormatRecord.class);
-		result.addTestSuite(TestLinkedDataRecord.class);
 		result.addTestSuite(TestMergeCellsRecord.class);
 		result.addTestSuite(TestNameRecord.class);
 		result.addTestSuite(TestNoteRecord.class);
 		result.addTestSuite(TestNoteStructureSubRecord.class);
-		result.addTestSuite(TestNumberFormatIndexRecord.class);
 		result.addTestSuite(TestObjRecord.class);
-		result.addTestSuite(TestObjectLinkRecord.class);
 		result.addTestSuite(TestPaletteRecord.class);
 		result.addTestSuite(TestPaneRecord.class);
-		result.addTestSuite(TestPlotAreaRecord.class);
-		result.addTestSuite(TestPlotGrowthRecord.class);
 		result.addTestSuite(TestRecordInputStream.class);
 		result.addTestSuite(TestRecordFactory.class);
 		result.addTestSuite(TestSCLRecord.class);
 		result.addTestSuite(TestSSTDeserializer.class);
 		result.addTestSuite(TestSSTRecord.class);
 		result.addTestSuite(TestSSTRecordSizeCalculator.class);
-		result.addTestSuite(TestSeriesChartGroupIndexRecord.class);
-		result.addTestSuite(TestSeriesIndexRecord.class);
-		result.addTestSuite(TestSeriesLabelsRecord.class);
-		result.addTestSuite(TestSeriesListRecord.class);
-		result.addTestSuite(TestSeriesRecord.class);
-		result.addTestSuite(TestSeriesTextRecord.class);
-		result.addTestSuite(TestSeriesToChartGroupRecord.class);
-		result.addTestSuite(TestSheetPropertiesRecord.class);
 		result.addTestSuite(TestSharedFormulaRecord.class);
 		result.addTestSuite(TestStringRecord.class);
 		result.addTestSuite(TestStyleRecord.class);
@@ -106,12 +76,8 @@ public final class AllRecordTests {
 		result.addTestSuite(TestTableRecord.class);
 		result.addTestSuite(TestTextObjectBaseRecord.class);
 		result.addTestSuite(TestTextObjectRecord.class);
-		result.addTestSuite(TestTextRecord.class);
-		result.addTestSuite(TestTickRecord.class);
 		result.addTestSuite(TestUnicodeNameRecord.class);
 		result.addTestSuite(TestUnicodeString.class);
-		result.addTestSuite(TestUnitsRecord.class);
-		result.addTestSuite(TestValueRangeRecord.class);
 		result.addTestSuite(TestCellRange.class);
 		result.addTestSuite(TestConstantValueParser.class);
 		return result;
diff --git a/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java b/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
new file mode 100644
index 0000000000..1714e91c02
--- /dev/null
+++ b/src/testcases/org/apache/poi/hssf/record/chart/AllChartRecordTests.java
@@ -0,0 +1,71 @@
+/* ====================================================================
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+==================================================================== */
+
+package org.apache.poi.hssf.record.chart;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * Collects all tests for package <tt>org.apache.poi.hssf.record.class</tt>.
+ * 
+ * @author Josh Micich
+ */
+public final class AllChartRecordTests {
+	
+	public static Test suite() {
+		TestSuite result = new TestSuite(AllChartRecordTests.class.getName());
+
+		result.addTestSuite(TestAreaFormatRecord.class);
+		result.addTestSuite(TestAreaRecord.class);
+		result.addTestSuite(TestAxisLineFormatRecord.class);
+		result.addTestSuite(TestAxisOptionsRecord.class);
+		result.addTestSuite(TestAxisParentRecord.class);
+		result.addTestSuite(TestAxisRecord.class);
+		result.addTestSuite(TestAxisUsedRecord.class);
+		result.addTestSuite(TestBarRecord.class);
+		result.addTestSuite(TestCategorySeriesAxisRecord.class);
+		result.addTestSuite(TestChartRecord.class);
+		result.addTestSuite(TestChartTitleFormatRecord.class);
+		result.addTestSuite(TestDatRecord.class);
+		result.addTestSuite(TestDataFormatRecord.class);
+		result.addTestSuite(TestDefaultDataLabelTextPropertiesRecord.class);
+		result.addTestSuite(TestFontBasisRecord.class);
+		result.addTestSuite(TestFontIndexRecord.class);
+		result.addTestSuite(TestFrameRecord.class);
+		result.addTestSuite(TestLegendRecord.class);
+		result.addTestSuite(TestLineFormatRecord.class);
+		result.addTestSuite(TestLinkedDataRecord.class);
+		result.addTestSuite(TestNumberFormatIndexRecord.class);
+		result.addTestSuite(TestObjectLinkRecord.class);
+		result.addTestSuite(TestPlotAreaRecord.class);
+		result.addTestSuite(TestPlotGrowthRecord.class);
+		result.addTestSuite(TestSeriesChartGroupIndexRecord.class);
+		result.addTestSuite(TestSeriesIndexRecord.class);
+		result.addTestSuite(TestSeriesLabelsRecord.class);
+		result.addTestSuite(TestSeriesListRecord.class);
+		result.addTestSuite(TestSeriesRecord.class);
+		result.addTestSuite(TestSeriesTextRecord.class);
+		result.addTestSuite(TestSeriesToChartGroupRecord.class);
+		result.addTestSuite(TestSheetPropertiesRecord.class);
+		result.addTestSuite(TestTextRecord.class);
+		result.addTestSuite(TestTickRecord.class);
+		result.addTestSuite(TestUnitsRecord.class);
+		result.addTestSuite(TestValueRangeRecord.class);
+		return result;
+	}
+}
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAreaFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
index fb852ba88c..c47a8b4f7e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAreaFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
index f514feccba..2570d2e1c3 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisLineFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
index 4e9e29a6f7..ae80fe2b30 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisLineFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisOptionsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
index de51b48b0d..00af6db238 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisOptionsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisParentRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
index 406b68fd60..323f7f3c05 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisParentRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
index 21e41773ce..e8ebf322f5 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestAxisUsedRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
index 5f02d2874c..f421b4ffc6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestAxisUsedRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
index 80c729c212..4781fe9418 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestBarRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestCategorySeriesAxisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
index 080918aa05..948241dbb7 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestCategorySeriesAxisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestChartRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
index 994b15b32c..c423d1b9a2 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestChartRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestChartTitleFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
index 5e285021b1..c31a3968c3 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestChartTitleFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestChartTitleFormatRecord.java
@@ -15,7 +15,7 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -27,6 +27,7 @@ import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.eventusermodel.HSSFEventFactory;
 import org.apache.poi.hssf.eventusermodel.HSSFListener;
 import org.apache.poi.hssf.eventusermodel.HSSFRequest;
+import org.apache.poi.hssf.record.Record;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
index 408d80e568..93b25ed95b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
index 953f13ec08..c9958f5074 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDataFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestDefaultDataLabelTextPropertiesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
index 8557359e8a..32bddd81a1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestDefaultDataLabelTextPropertiesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontBasisRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
index 65c19f0916..c783a34e6f 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFontBasisRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
         
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFontIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
index c962e0daee..fb09d30dc6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFontIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
index 23f1593efb..da2a8a3189 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestFrameRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
index 6bae58f2a4..a23d6741b6 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLegendRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
@@ -15,7 +15,9 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
+
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 
 import junit.framework.TestCase;
 
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLineFormatRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
index f3b4c3d326..5b58b22561 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLineFormatRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestLinkedDataRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
index 6f6e8cc131..d9f09eab7c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestLinkedDataRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
@@ -15,11 +15,12 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
 import junit.framework.TestCase;
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 import org.apache.poi.hssf.record.formula.Area3DPtg;
 import org.apache.poi.hssf.record.formula.Ptg;
 
diff --git a/src/testcases/org/apache/poi/hssf/record/TestNumberFormatIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
index 570d71ec62..d06f646c58 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestNumberFormatIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestObjectLinkRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
index 9d8168d4b5..f12babe136 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestObjectLinkRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPlotAreaRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
index 631d6895d9..bfd678b305 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPlotAreaRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
index c5896d2b38..cb7de70b0e 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestPlotGrowthRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesChartGroupIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
index cd09e061e6..d216cc2f2c 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesChartGroupIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesIndexRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
index 9ba9b0ad9e..86f24a38bc 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesIndexRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesLabelsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
index c1602dd2a3..9f0f1f1ead 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesLabelsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesListRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
index 1669dc4dfc..c049de4f30 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesListRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
index 2e7cfa6fee..dacaae10d1 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesTextRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
index 8b05dc4336..2d11999be8 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesTextRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
@@ -15,11 +15,14 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import org.apache.poi.hssf.record.RecordFormatException;
+import org.apache.poi.hssf.record.RecordInputStream;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
 import org.apache.poi.util.HexRead;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSeriesToChartGroupRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
index 8112c54b70..22ad685c2b 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSeriesToChartGroupRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestSheetPropertiesRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
index aa870a3374..51794029ef 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestSheetPropertiesRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTextRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
index 8d416050f7..4214b0a370 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTextRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestTickRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
index b0b8ced7b0..0301e7e811 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestTickRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestUnitsRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
index 7b79553df4..4c142bdb05 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestUnitsRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**
diff --git a/src/testcases/org/apache/poi/hssf/record/TestValueRangeRecord.java b/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
index 62d7d34c21..d2a08df4a5 100644
--- a/src/testcases/org/apache/poi/hssf/record/TestValueRangeRecord.java
+++ b/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
@@ -15,9 +15,11 @@
    limitations under the License.
 ==================================================================== */
 
-package org.apache.poi.hssf.record;
+package org.apache.poi.hssf.record.chart;
 
 
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+
 import junit.framework.TestCase;
 
 /**