From: Andreas Beeker <kiwiwings@apache.org>
Date: Sat, 16 Jan 2021 09:55:42 +0000 (+0000)
Subject: integration tests: NullPointerExceptions contain now a description in Java 16+
X-Git-Tag: REL_5_1_0~426
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5e110d72167461ee5842b56a347d8e159b88c22c;p=poi.git

integration tests: NullPointerExceptions contain now a description in Java 16+

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1885549 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java b/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
index 9bce94f0db..347559330f 100644
--- a/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
+++ b/src/integrationtest/org/apache/poi/stress/TestAllFiles.java
@@ -88,7 +88,15 @@ import org.opentest4j.AssertionFailedError;
 @Execution(ExecutionMode.CONCURRENT)
 public class TestAllFiles {
     private static final File ROOT_DIR = new File("test-data");
-
+    private static final int jreVersion;
+
+    static {
+        String version = System.getProperty("java.version");
+        String major = version.startsWith("1.")
+            ? version.substring(2, 3)
+            : version.substring(0, version.indexOf("."));
+        jreVersion = Integer.parseInt(major);
+    }
 
     public static final String[] SCAN_EXCLUDES = {
         "**/.svn/**",
@@ -204,7 +212,7 @@ public class TestAllFiles {
         } else if (exClass != null) {
             Exception e = assertThrows((Class<? extends Exception>)exClass, exec);
             String actMsg = e.getMessage();
-            if (exMessage == null) {
+            if ((NullPointerException.class.isAssignableFrom(exClass) && jreVersion < 16) || exMessage == null) {
                 assertNull(actMsg);
             } else {
                 assertNotNull(actMsg);
diff --git a/test-data/spreadsheet/stress.xls b/test-data/spreadsheet/stress.xls
index 004069cffe..065ad65564 100644
Binary files a/test-data/spreadsheet/stress.xls and b/test-data/spreadsheet/stress.xls differ