From 9866864ccfe1b228bda067e3db6b2351a316c0ff Mon Sep 17 00:00:00 2001 From: Nick Burch Date: Tue, 13 Jan 2015 19:32:50 +0000 Subject: [PATCH] Add a sample Excel 3 file from TIKA-1515, and a disabled unit test for it git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1651451 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/hssf/dev/TestBiffViewer.java | 2 ++ .../hssf/extractor/TestOldExcelExtractor.java | 21 ++++++++++++++++++ test-data/spreadsheet/testEXCEL_3.xls | Bin 0 -> 11902 bytes 3 files changed, 23 insertions(+) create mode 100644 test-data/spreadsheet/testEXCEL_3.xls diff --git a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java b/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java index e5062a024..5d27990da 100644 --- a/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java +++ b/src/testcases/org/apache/poi/hssf/dev/TestBiffViewer.java @@ -38,6 +38,8 @@ public class TestBiffViewer extends BaseXLSIteratingTest { SILENT_EXCLUDED.add("46904.xls"); SILENT_EXCLUDED.add("35897-type4.xls"); // unsupported crypto api header SILENT_EXCLUDED.add("xor-encryption-abc.xls"); // unsupported XOR-encryption + SILENT_EXCLUDED.add("testEXCEL_2.xls"); // Biff 2 / Excel 2, pre-OLE2 + SILENT_EXCLUDED.add("testEXCEL_3.xls"); // Biff 3 / Excel 3, pre-OLE2 SILENT_EXCLUDED.add("testEXCEL_4.xls"); // Biff 4 / Excel 4, pre-OLE2 SILENT_EXCLUDED.add("testEXCEL_5.xls"); // Biff 5 / Excel 5 SILENT_EXCLUDED.add("testEXCEL_95.xls"); // Biff 5 / Excel 95 diff --git a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java b/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java index fdc53d531..92235e70a 100644 --- a/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java +++ b/src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java @@ -38,6 +38,27 @@ public final class TestOldExcelExtractor extends POITestCase { } } + public void DISABLEDtestSimpleExcel3() { + OldExcelExtractor extractor = createExtractor("testEXCEL_3.xls"); + + // Check we can call getText without error + String text = extractor.getText(); + + // Check we find a few words we expect in there + assertContains(text, "Season beginning August"); + assertContains(text, "USDA"); + + // Check we find a few numbers we expect in there + assertContains(text, "347"); + assertContains(text, "228"); + + // Check we find a few string-literal dates in there + assertContains(text, "1981/82"); + + // Check the type + assertEquals(3, extractor.getBiffVersion()); + assertEquals(0x10, extractor.getFileType()); + } public void testSimpleExcel4() { OldExcelExtractor extractor = createExtractor("testEXCEL_4.xls"); diff --git a/test-data/spreadsheet/testEXCEL_3.xls b/test-data/spreadsheet/testEXCEL_3.xls new file mode 100644 index 0000000000000000000000000000000000000000..14251bbd6f722e9ec2da5a473dc909c4627d02d0 GIT binary patch literal 11902 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