More java7 test adjustments

jolokia · Feb 14, 2020 · be351bc · be351bc
1 parent 43d68aa
commit be351bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/client/java/src/main/java/org/jolokia/client/ToOpenTypeConverter.java b/client/java/src/main/java/org/jolokia/client/ToOpenTypeConverter.java
@@ -168,6 +168,11 @@ private static String detectTypeName(final String name) {
       OVERRIDDEN_COMPLEX_TYPES.put(
           "java.lang:type=MemoryPool,name=PS Perm Gen.CollectionUsage",
           "java.lang.management.MemoryUsage");
+      OVERRIDDEN_COMPLEX_TYPES.put(
+              "java.lang:type=MemoryPool,name=PS Perm Gen.PeakUsage",
+              "java.lang.management.MemoryUsage");
+
+
     }
     final String overridden = OVERRIDDEN_COMPLEX_TYPES.get(name);
     return overridden != null ? overridden : "complex";

diff --git a/client/java/src/test/java/org/jolokia/client/JmxBridgeTest.java b/client/java/src/test/java/org/jolokia/client/JmxBridgeTest.java
@@ -447,13 +447,14 @@ public void testOverallOperations() throws IOException {
         nativeServer.getMBeanCount(),
         "Number of MBeans are the same");
 
+    final String[] jolokiaDomains = this.adapter.getDomains();
+    Arrays.sort(jolokiaDomains)
+    String[] nativeDomains = nativeServer.getDomains();
+    Arrays.sort(nativeDomains);
     Assert.assertEquals(
-        this.adapter.getDomains(),
-        nativeServer.getDomains(),
-        "Domain list is the same actual: "
-            + Arrays.toString(this.adapter.getDomains())
-            + " expected: "
-            + Arrays.toString(nativeServer.getDomains()));
+            jolokiaDomains,
+            nativeDomains,
+        "Domain list is the same");
 
     Assert.assertEquals(
         this.adapter.getDefaultDomain(), nativeServer.getDefaultDomain(), "Default domain");