diff options
author | Javen O'Neal <onealj@apache.org> | 2016-09-14 18:41:21 +0000 |
---|---|---|
committer | Javen O'Neal <onealj@apache.org> | 2016-09-14 18:41:21 +0000 |
commit | d21ca60982789184fcaf81c0ee9967691a3cfea1 (patch) | |
tree | d7611b6d034060df44b3f4b34f32a56278b14840 /src/integrationtest/org | |
parent | daa35a08d69ea991f32a489a79dca20b8a67cefc (diff) | |
download | poi-d21ca60982789184fcaf81c0ee9967691a3cfea1.tar.gz poi-d21ca60982789184fcaf81c0ee9967691a3cfea1.zip |
bug 60128: exclude openxml4j/invalid.xlsx from additional integration (stress) tests
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1760743 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/integrationtest/org')
-rw-r--r-- | src/integrationtest/org/apache/poi/TestAllFiles.java | 5 | ||||
-rw-r--r-- | src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/integrationtest/org/apache/poi/TestAllFiles.java b/src/integrationtest/org/apache/poi/TestAllFiles.java index be3fb66363..e364c9f28a 100644 --- a/src/integrationtest/org/apache/poi/TestAllFiles.java +++ b/src/integrationtest/org/apache/poi/TestAllFiles.java @@ -298,7 +298,10 @@ public class TestAllFiles { List<Object[]> files = new ArrayList<Object[]>(); for(String file : scanner.getIncludedFiles()) { file = file.replace('\\', '/'); // ... failures/handlers lookup doesn't work on windows otherwise - if (IGNORED.contains(file)) continue; + if (IGNORED.contains(file)) { + System.out.println("Ignoring " + file); + continue; + } FileHandler handler = HANDLERS.get(getExtension(file)); files.add(new Object[] { file, handler }); diff --git a/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java b/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java index be60397071..0e24f04862 100644 --- a/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java +++ b/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java @@ -30,6 +30,7 @@ import javax.xml.transform.TransformerException; import org.apache.poi.POIXMLException; import org.apache.poi.openxml4j.exceptions.InvalidFormatException; +import org.apache.poi.openxml4j.exceptions.NotOfficeXmlFileException; import org.apache.poi.openxml4j.exceptions.OLE2NotOfficeXmlFileException; import org.apache.poi.openxml4j.exceptions.OpenXML4JException; import org.apache.poi.openxml4j.opc.OPCPackage; @@ -134,6 +135,9 @@ public class XSSFFileHandler extends SpreadsheetHandler { EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/Simple.xlsb"); // TODO: good to ignore? EXPECTED_ADDITIONAL_FAILURES.add("spreadsheet/sample-beta.xlsx"); + + // corrupt/invalid + EXPECTED_ADDITIONAL_FAILURES.add("openxml4j/invalid.xlsx"); } @SuppressWarnings("resource") |