chore: unsafeutil

Author: Davide Melfi

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

@@ -6,9 +6,10 @@
 package com.amazonaws.services.lambda.runtime.api.client.util;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 import java.lang.reflect.Field;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 public class UnsafeUtilTest {
 
@@ -30,38 +31,24 @@ void testThrowException() {
         }
     }
 
+    // IllegalAccessLogger only exists on JDK 9-16; skipped on JDK 8 (no module
+    // system) and JDK 17+ (class removed).
     @Test
-    void testDisableIllegalAccessWarning() {
-        assertDoesNotThrow(() -> UnsafeUtil.disableIllegalAccessWarning());
-
-        String specVersion = System.getProperty("java.specification.version");
-        int version = specVersion.startsWith("1.")
-                ? Integer.parseInt(specVersion.substring(2))
-                : Integer.parseInt(specVersion);
-        // we are using assume to skip the test in java8 and java 17+ because the
-        // IllegalAccessorLogger does not exist there.
-        assumeTrue(version >= 9 && version < 17,
-                "IllegalAccessLogger only exists on JDK 9-16");
-
-        try {
-
-            // We disable the warning log for "jdk.internal.module.IllegalAccessLogger"
-            UnsafeUtil.disableIllegalAccessWarning();
-
-            Class<?> illegalAccessLoggerClass = Class.forName("jdk.internal.module.IllegalAccessLogger");
-            Field loggerField = illegalAccessLoggerClass.getDeclaredField("logger");
-
-            // Now we are getting it back with getObjectVolatile and verirfy that the logger
-            // is null. We are not using default reflection because that will throw because
-            // that field is private
-            // defeating the point of the tests.
-            Object loggerValue = UnsafeUtil.TheUnsafe.getObjectVolatile(
-                    illegalAccessLoggerClass,
-                    UnsafeUtil.TheUnsafe.staticFieldOffset(loggerField));
-            assertNull(loggerValue);
-        } catch (ClassNotFoundException | NoSuchFieldException e) {
-            fail("IllegalAccessLogger should exist on JDK " + version + ": " + e.getMessage());
-        }
+    @EnabledForJreRange(min = JRE.JAVA_9, max = JRE.JAVA_16)
+    void testDisableIllegalAccessWarning() throws Exception {
+        // We disable the warning log for "jdk.internal.module.IllegalAccessLogger"
+        UnsafeUtil.disableIllegalAccessWarning();
+
+        Class<?> illegalAccessLoggerClass = Class.forName("jdk.internal.module.IllegalAccessLogger");
+        Field loggerField = illegalAccessLoggerClass.getDeclaredField("logger");
+
+        // Now we are getting it back with getObjectVolatile and verify that the logger
+        // is null. We are not using default reflection because that will throw because
+        // that field is private, defeating the point of the test.
+        Object loggerValue = UnsafeUtil.TheUnsafe.getObjectVolatile(
+                illegalAccessLoggerClass,
+                UnsafeUtil.TheUnsafe.staticFieldOffset(loggerField));
+        assertNull(loggerValue);
     }
 
     @Test