chore: update test framework and fixed test

Author: Davide Melfi

aws-lambda-java-runtime-interface-client/pom.xml

@@ -37,7 +37,7 @@
         <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
         <maven-install-plugin.version>2.4</maven-install-plugin.version>
         <maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
-        <junit-jupiter.version>5.9.2</junit-jupiter.version>
+        <junit-jupiter.version>5.14.3</junit-jupiter.version>
         <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
         <!--
             The test/integration/codebuild/buildspec.*.yml files will set -DmultiArch=false

aws-lambda-java-runtime-interface-client/src/test/java/com/amazonaws/services/lambda/runtime/api/client/ClasspathLoaderTest.java

@@ -6,16 +6,16 @@
 package com.amazonaws.services.lambda.runtime.api.client;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 import org.junit.jupiter.api.io.TempDir;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.Collections;
-import java.util.Enumeration;
 import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 
 import static org.junit.jupiter.api.Assertions.*;
@@ -27,21 +27,38 @@ void testLoadAllClassesWithNoClasspath() throws IOException {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.clearProperty("java.class.path");
-            ClasspathLoader.main(new String[]{});
+            ClasspathLoader.main(new String[] {});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
             }
         }
     }
 
+    // On JDK 8-24, new File("").exists() returns false → FileNotFoundException.
     @Test
+    @DisabledForJreRange(min = JRE.JAVA_25)
     void testLoadAllClassesWithEmptyClasspath() {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", "");
-            assertThrows(FileNotFoundException.class, () -> 
-                ClasspathLoader.main(new String[]{}));
+            assertThrows(FileNotFoundException.class, () -> ClasspathLoader.main(new String[] {}));
+        } finally {
+            if (originalClasspath != null) {
+                System.setProperty("java.class.path", originalClasspath);
+            }
+        }
+    }
+
+    // On JDK 25+, new File("") resolves to cwd (exists=true, isDirectory=true) →
+    // skipped with warning, no exception.
+    @Test
+    @EnabledForJreRange(min = JRE.JAVA_25)
+    void testLoadAllClassesWithEmptyClasspathJdk25Plus() throws IOException {
+        String originalClasspath = System.getProperty("java.class.path");
+        try {
+            System.setProperty("java.class.path", "");
+            ClasspathLoader.main(new String[] {});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -54,8 +71,7 @@ void testLoadAllClassesWithInvalidPath() {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", "nonexistent/path");
-            assertThrows(FileNotFoundException.class, () -> 
-                ClasspathLoader.main(new String[]{}));
+            assertThrows(FileNotFoundException.class, () -> ClasspathLoader.main(new String[] {}));
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -69,7 +85,7 @@ void testLoadAllClassesWithValidJar(@TempDir Path tempDir) throws IOException {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", jarFile.getAbsolutePath());
-            ClasspathLoader.main(new String[]{});
+            ClasspathLoader.main(new String[] {});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -82,7 +98,7 @@ void testLoadAllClassesWithDirectory(@TempDir Path tempDir) throws IOException {
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", tempDir.toString());
-            ClasspathLoader.main(new String[]{});
+            ClasspathLoader.main(new String[] {});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -94,14 +110,14 @@ void testLoadAllClassesWithDirectory(@TempDir Path tempDir) throws IOException {
     void testLoadAllClassesWithMultipleEntries(@TempDir Path tempDir) throws IOException {
         File jarFile1 = createSimpleJar(tempDir, "test1.jar", "TestClass1");
         File jarFile2 = createSimpleJar(tempDir, "test2.jar", "TestClass2");
-        
+
         String originalClasspath = System.getProperty("java.class.path");
         try {
-            String newClasspath = jarFile1.getAbsolutePath() + 
-                                File.pathSeparator + 
-                                jarFile2.getAbsolutePath();
+            String newClasspath = jarFile1.getAbsolutePath() +
+                    File.pathSeparator +
+                    jarFile2.getAbsolutePath();
             System.setProperty("java.class.path", newClasspath);
-            ClasspathLoader.main(new String[]{});
+            ClasspathLoader.main(new String[] {});
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -112,7 +128,7 @@ void testLoadAllClassesWithMultipleEntries(@TempDir Path tempDir) throws IOExcep
     @Test
     void testLoadAllClassesWithBlocklistedClass(@TempDir Path tempDir) throws IOException {
         File jarFile = tempDir.resolve("blocklist-test.jar").toFile();
-        
+
         try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile))) {
             JarEntry blockedEntry = new JarEntry("META-INF/versions/9/module-info.class");
             jos.putNextEntry(blockedEntry);
@@ -128,8 +144,9 @@ void testLoadAllClassesWithBlocklistedClass(@TempDir Path tempDir) throws IOExce
         String originalClasspath = System.getProperty("java.class.path");
         try {
             System.setProperty("java.class.path", jarFile.getAbsolutePath());
-            ClasspathLoader.main(new String[]{});
-            // The test passes if no exception is thrown and the blocklisted class is skipped
+            ClasspathLoader.main(new String[] {});
+            // The test passes if no exception is thrown and the blocklisted class is
+            // skipped
         } finally {
             if (originalClasspath != null) {
                 System.setProperty("java.class.path", originalClasspath);
@@ -139,15 +156,15 @@ void testLoadAllClassesWithBlocklistedClass(@TempDir Path tempDir) throws IOExce
 
     private File createSimpleJar(Path tempDir, String jarName, String className) throws IOException {
         File jarFile = tempDir.resolve(jarName).toFile();
-        
+
         try (JarOutputStream jos = new JarOutputStream(new FileOutputStream(jarFile))) {
             // Add a simple non-class file to make it a valid jar
             JarEntry entry = new JarEntry("com/test/" + className + ".txt");
             jos.putNextEntry(entry);
             jos.write("test content".getBytes());
             jos.closeEntry();
         }
-        
+
         return jarFile;
     }
 }