test/java/lang/management/MemoryMXBean/MemoryTest.java

rev 7572 : 8010734: NPG: The test MemoryTest.java needs to be updated to support metaspace

*** 57,78 ****
      // Number of memory managers = 3
      // They are: Copy/Scavenger + MSC + CodeCache manager
      // (or equivalent for other collectors)
      // Number of GC memory managers = 2
  
!     // Hotspot VM 1.8+ after perm gen removal is expected to have only
!     // one non-heap memory pool
!     private static int[] expectedMinNumPools = {3, 1};
!     private static int[] expectedMaxNumPools = {3, 1};
      private static int expectedNumGCMgrs = 2;
!     private static int expectedNumMgrs = expectedNumGCMgrs + 1;
      private static String[] types = { "heap", "non-heap" };
  
      public static void main(String args[]) throws Exception {
          Integer value = new Integer(args[0]);
          expectedNumGCMgrs = value.intValue();
!         expectedNumMgrs = expectedNumGCMgrs + 1;
  
          checkMemoryPools();
          checkMemoryManagers();
          if (testFailed)
              throw new RuntimeException("TEST FAILED.");
--- 57,81 ----
      // Number of memory managers = 3
      // They are: Copy/Scavenger + MSC + CodeCache manager
      // (or equivalent for other collectors)
      // Number of GC memory managers = 2
  
!     // Hotspot VM 1.8+ after perm gen removal is expected to have two or
!     // three non-heap memory pools:
!     // - Code cache
!     // - Metaspace
!     // - Compressed Class Space (if compressed class pointers are used)
!     private static int[] expectedMinNumPools = {3, 2};
!     private static int[] expectedMaxNumPools = {3, 3};
      private static int expectedNumGCMgrs = 2;
!     private static int expectedNumMgrs = expectedNumGCMgrs + 2;
      private static String[] types = { "heap", "non-heap" };
  
      public static void main(String args[]) throws Exception {
          Integer value = new Integer(args[0]);
          expectedNumGCMgrs = value.intValue();
!         expectedNumMgrs = expectedNumGCMgrs + 2;
  
          checkMemoryPools();
          checkMemoryManagers();
          if (testFailed)
              throw new RuntimeException("TEST FAILED.");