test/runtime/6981737/Test6981737.java

*** 1,7 ****
  /*
!  * Copyright (c) 2010, 2015, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2010, 2017, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 36,46 ****
       * property.  Before jdk7, they should be "Sun Micro..." and "1.0".
       * In jdk7 onwards they should be "Oracle..." and "1.<major_version>"
       */
      public static void main(String[] args) throws Exception {
  
!         String version = verifyProperty("java.version", "[0-9]+[\\\\.[0-9]+]*\\-.*");
          String version_tokens[] = version.split("-|\\.");
          String major_version_spec = version_tokens[0];
          int major_version = new Integer(major_version_spec).intValue();
  
          String vendor_re = "Oracle Corporation";
--- 36,46 ----
       * property.  Before jdk7, they should be "Sun Micro..." and "1.0".
       * In jdk7 onwards they should be "Oracle..." and "1.<major_version>"
       */
      public static void main(String[] args) throws Exception {
  
!         String version = verifyVersion();
          String version_tokens[] = version.split("-|\\.");
          String major_version_spec = version_tokens[0];
          int major_version = new Integer(major_version_spec).intValue();
  
          String vendor_re = "Oracle Corporation";
*** 55,64 ****
--- 55,70 ----
          verifyProperty("java.specification.vendor", vendor_re);
          verifyProperty("java.vm.specification.version", vm_spec_version_re);
          System.out.println("PASS");
      }
  
+     public static String verifyVersion() {
+         String value = System.getProperty("java.version", "");
+         Runtime.Version.parse(value);
+         return value;
+     }
+ 
      public static String verifyProperty(String name, String expected_re) {
          String value = System.getProperty(name, "");
          System.out.print("Checking " + name + ": \"" + value +
            "\".matches(\"" + expected_re + "\")... ");
          if (!value.matches(expected_re)) {