Fixed test compatibility issues

SAP · Sep 29, 2024 · 9db2631 · 9db2631
1 parent f43a6f8
commit 9db2631
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/test/one/profiler/test/Runner.java b/test/one/profiler/test/Runner.java
@@ -93,16 +93,11 @@ private static Jvm detectJvm() {
     }
 
     private static int detectJvmVersion() {
-        String prop = System.getProperty("java.vm.version");
-        if (prop.startsWith("25.") && prop.charAt(3) > '0') {
-            return 8;
-        } else if (prop.startsWith("24.") && prop.charAt(3) > '0') {
-            return 7;
-        } else if (prop.startsWith("20.") && prop.charAt(3) > '0') {
-            return 6;
-        } else {
-            return Integer.parseInt(prop.substring(0, prop.indexOf('.')));
+        String prop = System.getProperty("java.vm.specification.version");
+        if (prop.startsWith("1.")) {
+            prop = prop.substring(2);
         }
+        return Integer.parseInt(prop);
     }
 
     public static boolean enabled(Test test) {

diff --git a/test/test/jfr/JfrTests.java b/test/test/jfr/JfrTests.java
@@ -7,6 +7,7 @@
 
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordingFile;
+import one.profiler.test.Assert;
 import one.profiler.test.Output;
 import one.profiler.test.Test;
 import one.profiler.test.TestProcess;
@@ -69,8 +70,8 @@ public void parseMultiModeRecording(TestProcess p) throws Exception {
             }
         }
 
-        assert eventsCount.get("jdk.ExecutionSample") >= 50;
-        assert eventsCount.get("jdk.JavaMonitorEnter") >= 500;
-        assert eventsCount.get("jdk.ObjectAllocationInNewTLAB") >= 1000;
+        Assert.isGreater(eventsCount.get("jdk.ExecutionSample"), 50);
+        Assert.isGreater(eventsCount.get("jdk.JavaMonitorEnter"), 50);
+        Assert.isGreater(eventsCount.get("jdk.ObjectAllocationInNewTLAB"), 100);
     }
 }
diff --git a/test/test/lock/DatagramTest.java b/test/test/lock/DatagramTest.java
@@ -6,6 +6,7 @@
 package test.lock;
 
 import java.net.InetSocketAddress;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.util.concurrent.Executor;
@@ -32,7 +33,7 @@ public static void sendLoop() {
 
         try {
             while (true) {
-                buf.clear();
+                ((Buffer) buf).clear();
                 ch.send(buf, remoteAddr);
                 totalPackets.incrementAndGet();
             }