moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Switch to POITestCase / assertContains

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1642549 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2014-11-30 14:36:01 +00:00
parent 101f66c789
commit a1fffd7d04
2 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java/org/apache/poi/hssf/extractor/OldExcelExtractor.java
View File

@ -58,11 +58,14 @@ public class OldExcelExtractor {
} }
} }
public OldExcelExtractor(File f) throws IOException { public OldExcelExtractor(File f) throws IOException {
InputStream input = new FileInputStream(f); try {
if (NPOIFSFileSystem.hasPOIFSHeader(input)) {
open(new NPOIFSFileSystem(f)); open(new NPOIFSFileSystem(f));
} else { } catch (IOException e) {
open(input); if (e.getMessage().startsWith("Invalid header signature")) {
open(new FileInputStream(f));
} else {
throw e;
}
} }
} }
public OldExcelExtractor(NPOIFSFileSystem fs) throws IOException { public OldExcelExtractor(NPOIFSFileSystem fs) throws IOException {

64
src/testcases/org/apache/poi/hssf/extractor/TestOldExcelExtractor.java
View File

@ -17,17 +17,17 @@
package org.apache.poi.hssf.extractor; package org.apache.poi.hssf.extractor;
import java.io.File;
import java.io.InputStream; import java.io.InputStream;
import junit.framework.TestCase; import org.apache.poi.POITestCase;
import org.apache.poi.hssf.HSSFTestDataSamples; import org.apache.poi.hssf.HSSFTestDataSamples;
/** /**
* Unit tests for the Excel 5/95 and Excel 4 (and older) text * Unit tests for the Excel 5/95 and Excel 4 (and older) text
* extractor * extractor
*/ */
public final class TestOldExcelExtractor extends TestCase { public final class TestOldExcelExtractor extends POITestCase {
private static OldExcelExtractor createExtractor(String sampleFileName) { private static OldExcelExtractor createExtractor(String sampleFileName) {
InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleFileName); InputStream is = HSSFTestDataSamples.openSampleFileStream(sampleFileName);
@ -45,12 +45,12 @@ public final class TestOldExcelExtractor extends TestCase {
String text = extractor.getText(); String text = extractor.getText();
// Check we find a few words we expect in there // Check we find a few words we expect in there
assertTrue(text, text.contains("Size")); assertContains(text, "Size");
assertTrue(text, text.contains("Returns")); assertContains(text, "Returns");
// Check we find a few numbers we expect in there // Check we find a few numbers we expect in there
assertTrue(text, text.contains("11")); assertContains(text, "11");
assertTrue(text, text.contains("784")); assertContains(text, "784");
} }
public void DISABLEDtestSimpleExcel5() { public void DISABLEDtestSimpleExcel5() {
for (String ver : new String[] {"5", "95"}) { for (String ver : new String[] {"5", "95"}) {
@ -60,12 +60,12 @@ public final class TestOldExcelExtractor extends TestCase {
String text = extractor.getText(); String text = extractor.getText();
// Check we find a few words we expect in there // Check we find a few words we expect in there
assertTrue(text, text.contains("Sample Excel")); assertContains(text, "Sample Excel");
assertTrue(text, text.contains("Written and saved")); assertContains(text, "Written and saved");
// Check we find a few numbers we expect in there // Check we find a few numbers we expect in there
assertTrue(text, text.contains("15")); assertContains(text, "15");
assertTrue(text, text.contains("169")); assertContains(text, "169");
} }
} }
@ -74,15 +74,15 @@ public final class TestOldExcelExtractor extends TestCase {
String text = extractor.getText(); String text = extractor.getText();
// Simple strings // Simple strings
assertTrue(text, text.contains("Table 10 -- Examination Coverage:")); assertContains(text, "Table 10 -- Examination Coverage:");
assertTrue(text, text.contains("Recommended and Average Recommended Additional Tax After")); assertContains(text, "Recommended and Average Recommended Additional Tax After");
assertTrue(text, text.contains("Individual income tax returns, total")); assertContains(text, "Individual income tax returns, total");
// More complicated strings // More complicated strings
assertTrue(text, text.contains("$100,000 or more")); assertContains(text, "$100,000 or more");
assertTrue(text, text.contains("S corporation returns, Form 1120S [10,15]")); assertContains(text, "S corporation returns, Form 1120S [10,15]");
// TODO Get these quotes working correctly // TODO Get these quotes working correctly
// assertTrue(text, text.contains("individual income tax return \u201Cshort forms.\u201D")); // assertContains(text, "individual income tax return \u201Cshort forms.\u201D");
// Formula based strings // Formula based strings
// TODO Find some then test // TODO Find some then test
@ -93,17 +93,17 @@ public final class TestOldExcelExtractor extends TestCase {
String text = extractor.getText(); String text = extractor.getText();
// Simple numbers // Simple numbers
assertTrue(text, text.contains("151")); assertContains(text, "151");
assertTrue(text, text.contains("784")); assertContains(text, "784");
// Numbers which come from formulas // Numbers which come from formulas
assertTrue(text, text.contains("0.398")); // TODO Rounding assertContains(text, "0.398"); // TODO Rounding
assertTrue(text, text.contains("624")); assertContains(text, "624");
// Formatted numbers // Formatted numbers
// TODO // TODO
// assertTrue(text, text.contains("55,624")); // assertContains(text, "55,624");
// assertTrue(text, text.contains("11,743,477")); // assertContains(text, "11,743,477");
} }
public void DISABLEDtestFormattedNumbersExcel5() { public void DISABLEDtestFormattedNumbersExcel5() {
for (String ver : new String[] {"5", "95"}) { for (String ver : new String[] {"5", "95"}) {
@ -111,11 +111,23 @@ public final class TestOldExcelExtractor extends TestCase {
String text = extractor.getText(); String text = extractor.getText();
// Simple numbers // Simple numbers
assertTrue(text, text.contains("1")); assertContains(text, "1");
// Numbers which come from formulas // Numbers which come from formulas
assertTrue(text, text.contains("13")); assertContains(text, "13");
assertTrue(text, text.contains("169")); assertContains(text, "169");
}
}
public void testFromFile() throws Exception {
for (String ver : new String[] {"4", "5", "95"}) {
String filename = "testEXCEL_"+ver+".xls";
File f = HSSFTestDataSamples.getSampleFile(filename);
OldExcelExtractor extractor = new OldExcelExtractor(f);
String text = extractor.getText();
assertNotNull(text);
assertTrue(text.length() > 100);
} }
} }
} }