Run tests on OpenJDK 15.

Farooq-Mirza · Sep 15, 2020 · 833e6f6 · 833e6f6
1 parent 52ba09a
commit 833e6f6
Show file tree

Hide file tree

Showing 119 changed files with 2,613 additions and 543 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,6 +12,7 @@ jdk:
   - openjdk12
   - openjdk13
   - openjdk14
+  - openjdk15
 before_script:
   - echo $JAVA_OPTS
   - export JAVA_OPTS=-Xmx4G

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -130,7 +130,7 @@ fi
 if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath

diff --git a/gradlew.bat b/gradlew.bat
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,29 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell

diff --git a/jpos/build.gradle b/jpos/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:4.3.1'
+        classpath 'biz.aQute.bnd:biz.aQute.bnd.gradle:5.1.2'
         classpath 'org.owasp:dependency-check-gradle:5.3.2.1'
     }
 }

diff --git a/jpos/libraries.gradle b/jpos/libraries.gradle
@@ -4,7 +4,7 @@ ext {
         jdbm: 'jdbm:jdbm:1.0',
         sleepycat_je: 'com.sleepycat:je:18.3.12',
         commons_cli: 'commons-cli:commons-cli:1.4',
-        commons_lang3: 'org.apache.commons:commons-lang3:3.10',
+        commons_lang3: 'org.apache.commons:commons-lang3:3.11',
         jline: 'org.jline:jline:3.16.0',
         beanshell: 'org.apache-extras.beanshell:bsh:2.0b6',
         javatuples: 'org.javatuples:javatuples:1.2',

diff --git a/jpos/src/test/java/org/jpos/bsh/BSHActionTest.java b/jpos/src/test/java/org/jpos/bsh/BSHActionTest.java
@@ -18,9 +18,9 @@
 
 package org.jpos.bsh;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.commons.lang3.JavaVersion.JAVA_14;
+import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
+import static org.junit.jupiter.api.Assertions.*;
 
 import java.awt.event.ActionEvent;
 
@@ -42,7 +42,11 @@ public void testActionPerformedThrowsNullPointerException() throws Throwable {
             new BSHAction().actionPerformed(null);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"java.awt.event.ActionEvent.getActionCommand()\" because \"ev\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 

diff --git a/jpos/src/test/java/org/jpos/bsh/BSHFilterTest.java b/jpos/src/test/java/org/jpos/bsh/BSHFilterTest.java
@@ -18,10 +18,9 @@
 
 package org.jpos.bsh;
 
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
+import static org.apache.commons.lang3.JavaVersion.JAVA_14;
+import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
+import static org.junit.jupiter.api.Assertions.*;
 
 import org.jpos.core.Configuration;
 import org.jpos.core.SimpleConfiguration;
@@ -80,7 +79,11 @@ public void testFilterThrowsNullPointerException() throws Throwable {
             bSHFilter.filter(new CSChannel("testBSHFilterHost", 100, new PostPackager()), new ISOMsg("testBSHFilterMti"), evt);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"org.jpos.core.Configuration.getAll(String)\" because \"this.cfg\" is null", ex.getMessage(), "ex.getMessage()");
+            }
             assertNull(bSHFilter.cfg, "bSHFilter.cfg");
         }
     }

diff --git a/jpos/src/test/java/org/jpos/bsh/BSHLogListenerTest.java b/jpos/src/test/java/org/jpos/bsh/BSHLogListenerTest.java
@@ -24,6 +24,7 @@
 import static org.junit.jupiter.api.Assertions.fail;
 
 import static org.apache.commons.lang3.JavaVersion.JAVA_10;
+import static org.apache.commons.lang3.JavaVersion.JAVA_14;
 import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
 
 import java.io.File;
@@ -322,7 +323,11 @@ public void testReplaceThrowsNullPointerException() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"src[i]\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -354,7 +359,11 @@ public void testReplaceThrowsNullPointerException1() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"src[i]\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -375,7 +384,11 @@ public void testReplaceThrowsNullPointerException2() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"src[i]\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -395,7 +408,11 @@ public void testReplaceThrowsNullPointerException3() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot read field \"value\" because \"tgtStr\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -410,7 +427,11 @@ public void testReplaceThrowsNullPointerException4() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot read field \"value\" because \"tgtStr\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -425,7 +446,11 @@ public void testReplaceThrowsNullPointerException5() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot read field \"value\" because \"tgtStr\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -439,7 +464,11 @@ public void testReplaceThrowsNullPointerException6() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot read field \"value\" because \"tgtStr\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -453,7 +482,11 @@ public void testReplaceThrowsNullPointerException7() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"src[i]\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -465,7 +498,11 @@ public void testReplaceThrowsNullPointerException8() throws Throwable {
             BSHLogListener.replace(null, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot read the array length because \"src\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -478,7 +515,11 @@ public void testReplaceThrowsNullPointerException9() throws Throwable {
             BSHLogListener.replace(src, patterns, to);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"src[i]\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 

diff --git a/jpos/src/test/java/org/jpos/bsh/BSHRequestListenerTest.java b/jpos/src/test/java/org/jpos/bsh/BSHRequestListenerTest.java
@@ -18,6 +18,8 @@
 
 package org.jpos.bsh;
 
+import static org.apache.commons.lang3.JavaVersion.JAVA_14;
+import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -88,7 +90,11 @@ public void testSetConfigurationThrowsNullPointerException() throws Throwable {
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
             assertSame(cfg, bSHRequestListener.cfg, "bSHRequestListener.cfg");
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"org.jpos.core.Configuration.getAll(String)\" because \"this.cfg\" is null", ex.getMessage(), "ex.getMessage()");
+            }
             assertNull(bSHRequestListener.whitelist, "bSHRequestListener.whitelist");
             assertNull(bSHRequestListener.bshSource, "bSHRequestListener.bshSource");
         }

diff --git a/jpos/src/test/java/org/jpos/core/CardHolderTest.java b/jpos/src/test/java/org/jpos/core/CardHolderTest.java
@@ -21,11 +21,12 @@
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
-import org.jpos.iso.ISOBitMap;
 import org.jpos.iso.ISOMsg;
 import org.jpos.testhelpers.EqualsHashCodeTestCase;
 import org.junit.jupiter.api.Test;
 
+import static org.apache.commons.lang3.JavaVersion.JAVA_14;
+import static org.apache.commons.lang3.SystemUtils.isJavaVersionAtMost;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class CardHolderTest extends EqualsHashCodeTestCase {
@@ -157,7 +158,11 @@ public void testDumpThrowsNullPointerException() throws Throwable {
             new CardHolder("k'X9|DH:!;uQ<kG8!P?- ,\"Y!u`r;jB^)>3AbS9,").dump(null, "testCardHolderIndent");
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"java.io.PrintStream.print(String)\" because \"p\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -175,7 +180,11 @@ public void testGetBINThrowsNullPointerException() throws Throwable {
             new CardHolder().getBIN();
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.substring(int, int)\" because \"this.pan\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -452,7 +461,11 @@ public void testIsValidCRCThrowsNullPointerException() throws Throwable {
             new CardHolder().isValidCRC();
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"p\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -462,7 +475,11 @@ public void testIsValidCRCThrowsNullPointerException1() throws Throwable {
             CardHolder.isValidCRC(null);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"p\" is null", ex.getMessage(), "ex.getMessage()");
+            }
         }
     }
 
@@ -557,7 +574,11 @@ public void testSetEXPThrowsNullPointerException() throws Throwable {
             cardHolder.setEXP(null);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"exp\" is null", ex.getMessage(), "ex.getMessage()");
+            }
             assertEquals("4Cha", cardHolder.exp, "cardHolder.exp");
         }
     }
@@ -590,7 +611,11 @@ public void testSetPANThrowsNullPointerException() throws Throwable {
             cardHolder.setPAN(null);
             fail("Expected NullPointerException to be thrown");
         } catch (NullPointerException ex) {
-            assertNull(ex.getMessage(), "ex.getMessage()");
+            if (isJavaVersionAtMost(JAVA_14)) {
+                assertNull(ex.getMessage(), "ex.getMessage()");
+            } else {
+                assertEquals("Cannot invoke \"String.length()\" because \"pan\" is null", ex.getMessage(), "ex.getMessage()");
+            }
             assertEquals("k'X9|", cardHolder.pan, "cardHolder.pan");
         }
     }