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

Fix inconsistent indents

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1665970 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2015-03-11 19:07:13 +00:00
parent b7c14b3a8f
commit d78a14b232
1 changed files with 161 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

322
src/integrationtest/org/apache/poi/TestAllFiles.java
View File

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