From 3959260c6ad6b31c7b754d3c257c62ebd92997d9 Mon Sep 17 00:00:00 2001
From: Javen O'Neal <onealj@apache.org>
Date: Wed, 14 Sep 2016 18:41:21 +0000
Subject: [PATCH] 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
---
 src/integrationtest/org/apache/poi/TestAllFiles.java         | 5 ++++-
 .../org/apache/poi/stress/XSSFFileHandler.java               | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/integrationtest/org/apache/poi/TestAllFiles.java b/src/integrationtest/org/apache/poi/TestAllFiles.java
index be3fb6636..e364c9f28 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 be6039707..0e24f0486 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")