From 4a8093dc4ff6cd8cfd5e8c8121738128507a683b Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Wed, 24 Jun 2015 08:33:06 +0000 Subject: [PATCH] show full exception stack-trace if zip-bomb detection test fails git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1687197 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/poi/openxml4j/opc/TestPackage.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java index 01c1b7707d..2383455fce 100644 --- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java +++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java @@ -712,7 +712,7 @@ public final class TestPackage { Workbook wb = WorkbookFactory.create(file); wb.close(); - // check ratio ouf of bounds + // check ratio out of bounds ZipSecureFile.setMinInflateRatio(min_ratio+0.002); try { wb = WorkbookFactory.create(file); @@ -721,11 +721,15 @@ public final class TestPackage { // depending if this executed via "ant test" or within eclipse // maybe a difference in JDK ... } catch (InvalidFormatException e) { - assertEquals("Zip bomb detected! Exiting.", e.getMessage()); + if(!e.getMessage().equals("Zip bomb detected! Exiting.")) { + throw new IllegalStateException(e); + } } catch (POIXMLException e) { InvocationTargetException t = (InvocationTargetException)e.getCause(); IOException t2 = (IOException)t.getTargetException(); - assertEquals("Zip bomb detected! Exiting.", t2.getMessage()); + if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) { + throw new IllegalStateException(e); + } } // check max entry size ouf of bounds @@ -735,11 +739,15 @@ public final class TestPackage { wb = WorkbookFactory.create(file, null, true); wb.close(); } catch (InvalidFormatException e) { - assertEquals("Zip bomb detected! Exiting.", e.getMessage()); + if(!e.getMessage().equals("Zip bomb detected! Exiting.")) { + throw new IllegalStateException(e); + } } catch (POIXMLException e) { InvocationTargetException t = (InvocationTargetException)e.getCause(); IOException t2 = (IOException)t.getTargetException(); - assertEquals("Zip bomb detected! Exiting.", t2.getMessage()); + if(!t2.getMessage().equals("Zip bomb detected! Exiting.")) { + throw new IllegalStateException(e); + } } } finally { // reset otherwise a lot of ooxml tests will fail