In the interests of sanity, stop having hssf test data files in scratchpad and main...

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

diff --git a/build.xml b/build.xml
index d6353fac10c3c2864d8a76d007429cea84012473..b2c9977d0579e95dbc76fd71effbc3164643e287 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -629,7 +629,7 @@ under the License.
                 <pathelement location="${scratchpad.output.test.dir}"/>
                 <pathelement location="${junit.jar1.dir}"/>
             </classpath>
-            <sysproperty key="HSSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
+            <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
             <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
             <sysproperty key="HDF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hdf/data"/>
             <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
@@ -664,7 +664,7 @@ under the License.
                                        <pathelement location="${scratchpad.output.test.dir}"/>
                                        <pathelement location="${junit.jar1.dir}"/>
                                    </classpath>
-                   <sysproperty key="HSSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hssf/data"/>
+                <sysproperty key="HSSF.testdata.path" file="${main.src.test}/org/apache/poi/hssf/data"/>
                    <sysproperty key="HPSF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hpsf/data"/>
                    <sysproperty key="HWPF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hwpf/data"/>
                 <sysproperty key="HSLF.testdata.path" file="${scratchpad.src.test}/org/apache/poi/hslf/data"/>

diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/data/44297.xls b/src/scratchpad/testcases/org/apache/poi/hssf/data/44297.xls
deleted file mode 100755 (executable)
index bc65efd..0000000
Binary files a/src/scratchpad/testcases/org/apache/poi/hssf/data/44297.xls and /dev/null differ

diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls b/src/scratchpad/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
deleted file mode 100644 (file)
index cf4b6fa..0000000
Binary files a/src/scratchpad/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls and /dev/null differ

diff --git a/src/scratchpad/testcases/org/apache/poi/hssf/data/MissingBits.xls b/src/scratchpad/testcases/org/apache/poi/hssf/data/MissingBits.xls
deleted file mode 100644 (file)
index 4dba467..0000000
Binary files a/src/scratchpad/testcases/org/apache/poi/hssf/data/MissingBits.xls and /dev/null differ

diff --git a/src/testcases/org/apache/poi/hssf/data/44297.xls b/src/testcases/org/apache/poi/hssf/data/44297.xls
new file mode 100755 (executable)
index 0000000..bc65efd
Binary files /dev/null and b/src/testcases/org/apache/poi/hssf/data/44297.xls differ

diff --git a/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls b/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls
new file mode 100644 (file)
index 0000000..cf4b6fa
Binary files /dev/null and b/src/testcases/org/apache/poi/hssf/data/FormulaEvalTestData.xls differ

diff --git a/src/testcases/org/apache/poi/hssf/data/MissingBits.xls b/src/testcases/org/apache/poi/hssf/data/MissingBits.xls
new file mode 100644 (file)
index 0000000..4dba467
Binary files /dev/null and b/src/testcases/org/apache/poi/hssf/data/MissingBits.xls differ

diff --git a/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls b/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls
index 524136921295c334de8c0ac65bbb96c77dc9e63c..001432f0aaa78d228526d4cb9086e10e8baeb1ec 100644 (file)
Binary files a/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls and b/src/testcases/org/apache/poi/hssf/data/TestDataValidation.xls differ