diff options
Diffstat (limited to 'poi-integration')
| -rw-r--r-- | poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java index ed96cde4e8..5171158965 100644 --- a/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java +++ b/poi-integration/src/test/java/org/apache/poi/stress/TestAllFiles.java @@ -253,13 +253,22 @@ public class TestAllFiles { Exception e = assertThrows((Class<? extends Exception>)exClass, exec, errPrefix + " expected " + exClass); String actMsg = pathReplace(e.getMessage()); - // verify that message is either null for both or set for both - assertTrue(actMsg != null || StringUtils.isBlank(exMessage), - errPrefix + " for " + exClass + " expected message '" + exMessage + "' but had '" + actMsg + "'"); - - if (actMsg != null) { - assertTrue(actMsg.contains(exMessage), - errPrefix + "Message: " + actMsg + " - didn't contain: " + exMessage); + // perform special handling of NullPointerException as + // JDK started to add more information in some newer JDK, so + // it sometimes has a message and sometimes not! + if (NullPointerException.class.isAssignableFrom(exClass)) { + if (actMsg != null) { + assertTrue(actMsg.contains(exMessage), errPrefix + "Message: "+actMsg+" - didn't contain: "+exMessage); + } + } else { + // verify that message is either null for both or set for both + assertTrue(actMsg != null || StringUtils.isBlank(exMessage), + errPrefix + " for " + exClass + " expected message '" + exMessage + "' but had '" + actMsg + "'"); + + if (actMsg != null) { + assertTrue(actMsg.contains(exMessage), + errPrefix + "Message: " + actMsg + " - didn't contain: " + exMessage); + } } } else { assertDoesNotThrow(exec, errPrefix); |