You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2017/06/07 06:25:56 UTC
svn commit: r1797856 - in
/poi/trunk/src/integrationtest/org/apache/poi/stress:
AbstractFileHandler.java XSSFFileHandler.java
Author: kiwiwings
Date: Wed Jun 7 06:25:56 2017
New Revision: 1797856
URL: http://svn.apache.org/viewvc?rev=1797856&view=rev
Log:
Ignore JCE restriction errors
Modified:
poi/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java
poi/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java
Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java?rev=1797856&r1=1797855&r2=1797856&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java (original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/AbstractFileHandler.java Wed Jun 7 06:25:56 2017
@@ -19,6 +19,7 @@ package org.apache.poi.stress;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeFalse;
import java.io.File;
import java.io.FileInputStream;
@@ -27,11 +28,13 @@ import java.io.InputStream;
import java.util.HashSet;
import java.util.Set;
+import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.POIOLE2TextExtractor;
import org.apache.poi.POITextExtractor;
import org.apache.poi.extractor.ExtractorFactory;
import org.apache.poi.hpsf.extractor.HPSFPropertiesExtractor;
import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
+import org.apache.poi.util.IOUtils;
import org.apache.xmlbeans.XmlException;
public abstract class AbstractFileHandler implements FileHandler {
@@ -75,8 +78,9 @@ public abstract class AbstractFileHandle
long length = file.length();
long modified = file.lastModified();
- POITextExtractor extractor = ExtractorFactory.createExtractor(file);
+ POITextExtractor extractor = null;
try {
+ extractor = ExtractorFactory.createExtractor(file);
assertNotNull("Should get a POITextExtractor but had none for file " + file, extractor);
assertNotNull("Should get some text but had none for file " + file, extractor.getText());
@@ -110,8 +114,12 @@ public abstract class AbstractFileHandle
if(!EXPECTED_EXTRACTOR_FAILURES.contains(file.getParentFile().getName() + "/" + file.getName())) {
throw e;
}
+ } catch (EncryptedDocumentException e) {
+ String msg = "org.apache.poi.EncryptedDocumentException: Export Restrictions in place - please install JCE Unlimited Strength Jurisdiction Policy files";
+ assumeFalse(msg.equals(e.getMessage()));
+ throw e;
} finally {
- extractor.close();
+ IOUtils.closeQuietly(extractor);
}
}
Modified: poi/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java?rev=1797856&r1=1797855&r2=1797856&view=diff
==============================================================================
--- poi/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java (original)
+++ poi/trunk/src/integrationtest/org/apache/poi/stress/XSSFFileHandler.java Wed Jun 7 06:25:56 2017
@@ -16,8 +16,9 @@
==================================================================== */
package org.apache.poi.stress;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;
import java.io.BufferedInputStream;
@@ -37,6 +38,7 @@ import java.util.Set;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
+import org.apache.poi.EncryptedDocumentException;
import org.apache.poi.POIXMLException;
import org.apache.poi.hssf.record.crypto.Biff8EncryptionKey;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -75,8 +77,14 @@ public class XSSFFileHandler extends Spr
POIFSFileSystem poifs = new POIFSFileSystem(bytes);
EncryptionInfo ei = new EncryptionInfo(poifs);
Decryptor dec = ei.getDecryptor();
- boolean b = dec.verifyPassword(pass);
- assertTrue("password mismatch", b);
+ try {
+ boolean b = dec.verifyPassword(pass);
+ assertTrue("password mismatch", b);
+ } catch (EncryptedDocumentException e) {
+ String msg = "Export Restrictions in place - please install JCE Unlimited Strength Jurisdiction Policy files";
+ assumeFalse(msg.equals(e.getMessage()));
+ throw e;
+ }
InputStream is = dec.getDataStream(poifs);
out.reset();
IOUtils.copy(is, out);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org