[build] Ensure all tests pass on IBM JDK (11 and 17)

Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
jolokia · Mar 7, 2024 · 6d9006a · 6d9006a
1 parent 82d96c0
commit 6d9006a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/agent/jvm/src/test/java/org/jolokia/jvmagent/JolokiaServerTest.java b/agent/jvm/src/test/java/org/jolokia/jvmagent/JolokiaServerTest.java
@@ -586,7 +586,18 @@ private void checkServer(JvmAgentConfig pConfig, boolean pDoRequest,
                     ks.load(fis, "1234".toCharArray());
                     KeyManagerFactory kmf;
                     if ("IBM Corporation".equals(System.getProperty("java.vendor"))) {
-                        kmf = KeyManagerFactory.getInstance("IBMX509");
+                        // Using IBM Semeru Runtime Open Edition 11.0.22.0 (build 11.0.22+7):
+                        // see https://www.ibm.com/support/pages/semeru-runtimes-security-migration-guide
+                        //  - KeyManagerFactory
+                        //    - NewSunX509 : sun.security.ssl.KeyManagerFactoryImpl$X509
+                        //      aliases: [PKIX]
+                        //    - SunX509 : sun.security.ssl.KeyManagerFactoryImpl$SunX509
+                        String runtimeName = System.getProperty("java.runtime.name");
+                        if (runtimeName != null && runtimeName.toLowerCase().contains("semeru")) {
+                            kmf = KeyManagerFactory.getInstance("SunX509");
+                        } else {
+                            kmf = KeyManagerFactory.getInstance("IBMX509");
+                        }
                     } else {
                         kmf = KeyManagerFactory.getInstance("SunX509");
                     }

diff --git a/client/jmx-adapter/src/test/java/org/jolokia/client/jmxadapter/JmxBridgeTest.java b/client/jmx-adapter/src/test/java/org/jolokia/client/jmxadapter/JmxBridgeTest.java
@@ -170,9 +170,12 @@ public class JmxBridgeTest {
         "java.lang:type=GarbageCollector,name=global.LastGcInfo",
         "java.lang:type=OperatingSystem.ProcessCpuTimeByNS",
         "java.lang:type=OperatingSystem.ProcessPhysicalMemorySize",
+        "java.lang:type=OperatingSystem.ProcessPrivateMemorySize",
+        "java.lang:type=OperatingSystem.ProcessVirtualMemorySize",
         "java.lang:type=Memory.GCMasterThreadCpuUsed",
         "java.lang:type=OperatingSystem.SystemLoadAverage",
-        "java.lang:type=OperatingSystem.OpenFileDescriptorCount");
+        "java.lang:type=OperatingSystem.OpenFileDescriptorCount",
+        "java.lang:type=MemoryPool,name=JIT code cache.Usage");
 
     //Attributes that give runtime exception on some JVM versions and therefore not suitable for brute force tests
     private static final Collection<String> UNSAFE_ATTRIBUTES = Set.of(

diff --git a/service/jmx/src/test/java/org/jolokia/service/jmx/handler/ListHandlerTest.java b/service/jmx/src/test/java/org/jolokia/service/jmx/handler/ListHandlerTest.java
@@ -192,8 +192,14 @@ public void maxDepthAndPath() throws Exception {
         assertTrue(ops.get("gc") instanceof Map);
         @SuppressWarnings("unchecked")
         Map<String, ?> attrs = (Map<String, ?>) res.get(ATTRIBUTES.getKey());
-        // Java 7 introduces a new attribute 'ObjectName' here
-        assertEquals(attrs.size(),attrs.containsKey("ObjectName") ? 5 : 4);
+        String vendor = System.getProperty("java.vendor");
+        if (vendor != null && vendor.toUpperCase().contains("IBM")) {
+            // let's be flexible here... number differs between 11 and 17
+            assertTrue(attrs.size() > 20);
+        } else {
+            // Java 7 introduces a new attribute 'ObjectName' here
+            assertEquals(attrs.size(), attrs.containsKey("ObjectName") ? 5 : 4);
+        }
         assertTrue(attrs.get("HeapMemoryUsage") instanceof Map);
         assertTrue(res.get(DESCRIPTION.getKey()) instanceof String);