Increased memory to 4G for the test and add diagnostic info for OOME

Author: RogerRiggs

src/java.base/share/classes/java/util/HexFormat.java

@@ -474,7 +474,7 @@ private String formatOptDelimiter(byte[] bytes, int fromIndex, int toIndex) {
     private static int checkMaxArraySize(long length) {
         if (length > Integer.MAX_VALUE)
             throw new OutOfMemoryError("String size " + length +
-                    " exceeds maximum " + (Integer.MAX_VALUE));
+                    " exceeds maximum " + Integer.MAX_VALUE);
         return (int)length;
     }
 

test/jdk/java/util/HexFormat/HexFormatTest.java

@@ -42,7 +42,7 @@
 /*
  * @test
  * @summary Check HexFormat formatting and parsing
- * @run testng/othervm HexFormatTest
+ * @run testng/othervm -Xmx4G HexFormatTest
  */
 
 @Test
@@ -633,11 +633,21 @@ static void testOOME(String delimiter, String prefix, String suffix, boolean upp
         long remainder = max - ((len - 1) * stride);
         if (remainder > valueChars) {
             len++;
+            remainder -= valueChars;
         }
-        byte[] bytes = new byte[(int)len];
-        Throwable ex = expectThrows(OutOfMemoryError.class,
-                () -> hex.formatHex(bytes));
-        System.out.println("ex: " + ex);
+        try {
+            byte[] bytes = new byte[(int) len];
+            Throwable ex = expectThrows(OutOfMemoryError.class,
+                    () -> hex.formatHex(bytes));
+            System.out.println("ex: " + ex);
+        } catch (OutOfMemoryError oome) {
+            System.out.printf("OOME: total mem: %08x, free mem: %08x, max mem: %08x%n",
+                    Runtime.getRuntime().totalMemory(),
+                    Runtime.getRuntime().freeMemory(),
+                    Runtime.getRuntime().maxMemory());
+            throw oome;
+        }
+
     }
 
     /**