From: Andreas Beeker Date: Sun, 2 Feb 2020 07:30:50 +0000 (+0000) Subject: omit bug63955-winmail.dat in no-scratchpad mode X-Git-Tag: REL_4_1_2~1^2~6 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=76d28cc22a35f0da30302d54712c08e9f87bf78a;p=poi.git omit bug63955-winmail.dat in no-scratchpad mode git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1873495 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java b/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java index 2b1114ab46..64179ff8d7 100644 --- a/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java +++ b/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java @@ -31,9 +31,9 @@ import java.util.Set; import org.apache.poi.EncryptedDocumentException; import org.apache.poi.extractor.POIOLE2TextExtractor; import org.apache.poi.extractor.POITextExtractor; +import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor; import org.apache.poi.hssf.extractor.EventBasedExcelExtractor; import org.apache.poi.ooxml.extractor.ExtractorFactory; -import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.ss.extractor.ExcelExtractor; import org.apache.poi.util.IOUtils; @@ -48,12 +48,13 @@ public abstract class AbstractFileHandler implements FileHandler { static { // password protected files without password // ... currently none ... - + // unsupported file-types, no supported OLE2 parts EXPECTED_EXTRACTOR_FAILURES.add("hmef/quick-winmail.dat"); EXPECTED_EXTRACTOR_FAILURES.add("hmef/winmail-sample1.dat"); EXPECTED_EXTRACTOR_FAILURES.add("hmef/bug52400-winmail-simple.dat"); EXPECTED_EXTRACTOR_FAILURES.add("hmef/bug52400-winmail-with-attachments.dat"); + EXPECTED_EXTRACTOR_FAILURES.add("hmef/bug63955-winmail.dat"); EXPECTED_EXTRACTOR_FAILURES.add("hpsf/Test0313rur.adm"); EXPECTED_EXTRACTOR_FAILURES.add("poifs/Notes.ole2"); } @@ -70,10 +71,10 @@ public abstract class AbstractFileHandler implements FileHandler { } finally { ExtractorFactory.setThreadPrefersEventExtractors(before); } - + /* Did fail for some documents with special XML contents... try { - OOXMLPrettyPrint.main(new String[] { file.getAbsolutePath(), + OOXMLPrettyPrint.main(new String[] { file.getAbsolutePath(), "/tmp/pretty-" + file.getName() }); } catch (ZipException e) { // ignore, not a Zip/OOXML file @@ -83,7 +84,7 @@ public abstract class AbstractFileHandler implements FileHandler { private void handleExtractingInternal(File file) throws Exception { long length = file.length(); long modified = file.lastModified(); - + POITextExtractor extractor = null; String fileAndParentName = file.getParentFile().getName() + "/" + file.getName(); try {