Fix inconsistent indents
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1665970 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch
parent
b7c14b3a8f
commit
d78a14b232
@ -65,83 +65,83 @@ import org.junit.runners.Parameterized.Parameters;
|
||||
*/
|
||||
@RunWith(Parameterized.class)
|
||||
public class TestAllFiles {
|
||||
private static final File ROOT_DIR = new File("test-data");
|
||||
private static final File ROOT_DIR = new File("test-data");
|
||||
|
||||
// map file extensions to the actual mappers
|
||||
private static final Map<String, FileHandler> HANDLERS = new HashMap<String, FileHandler>();
|
||||
static {
|
||||
// Excel
|
||||
HANDLERS.put(".xls", new HSSFFileHandler());
|
||||
HANDLERS.put(".xlsx", new XSSFFileHandler());
|
||||
HANDLERS.put(".xlsm", new XSSFFileHandler());
|
||||
HANDLERS.put(".xltx", new XSSFFileHandler());
|
||||
HANDLERS.put(".xlsb", new XSSFFileHandler());
|
||||
private static final Map<String, FileHandler> HANDLERS = new HashMap<String, FileHandler>();
|
||||
static {
|
||||
// Excel
|
||||
HANDLERS.put(".xls", new HSSFFileHandler());
|
||||
HANDLERS.put(".xlsx", new XSSFFileHandler());
|
||||
HANDLERS.put(".xlsm", new XSSFFileHandler());
|
||||
HANDLERS.put(".xltx", new XSSFFileHandler());
|
||||
HANDLERS.put(".xlsb", new XSSFFileHandler());
|
||||
|
||||
// Word
|
||||
HANDLERS.put(".doc", new HWPFFileHandler());
|
||||
HANDLERS.put(".docx", new XWPFFileHandler());
|
||||
HANDLERS.put(".dotx", new XWPFFileHandler());
|
||||
HANDLERS.put(".docm", new XWPFFileHandler());
|
||||
HANDLERS.put(".ooxml", new XWPFFileHandler()); // OPCPackage
|
||||
// Word
|
||||
HANDLERS.put(".doc", new HWPFFileHandler());
|
||||
HANDLERS.put(".docx", new XWPFFileHandler());
|
||||
HANDLERS.put(".dotx", new XWPFFileHandler());
|
||||
HANDLERS.put(".docm", new XWPFFileHandler());
|
||||
HANDLERS.put(".ooxml", new XWPFFileHandler()); // OPCPackage
|
||||
|
||||
// Powerpoint
|
||||
HANDLERS.put(".ppt", new HSLFFileHandler());
|
||||
HANDLERS.put(".pptx", new XSLFFileHandler());
|
||||
HANDLERS.put(".pptm", new XSLFFileHandler());
|
||||
HANDLERS.put(".ppsm", new XSLFFileHandler());
|
||||
HANDLERS.put(".ppsx", new XSLFFileHandler());
|
||||
HANDLERS.put(".thmx", new XSLFFileHandler());
|
||||
// Powerpoint
|
||||
HANDLERS.put(".ppt", new HSLFFileHandler());
|
||||
HANDLERS.put(".pptx", new XSLFFileHandler());
|
||||
HANDLERS.put(".pptm", new XSLFFileHandler());
|
||||
HANDLERS.put(".ppsm", new XSLFFileHandler());
|
||||
HANDLERS.put(".ppsx", new XSLFFileHandler());
|
||||
HANDLERS.put(".thmx", new XSLFFileHandler());
|
||||
|
||||
// Outlook
|
||||
HANDLERS.put(".msg", new HSMFFileHandler());
|
||||
// Outlook
|
||||
HANDLERS.put(".msg", new HSMFFileHandler());
|
||||
|
||||
// Publisher
|
||||
HANDLERS.put(".pub", new HPBFFileHandler());
|
||||
// Publisher
|
||||
HANDLERS.put(".pub", new HPBFFileHandler());
|
||||
|
||||
// Visio
|
||||
HANDLERS.put(".vsd", new HDGFFileHandler());
|
||||
// Visio
|
||||
HANDLERS.put(".vsd", new HDGFFileHandler());
|
||||
|
||||
// POIFS
|
||||
HANDLERS.put(".ole2", new POIFSFileHandler());
|
||||
// POIFS
|
||||
HANDLERS.put(".ole2", new POIFSFileHandler());
|
||||
|
||||
// Microsoft Admin Template?
|
||||
HANDLERS.put(".adm", new HPSFFileHandler());
|
||||
// Microsoft Admin Template?
|
||||
HANDLERS.put(".adm", new HPSFFileHandler());
|
||||
|
||||
// Microsoft TNEF
|
||||
HANDLERS.put(".dat", new HMEFFileHandler());
|
||||
// Microsoft TNEF
|
||||
HANDLERS.put(".dat", new HMEFFileHandler());
|
||||
|
||||
// TODO: are these readable by some of the formats?
|
||||
HANDLERS.put(".shw", new NullFileHandler());
|
||||
HANDLERS.put(".zvi", new NullFileHandler());
|
||||
HANDLERS.put(".mpp", new NullFileHandler());
|
||||
HANDLERS.put(".qwp", new NullFileHandler());
|
||||
HANDLERS.put(".wps", new NullFileHandler());
|
||||
HANDLERS.put(".bin", new NullFileHandler());
|
||||
HANDLERS.put(".xps", new NullFileHandler());
|
||||
HANDLERS.put(".sldprt", new NullFileHandler());
|
||||
HANDLERS.put(".mdb", new NullFileHandler());
|
||||
HANDLERS.put(".vml", new NullFileHandler());
|
||||
// TODO: are these readable by some of the formats?
|
||||
HANDLERS.put(".shw", new NullFileHandler());
|
||||
HANDLERS.put(".zvi", new NullFileHandler());
|
||||
HANDLERS.put(".mpp", new NullFileHandler());
|
||||
HANDLERS.put(".qwp", new NullFileHandler());
|
||||
HANDLERS.put(".wps", new NullFileHandler());
|
||||
HANDLERS.put(".bin", new NullFileHandler());
|
||||
HANDLERS.put(".xps", new NullFileHandler());
|
||||
HANDLERS.put(".sldprt", new NullFileHandler());
|
||||
HANDLERS.put(".mdb", new NullFileHandler());
|
||||
HANDLERS.put(".vml", new NullFileHandler());
|
||||
|
||||
// ignore some file types, images, other formats, ...
|
||||
HANDLERS.put(".txt", new NullFileHandler());
|
||||
HANDLERS.put(".pdf", new NullFileHandler());
|
||||
HANDLERS.put(".rtf", new NullFileHandler());
|
||||
HANDLERS.put(".gif", new NullFileHandler());
|
||||
HANDLERS.put(".html", new NullFileHandler());
|
||||
HANDLERS.put(".png", new NullFileHandler());
|
||||
HANDLERS.put(".wmf", new NullFileHandler());
|
||||
HANDLERS.put(".emf", new NullFileHandler());
|
||||
HANDLERS.put(".dib", new NullFileHandler());
|
||||
HANDLERS.put(".svg", new NullFileHandler());
|
||||
HANDLERS.put(".pict", new NullFileHandler());
|
||||
HANDLERS.put(".jpg", new NullFileHandler());
|
||||
HANDLERS.put(".wav", new NullFileHandler());
|
||||
HANDLERS.put(".pfx", new NullFileHandler());
|
||||
HANDLERS.put(".xml", new NullFileHandler());
|
||||
HANDLERS.put(".csv", new NullFileHandler());
|
||||
// ignore some file types, images, other formats, ...
|
||||
HANDLERS.put(".txt", new NullFileHandler());
|
||||
HANDLERS.put(".pdf", new NullFileHandler());
|
||||
HANDLERS.put(".rtf", new NullFileHandler());
|
||||
HANDLERS.put(".gif", new NullFileHandler());
|
||||
HANDLERS.put(".html", new NullFileHandler());
|
||||
HANDLERS.put(".png", new NullFileHandler());
|
||||
HANDLERS.put(".wmf", new NullFileHandler());
|
||||
HANDLERS.put(".emf", new NullFileHandler());
|
||||
HANDLERS.put(".dib", new NullFileHandler());
|
||||
HANDLERS.put(".svg", new NullFileHandler());
|
||||
HANDLERS.put(".pict", new NullFileHandler());
|
||||
HANDLERS.put(".jpg", new NullFileHandler());
|
||||
HANDLERS.put(".wav", new NullFileHandler());
|
||||
HANDLERS.put(".pfx", new NullFileHandler());
|
||||
HANDLERS.put(".xml", new NullFileHandler());
|
||||
HANDLERS.put(".csv", new NullFileHandler());
|
||||
|
||||
// map some files without extension
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord", new NullFileHandler());
|
||||
// map some files without extension
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord", new NullFileHandler());
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord2", new NullFileHandler());
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord2CR1", new NullFileHandler());
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord2CR2", new NullFileHandler());
|
||||
@ -151,68 +151,68 @@ public class TestAllFiles {
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord2CR6", new NullFileHandler());
|
||||
HANDLERS.put("spreadsheet/BigSSTRecord2CR7", new NullFileHandler());
|
||||
HANDLERS.put("spreadsheet/BigSSTRecordCR", new NullFileHandler());
|
||||
HANDLERS.put("spreadsheet/test_properties1", new NullFileHandler());
|
||||
}
|
||||
HANDLERS.put("spreadsheet/test_properties1", new NullFileHandler());
|
||||
}
|
||||
|
||||
private static final Set<String> EXPECTED_FAILURES = new HashSet<String>();
|
||||
static {
|
||||
// password protected files
|
||||
EXPECTED_FAILURES.add("spreadsheet/password.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/51832.xls");
|
||||
EXPECTED_FAILURES.add("document/PasswordProtected.doc");
|
||||
EXPECTED_FAILURES.add("slideshow/Password_Protected-hello.ppt");
|
||||
EXPECTED_FAILURES.add("slideshow/Password_Protected-56-hello.ppt");
|
||||
EXPECTED_FAILURES.add("slideshow/Password_Protected-np-hello.ppt");
|
||||
EXPECTED_FAILURES.add("slideshow/cryptoapi-proc2356.ppt");
|
||||
//EXPECTED_FAILURES.add("document/bug53475-password-is-pass.docx");
|
||||
//EXPECTED_FAILURES.add("document/bug53475-password-is-solrcell.docx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/xor-encryption-abc.xls");
|
||||
private static final Set<String> EXPECTED_FAILURES = new HashSet<String>();
|
||||
static {
|
||||
// password protected files
|
||||
EXPECTED_FAILURES.add("spreadsheet/password.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/51832.xls");
|
||||
EXPECTED_FAILURES.add("document/PasswordProtected.doc");
|
||||
EXPECTED_FAILURES.add("slideshow/Password_Protected-hello.ppt");
|
||||
EXPECTED_FAILURES.add("slideshow/Password_Protected-56-hello.ppt");
|
||||
EXPECTED_FAILURES.add("slideshow/Password_Protected-np-hello.ppt");
|
||||
EXPECTED_FAILURES.add("slideshow/cryptoapi-proc2356.ppt");
|
||||
//EXPECTED_FAILURES.add("document/bug53475-password-is-pass.docx");
|
||||
//EXPECTED_FAILURES.add("document/bug53475-password-is-solrcell.docx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/xor-encryption-abc.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/35897-type4.xls");
|
||||
//EXPECTED_FAILURES.add("poifs/protect.xlsx");
|
||||
//EXPECTED_FAILURES.add("poifs/protected_sha512.xlsx");
|
||||
//EXPECTED_FAILURES.add("poifs/extenxls_pwd123.xlsx");
|
||||
//EXPECTED_FAILURES.add("poifs/protected_agile.docx");
|
||||
|
||||
// TODO: fails XMLExportTest, is this ok?
|
||||
EXPECTED_FAILURES.add("spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/55864.xlsx");
|
||||
// TODO: fails XMLExportTest, is this ok?
|
||||
EXPECTED_FAILURES.add("spreadsheet/CustomXMLMapping-singleattributenamespace.xlsx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/55864.xlsx");
|
||||
|
||||
// TODO: these fail now with some NPE/file read error because we now try to compute every value via Cell.toString()!
|
||||
EXPECTED_FAILURES.add("spreadsheet/44958.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/44958_1.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/testArraysAndTables.xls");
|
||||
// TODO: these fail now with some NPE/file read error because we now try to compute every value via Cell.toString()!
|
||||
EXPECTED_FAILURES.add("spreadsheet/44958.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/44958_1.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/testArraysAndTables.xls");
|
||||
|
||||
// TODO: good to ignore?
|
||||
EXPECTED_FAILURES.add("spreadsheet/sample-beta.xlsx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/49931.xls");
|
||||
EXPECTED_FAILURES.add("openxml4j/ContentTypeHasParameters.ooxml");
|
||||
// TODO: good to ignore?
|
||||
EXPECTED_FAILURES.add("spreadsheet/sample-beta.xlsx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/49931.xls");
|
||||
EXPECTED_FAILURES.add("openxml4j/ContentTypeHasParameters.ooxml");
|
||||
|
||||
// This is actually a spreadsheet!
|
||||
EXPECTED_FAILURES.add("hpsf/TestRobert_Flaherty.doc");
|
||||
// This is actually a spreadsheet!
|
||||
EXPECTED_FAILURES.add("hpsf/TestRobert_Flaherty.doc");
|
||||
|
||||
// some files that are broken, Excel 5.0/95, Word 95, ...
|
||||
EXPECTED_FAILURES.add("spreadsheet/43493.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/46904.xls");
|
||||
EXPECTED_FAILURES.add("document/56880.doc");
|
||||
EXPECTED_FAILURES.add("document/Bug49933.doc");
|
||||
EXPECTED_FAILURES.add("document/Bug50955.doc");
|
||||
EXPECTED_FAILURES.add("document/Bug51944.doc");
|
||||
EXPECTED_FAILURES.add("document/Word6.doc");
|
||||
EXPECTED_FAILURES.add("document/Word6_sections.doc");
|
||||
EXPECTED_FAILURES.add("document/Word6_sections2.doc");
|
||||
EXPECTED_FAILURES.add("document/Word95.doc");
|
||||
EXPECTED_FAILURES.add("document/word95err.doc");
|
||||
EXPECTED_FAILURES.add("hpsf/TestMickey.doc");
|
||||
EXPECTED_FAILURES.add("slideshow/PPT95.ppt");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_DerivedPartNameFAIL.docx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/54764-2.xlsx"); // see TestXSSFBugs.bug54764()
|
||||
EXPECTED_FAILURES.add("spreadsheet/54764.xlsx"); // see TestXSSFBugs.bug54764()
|
||||
// some files that are broken, Excel 5.0/95, Word 95, ...
|
||||
EXPECTED_FAILURES.add("spreadsheet/43493.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/46904.xls");
|
||||
EXPECTED_FAILURES.add("document/56880.doc");
|
||||
EXPECTED_FAILURES.add("document/Bug49933.doc");
|
||||
EXPECTED_FAILURES.add("document/Bug50955.doc");
|
||||
EXPECTED_FAILURES.add("document/Bug51944.doc");
|
||||
EXPECTED_FAILURES.add("document/Word6.doc");
|
||||
EXPECTED_FAILURES.add("document/Word6_sections.doc");
|
||||
EXPECTED_FAILURES.add("document/Word6_sections2.doc");
|
||||
EXPECTED_FAILURES.add("document/Word95.doc");
|
||||
EXPECTED_FAILURES.add("document/word95err.doc");
|
||||
EXPECTED_FAILURES.add("hpsf/TestMickey.doc");
|
||||
EXPECTED_FAILURES.add("slideshow/PPT95.ppt");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_DCTermsNamespaceLimitedUseFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_DoNotUseCompatibilityMarkupFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_NotPresentFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_LimitedXSITypeAttribute_PresentWithUnauthorizedValueFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_OnlyOneCorePropertiesPartFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_CoreProperties_UnauthorizedXMLLangAttributeFAIL.docx");
|
||||
EXPECTED_FAILURES.add("openxml4j/OPCCompliance_DerivedPartNameFAIL.docx");
|
||||
EXPECTED_FAILURES.add("spreadsheet/54764-2.xlsx"); // see TestXSSFBugs.bug54764()
|
||||
EXPECTED_FAILURES.add("spreadsheet/54764.xlsx"); // see TestXSSFBugs.bug54764()
|
||||
EXPECTED_FAILURES.add("spreadsheet/Simple.xlsb");
|
||||
EXPECTED_FAILURES.add("spreadsheet/testEXCEL_2.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/testEXCEL_3.xls");
|
||||
@ -220,10 +220,10 @@ public class TestAllFiles {
|
||||
EXPECTED_FAILURES.add("spreadsheet/testEXCEL_5.xls");
|
||||
EXPECTED_FAILURES.add("spreadsheet/testEXCEL_95.xls");
|
||||
|
||||
// non-TNEF files
|
||||
EXPECTED_FAILURES.add("ddf/Container.dat");
|
||||
EXPECTED_FAILURES.add("ddf/47143.dat");
|
||||
}
|
||||
// non-TNEF files
|
||||
EXPECTED_FAILURES.add("ddf/Container.dat");
|
||||
EXPECTED_FAILURES.add("ddf/47143.dat");
|
||||
}
|
||||
|
||||
@Parameters(name="{index}: {0} using {1}")
|
||||
public static Iterable<Object[]> files() {
|
||||
@ -242,7 +242,7 @@ public class TestAllFiles {
|
||||
}
|
||||
|
||||
return files;
|
||||
}
|
||||
}
|
||||
|
||||
@Parameter(value=0)
|
||||
public String file;
|
||||
@ -252,19 +252,19 @@ public class TestAllFiles {
|
||||
|
||||
@Test
|
||||
public void testAllFiles() throws Exception {
|
||||
assertNotNull("Unknown file extension for file: " + file + ": " + getExtension(file), handler);
|
||||
File inputFile = new File(ROOT_DIR, file);
|
||||
assertNotNull("Unknown file extension for file: " + file + ": " + getExtension(file), handler);
|
||||
File inputFile = new File(ROOT_DIR, file);
|
||||
|
||||
try {
|
||||
try {
|
||||
InputStream stream = new BufferedInputStream(new FileInputStream(inputFile),100);
|
||||
try {
|
||||
handler.handleFile(stream);
|
||||
try {
|
||||
handler.handleFile(stream);
|
||||
|
||||
assertFalse("Expected to fail for file " + file + " and handler " + handler + ", but did not fail!",
|
||||
EXPECTED_FAILURES.contains(file));
|
||||
} finally {
|
||||
stream.close();
|
||||
}
|
||||
assertFalse("Expected to fail for file " + file + " and handler " + handler + ", but did not fail!",
|
||||
EXPECTED_FAILURES.contains(file));
|
||||
} finally {
|
||||
stream.close();
|
||||
}
|
||||
|
||||
handler.handleExtracting(inputFile);
|
||||
} catch (Exception e) {
|
||||
@ -273,24 +273,24 @@ public class TestAllFiles {
|
||||
throw new Exception("While handling " + file, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static String getExtension(String file) {
|
||||
int pos = file.lastIndexOf('.');
|
||||
if(pos == -1 || pos == file.length()-1) {
|
||||
return file;
|
||||
}
|
||||
private static String getExtension(String file) {
|
||||
int pos = file.lastIndexOf('.');
|
||||
if(pos == -1 || pos == file.length()-1) {
|
||||
return file;
|
||||
}
|
||||
|
||||
return file.substring(pos);
|
||||
}
|
||||
return file.substring(pos);
|
||||
}
|
||||
|
||||
private static class NullFileHandler implements FileHandler {
|
||||
@Override
|
||||
private static class NullFileHandler implements FileHandler {
|
||||
@Override
|
||||
public void handleFile(InputStream stream) throws Exception {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Override
|
||||
public void handleExtracting(File file) throws Exception {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user