From 5ae4dc25ab826ed1f018f4fbbaaac12a8ce938e9 Mon Sep 17 00:00:00 2001 From: Dominik Stadler Date: Fri, 3 Jun 2016 06:01:27 +0000 Subject: [PATCH] Try to not fail if the time-webservice is offline temporarily git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1746671 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/poifs/crypt/TestSignatureInfo.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java index e6f181259c..889b0dd1ab 100644 --- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java +++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestSignatureInfo.java @@ -388,11 +388,15 @@ public class TestSignatureInfo { if(e.getCause() == null) { throw e; } - if(!(e.getCause() instanceof ConnectException) && !(e.getCause() instanceof SocketTimeoutException)) { + if((e.getCause() instanceof ConnectException) || (e.getCause() instanceof SocketTimeoutException)) { + assertTrue("Only allowing ConnectException with 'timed out' as message here, but had: " + e, + e.getCause().getMessage().contains("timed out")); + } else if (e.getCause() instanceof RuntimeException) { + assertTrue("Only allowing RuntimeException with 'This site is cur' as message here, but had: " + e, + e.getCause().getMessage().contains("This site is cur")); + } else { throw e; } - assertTrue("Only allowing ConnectException with 'timed out' as message here, but had: " + e, - e.getCause().getMessage().contains("timed out")); } // verify -- 2.39.5