Mercurial Mercurial > jdk-sandbox / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java
changeset 38112 7babe39983c0
parent 36851 03e2f4d0a421
child 40631 ed82623d7831 
--- a/hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java	Thu Apr 28 09:10:10 2016 +0000
+++ b/hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java	Thu Apr 28 13:44:36 2016 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -57,33 +57,34 @@
 
         /*
          * example output:
-         *   num     #instances         #bytes  class name
-         *  ----------------------------------------------
-         *     1:          1647        1133752  [B
-         *     2:          6198         383168  [C
-         *     3:          1464         165744  java.lang.Class
-         *     4:          6151         147624  java.lang.String
-         *     5:          2304          73728  java.util.concurrent.ConcurrentHashMap$Node
-         *     6:          1199          64280  [Ljava.lang.Object;
+         *  num     #instances         #bytes  class name (module)
+         * -------------------------------------------------------
+         *    1:          7991         757792  [B (java.base@9-internal)
+         *    2:          1811         217872  java.lang.Class (java.base@9-internal)
+         *    3:          6724         215168  java.util.HashMap$Node (java.base@9-internal)
+         *    4:          7852         188448  java.lang.String (java.base@9-internal)
+         *    5:          1378         105040  [Ljava.util.HashMap$Node; (java.base@9-internal)
+         *    6:          1863          95096  [Ljava.lang.Object; (java.base@9-internal)
+
          * ...
          */
 
         /* Require at least one java.lang.Class */
-        output.shouldMatch("^\\s+\\d+:\\s+\\d+\\s+\\d+\\s+java.lang.Class\\s*$");
+        output.shouldMatch("^\\s+\\d+:\\s+\\d+\\s+\\d+\\s+java.lang.Class \\(java.base@\\S*\\)\\s*$");
 
         /* Require at least one java.lang.String */
-        output.shouldMatch("^\\s+\\d+:\\s+\\d+\\s+\\d+\\s+java.lang.String\\s*$");
+        output.shouldMatch("^\\s+\\d+:\\s+\\d+\\s+\\d+\\s+java.lang.String \\(java.base@\\S*\\)\\s*$");
 
         /* Require at least one java.lang.Object */
-        output.shouldMatch("^\\s+\\d+:\\s+\\d+\\s+\\d+\\s+java.lang.Object\\s*$");
+        output.shouldMatch("^\\s+\\d+:\\s+\\d+\\s+\\d+\\s+java.lang.Object \\(java.base@\\S*\\)\\s*$");
 
         /* Require at exactly one TestClass[] */
         output.shouldMatch("^\\s+\\d+:\\s+1\\s+\\d+\\s+" +
-                Pattern.quote(TestClass[].class.getName()) + "\\s*$");
+            Pattern.quote(TestClass[].class.getName()) + "\\s*$");
 
         /* Require at exactly 1024 TestClass */
         output.shouldMatch("^\\s+\\d+:\\s+1024\\s+\\d+\\s+" +
-                Pattern.quote(TestClass.class.getName()) + "\\s*$");
+            Pattern.quote(TestClass.class.getName()) + "\\s*$");
     }
 
     @Test
jdk-sandbox