[tika] branch master updated: TIKA-2465 -- scope catch/fail more finely

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/master by this push:
     new 99abe4e  TIKA-2465 -- scope catch/fail more finely
99abe4e is described below

commit 99abe4e26c5340feef7290745aec0b5df7bde05b
Author: tballison <ta...@mitre.org>
AuthorDate: Thu Sep 14 06:54:51 2017 -0400

    TIKA-2465 -- scope catch/fail more finely
---
 tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java b/tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java
index 78790d1..d4c6ca7 100644
--- a/tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java
+++ b/tika-parsers/src/test/java/org/apache/tika/TestXXEInXML.java
@@ -104,12 +104,7 @@ public class TestXXEInXML extends TikaTest {
                 "testPPT_embeddedPDF.pptx",
                 "testPPT_macros.pptm"
         }) {
-            try {
-                _testOOXML(fileName);
-            } catch (Exception e) {
-                e.printStackTrace();
-                fail("problem with: "+fileName + ": "+ e.getMessage());
-            }
+            _testOOXML(fileName);
         }
     }
 
@@ -132,6 +127,9 @@ public class TestXXEInXML extends TikaTest {
 
             p.parse(Files.newInputStream(injected), xhtml, metadata, parseContext);
 
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+            fail("problem with: "+fileName + ": "+ e.getMessage());
         } finally {
             Files.delete(injected);
         }

-- 
To stop receiving notification emails like this one, please contact
['"commits@tika.apache.org" <co...@tika.apache.org>'].