test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java

*** 23,32 ****
--- 23,36 ----
  
  /*
   * @test
   * @summary Test VM Options with ranges
   * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
+  * @modules java.base/sun.misc
+  *          java.management
+  *          jdk.attach
+  *          jdk.management/sun.tools.attach
   * @run main/othervm/timeout=600 TestOptionsWithRanges
   */
  
  import java.util.ArrayList;
  import java.util.List;
*** 35,89 ****
  import optionsvalidation.JVMOption;
  import optionsvalidation.JVMOptionsUtils;
  
  public class TestOptionsWithRanges {
  
-     static List<JVMOption> optionsToTest = new ArrayList<>();
-     static Map<String, JVMOption> allOptionsAsMap;
- 
-     private static void addOptionToTest(String name) {
-         JVMOption toAdd = allOptionsAsMap.get(name);
-         if (toAdd != null) {
-             optionsToTest.add(toAdd);
-         } else {
-             System.out.println("Option with name \"" + name + "\" not found in "+
-                     "the list of options with ranges. Thus not test this option.");
-         }
-     }
- 
      public static void main(String[] args) throws Exception {
          int failedTests;
          
!         allOptionsAsMap = JVMOptionsUtils.getOptionsWithRangeAsMap();
  
!         /* Add several intx options to test */
!         addOptionToTest("AllocatePrefetchStyle");
!         addOptionToTest("CMSInitiatingOccupancyFraction");
!         addOptionToTest("CMSTriggerInterval");
!         addOptionToTest("PerBytecodeRecompilationCutoff");
!         addOptionToTest("G1RefProcDrainInterval");
!         addOptionToTest("BlockLayoutMinDiamondPercentage");
!         addOptionToTest("ValueMapInitialSize");
!         /* Add several uintx options to test */
!         addOptionToTest("StringDeduplicationAgeThreshold");       
!         addOptionToTest("AdaptiveSizeDecrementScaleFactor");  
!         addOptionToTest("CMSPrecleanNumerator");
!         addOptionToTest("IncreaseFirstTierCompileThresholdAt");
!         /* Add several size_t options to test */
!         addOptionToTest("CompressedClassSpaceSize");
!         addOptionToTest("HeapSizePerGCThread");
!         addOptionToTest("G1ConcRSLogCacheSize");
!         /* Add double option to test */
!         addOptionToTest("G1ConcMarkStepDurationMillis");
!         /* Add uint64_t option to test */
!         addOptionToTest("MaxRAM");
  
!         Asserts.assertGT(optionsToTest.size(), 0, "Options with ranges not found!");
  
!         System.out.println("Test " + optionsToTest.size() + " options with ranges. Start test!");
  
!         failedTests = JVMOptionsUtils.runCommandLineTests(optionsToTest);
  
          Asserts.assertEQ(failedTests, 0,
                  String.format("%d tests failed! %s", failedTests, JVMOptionsUtils.getMessageWithFailures()));
      }
  }
--- 39,65 ----
  import optionsvalidation.JVMOption;
  import optionsvalidation.JVMOptionsUtils;
  
  public class TestOptionsWithRanges {
  
      public static void main(String[] args) throws Exception {
          int failedTests;
+         Map<String, JVMOption> allOptionsAsMap = JVMOptionsUtils.getOptionsWithRangeAsMap();
+         List<JVMOption> allOptions;
  
!         /*
!          * Remove CICompilerCount from testing because currently it can hang system
!          */
!         allOptionsAsMap.remove("CICompilerCount");
  
!         allOptions = new ArrayList<>(allOptionsAsMap.values());
  
!         Asserts.assertGT(allOptions.size(), 0, "Options with ranges not found!");
  
!         System.out.println("Parsed " + allOptions.size() + " options with ranges. Start test!");
  
!         failedTests = JVMOptionsUtils.runCommandLineTests(allOptions);
  
          Asserts.assertEQ(failedTests, 0,
                  String.format("%d tests failed! %s", failedTests, JVMOptionsUtils.getMessageWithFailures()));
      }
  }