mirror of https://github.com/apache/poi.git
Do not require NullPointerException to have a null-message on JDK < 16
It seems depending on the exact JDK some Exceptions have failure messages populated git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1886527 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
92134f34b1
commit
7a8f21b989
|
@ -20,7 +20,6 @@ package org.apache.poi.stress;
|
||||||
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
|
||||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
|
||||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||||
import static org.junit.jupiter.api.Assertions.fail;
|
import static org.junit.jupiter.api.Assertions.fail;
|
||||||
|
@ -71,9 +70,7 @@ import org.opentest4j.AssertionFailedError;
|
||||||
// also need to set JVM parameter: -Djunit.jupiter.execution.parallel.enabled=true
|
// also need to set JVM parameter: -Djunit.jupiter.execution.parallel.enabled=true
|
||||||
@Execution(ExecutionMode.CONCURRENT)
|
@Execution(ExecutionMode.CONCURRENT)
|
||||||
public class TestAllFiles {
|
public class TestAllFiles {
|
||||||
private static final File ROOT_DIR = new File("test-data");
|
public static final File ROOT_DIR = new File("test-data");
|
||||||
private static final int jreVersion =
|
|
||||||
Integer.parseInt(System.getProperty("java.version").replaceAll("^(?:1\\.)?(\\d+).*", "$1"));
|
|
||||||
|
|
||||||
public static final String[] SCAN_EXCLUDES = {
|
public static final String[] SCAN_EXCLUDES = {
|
||||||
"**/.svn/**",
|
"**/.svn/**",
|
||||||
|
@ -124,7 +121,6 @@ public class TestAllFiles {
|
||||||
verify(file, exec, exClass, exMessage, password);
|
verify(file, exec, exClass, exMessage, password);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static Stream<Arguments> handleFiles() throws IOException {
|
public static Stream<Arguments> handleFiles() throws IOException {
|
||||||
return allfiles("handle");
|
return allfiles("handle");
|
||||||
}
|
}
|
||||||
|
@ -174,8 +170,6 @@ public class TestAllFiles {
|
||||||
Exception e = assertThrows((Class<? extends Exception>)exClass, exec);
|
Exception e = assertThrows((Class<? extends Exception>)exClass, exec);
|
||||||
String actMsg = pathReplace(e.getMessage());
|
String actMsg = pathReplace(e.getMessage());
|
||||||
if (NullPointerException.class.isAssignableFrom(exClass)) {
|
if (NullPointerException.class.isAssignableFrom(exClass)) {
|
||||||
// with Java 16+ NullPointerExceptions may contain a message ... but apparently not always ?!
|
|
||||||
assertTrue(jreVersion >= 16 || actMsg == null, errPrefix);
|
|
||||||
if (actMsg != null) {
|
if (actMsg != null) {
|
||||||
assertTrue(actMsg.contains(exMessage), errPrefix + "Message: "+actMsg+" - didn't contain: "+exMessage);
|
assertTrue(actMsg.contains(exMessage), errPrefix + "Message: "+actMsg+" - didn't contain: "+exMessage);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue