test/gc/arguments/TestMaxHeapSizeTools.java

*** 110,136 ****
--- 110,140 ----
      TestMaxHeapSizeTools.checkGenMaxHeapSize(gcflag, 4);
      TestMaxHeapSizeTools.checkGenMaxHeapSize(gcflag, 5);
    }
  
    private static void checkInvalidMinInitialHeapCombinations(String gcflag) throws Exception {
+     expectError(new String[] { gcflag, "-XX:InitialHeapSize=1023K", "-version" });
      expectError(new String[] { gcflag, "-Xms64M", "-XX:InitialHeapSize=32M", "-version" });
    }
  
    private static void checkValidMinInitialHeapCombinations(String gcflag) throws Exception {
+     expectValid(new String[] { gcflag, "-XX:InitialHeapSize=1024K", "-version" });
      expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms4M", "-version" });
      expectValid(new String[] { gcflag, "-Xms4M", "-XX:InitialHeapSize=8M", "-version" });
      expectValid(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-Xms8M", "-version" });
      // the following is not an error as -Xms sets both minimal and initial heap size
      expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-Xms8M", "-version" });
    }
  
    private static void checkInvalidInitialMaxHeapCombinations(String gcflag) throws Exception {
+     expectError(new String[] { gcflag, "-XX:MaxHeapSize=2047K", "-version" });
      expectError(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=8M", "-version" });
      expectError(new String[] { gcflag, "-XX:InitialHeapSize=8M", "-XX:MaxHeapSize=4M", "-version" });
    }
  
    private static void checkValidInitialMaxHeapCombinations(String gcflag) throws Exception {
+     expectValid(new String[] { gcflag, "-XX:MaxHeapSize=2048K", "-version" });
      expectValid(new String[] { gcflag, "-XX:InitialHeapSize=4M", "-XX:MaxHeapSize=8M", "-version" });
      expectValid(new String[] { gcflag, "-XX:MaxHeapSize=8M", "-XX:InitialHeapSize=4M", "-version" });
      expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=4M", "-version" });
      // a value of "0" for initial heap size means auto-detect
      expectValid(new String[] { gcflag, "-XX:MaxHeapSize=4M", "-XX:InitialHeapSize=0M", "-version" });