From 3953b18e2be9b70ec3cd3480684f8c0435a65994 Mon Sep 17 00:00:00 2001 From: Tim Allison Date: Wed, 22 Mar 2017 16:21:25 +0000 Subject: [PATCH] 60881 -- fix unit test to use assumeTrue thanks to Javen's recommendation. git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1788133 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/xssf/binary/XSSFBRichTextString.java | 1 + .../org/apache/poi/poifs/crypt/TestSecureTempZip.java | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java b/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java index d9bfc8137..990dd41de 100644 --- a/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java +++ b/src/ooxml/java/org/apache/poi/xssf/binary/XSSFBRichTextString.java @@ -30,6 +30,7 @@ import org.apache.poi.xssf.usermodel.XSSFRichTextString; */ @Internal class XSSFBRichTextString extends XSSFRichTextString { + private final String string; XSSFBRichTextString(String string) { diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java index d99474477..6244cec2f 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSecureTempZip.java @@ -37,6 +37,7 @@ import org.apache.poi.xssf.extractor.XSSFBEventBasedExcelExtractor; import org.apache.poi.xssf.extractor.XSSFEventBasedExcelExtractor; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.xmlbeans.XmlException; +import org.junit.Assume; import org.junit.Test; public class TestSecureTempZip { @@ -91,9 +92,9 @@ public class TestSecureTempZip { //The test file requires that JCE unlimited be installed. //If it isn't installed, skip this test. int maxKeyLen = Cipher.getMaxAllowedKeyLength("AES"); - if (maxKeyLen <= 128) { - return; - } + Assume.assumeTrue("Please install JCE Unlimited Strength Jurisdiction Policy files for AES 256", + maxKeyLen == 2147483647); + File tikaProt = XSSFTestDataSamples.getSampleFile("protected_passtika.xlsb"); FileInputStream fis = new FileInputStream(tikaProt); POIFSFileSystem poifs = new POIFSFileSystem(fis);