Disable AffinityLockTest.dumpLocks for Java 21.

yevgenp · yevgenp · commit 894231a7fc8d · 2023-11-03T11:52:04.000+02:00
diff --git a/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java b/affinity/src/test/java/net/openhft/affinity/AffinityLockTest.java
@@ -26,26 +26,32 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.Runtime.getRuntime;
 import static net.openhft.affinity.AffinityLock.PROCESSORS;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 /**
  * @author peter.lawrey
  */
 public class AffinityLockTest extends BaseAffinityTest {
     private static final Logger logger = LoggerFactory.getLogger(AffinityLockTest.class);
+    private static final int JDK_VERSION = getMajorVersion();
 
     private final TestFileLockBasedLockChecker lockChecker = new TestFileLockBasedLockChecker();
 
     @Test
     public void dumpLocksI7() throws IOException {
+        assumeFalse(JDK_VERSION > 20);
         LockInventory lockInventory = new LockInventory(VanillaCpuLayout.fromCpuInfo("i7.cpuinfo"));
         AffinityLock[] locks = {
                 new AffinityLock(0, true, false, lockInventory),
@@ -83,6 +89,7 @@ public void dumpLocksI7() throws IOException {
 
     @Test
     public void dumpLocksI3() throws IOException {
+        assumeFalse(JDK_VERSION > 20);
         LockInventory lockInventory = new LockInventory(VanillaCpuLayout.fromCpuInfo("i3.cpuinfo"));
         AffinityLock[] locks = {
                 new AffinityLock(0, true, false, lockInventory),
@@ -106,6 +113,7 @@ public void dumpLocksI3() throws IOException {
 
     @Test
     public void dumpLocksCoreDuo() throws IOException {
+        assumeFalse(JDK_VERSION > 20);
         LockInventory lockInventory = new LockInventory(VanillaCpuLayout.fromCpuInfo("core.duo.cpuinfo"));
         AffinityLock[] locks = {
                 new AffinityLock(0, true, false, lockInventory),
@@ -308,4 +316,22 @@ public void testTooHighCpuId2() {
         try (AffinityLock ignored = AffinityLock.acquireLock(new int[] {123456})) {
         }
     }
+
+    private static int getMajorVersion() {
+        try {
+            final Method method = Runtime.class.getDeclaredMethod("version");
+            final Object version = method.invoke(getRuntime());
+            final Class<?> clz = Class.forName("java.lang.Runtime$Version");
+            return (Integer) clz.getDeclaredMethod("major").invoke(version);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException | ClassNotFoundException |
+                 IllegalArgumentException e) {
+            // ignore and fall back to pre-jdk9
+        }
+        try {
+            return Integer.parseInt(Runtime.class.getPackage().getSpecificationVersion().split("\\.")[1]);
+        } catch (Exception e) {
+            System.err.println("Unable to get the major version, defaulting to 8 " + e);
+            return 8;
+        }
+    }
 }
