Apache
/
poi
mirror of https://github.com/apache/poi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

try to fix failing tests 

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1891555 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
PJ Fanning 2021-07-14 22:46:39 +00:00
parent c104890f33
commit 480d13b118
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
poi-integration/src/test/java/org/apache/poi/stress/OPCFileHandler.java
View File

@ -23,6 +23,10 @@ import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
import java.io.InputStream; import java.io.InputStream;
import java.io.PushbackInputStream; import java.io.PushbackInputStream;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.apache.poi.openxml4j.opc.ContentTypes; import org.apache.poi.openxml4j.opc.ContentTypes;
import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.openxml4j.opc.OPCPackage;
@ -31,17 +35,18 @@ import org.apache.poi.xwpf.usermodel.XWPFRelation;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
class OPCFileHandler extends AbstractFileHandler { class OPCFileHandler extends AbstractFileHandler {
private static final Set<String> EXPECTED_FAILURES = unmodifiableHashSet(
"document/truncated62886.docx"
);
@Override @Override
public void handleFile(InputStream stream, String path) throws Exception { public void handleFile(InputStream stream, String path) throws Exception {
// ignore password protected files // ignore password protected files
if (POIXMLDocumentHandler.isEncrypted(stream)) return; if (POIXMLDocumentHandler.isEncrypted(stream)) return;
OPCPackage p; if (EXPECTED_FAILURES.contains(path)) return;
try {
p = OPCPackage.open(stream); OPCPackage p = OPCPackage.open(stream);
} catch (Exception e) {
throw new RuntimeException("Failed to open '" + path + "' as OPCPackage", e);
}
for (PackagePart part : p.getParts()) { for (PackagePart part : p.getParts()) {
if (part.getPartName().toString().equals("/docProps/core.xml")) { if (part.getPartName().toString().equals("/docProps/core.xml")) {
@ -75,4 +80,8 @@ class OPCFileHandler extends AbstractFileHandler {
handleExtracting(file); handleExtracting(file);
} }
private static Set<String> unmodifiableHashSet(String... a) {
return Collections.unmodifiableSet(new HashSet<>(Arrays.asList(a)));
}
} }

8
poi-integration/src/test/java/org/apache/poi/stress/XWPFFileHandler.java
View File

@ -26,25 +26,27 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import org.apache.poi.ooxml.POIXMLException; import org.apache.poi.ooxml.POIXMLException;
import org.apache.poi.openxml4j.opc.OPCPackage;
import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
class XWPFFileHandler extends AbstractFileHandler { class XWPFFileHandler extends AbstractFileHandler {
private static final Set<String> EXPECTED_FAILURES = unmodifiableHashSet(
"document/truncated62886.docx"
);
@Override @Override
public void handleFile(InputStream stream, String path) throws Exception { public void handleFile(InputStream stream, String path) throws Exception {
// ignore password protected files // ignore password protected files
if (POIXMLDocumentHandler.isEncrypted(stream)) return; if (POIXMLDocumentHandler.isEncrypted(stream)) return;
if (EXPECTED_FAILURES.contains(path)) return;
try (XWPFDocument doc = new XWPFDocument(stream)) { try (XWPFDocument doc = new XWPFDocument(stream)) {
new POIXMLDocumentHandler().handlePOIXMLDocument(doc); new POIXMLDocumentHandler().handlePOIXMLDocument(doc);
POIXMLDocumentHandler.cursorRecursive(doc.getDocument()); POIXMLDocumentHandler.cursorRecursive(doc.getDocument());
} catch (POIXMLException e) { } catch (POIXMLException e) {
Exception cause = (Exception)e.getCause(); Exception cause = (Exception)e.getCause();
throw cause == null ? e : cause; throw cause == null ? e : cause;
} catch (Exception e) {
throw new RuntimeException("Failed to open '" + path + "' as XWPFDocument", e);
} }
} }