test/jdk/java/lang/Character/UnicodeBlock/CheckBlocks.java

rev 54996 : 8221431: Support for Unicode 12.1
Reviewed-by:

*** 1,7 ****
  /*
!  * Copyright (c) 2007, 2018, 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.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2007, 2019, 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.  Oracle designates this
*** 24,34 ****
   */
  
  /*
   * @test
   * @bug 4830803 4886934 6565620 6959267 7070436 7198195 8032446 8072600 8202771
!  * @summary  Check that the UnicodeBlock forName() method works as expected and block ranges are correct for all Unicode characters.
   * @run main CheckBlocks
   * @author John O'Conner
   */
  
  import java.lang.Character.UnicodeBlock;
--- 24,37 ----
   */
  
  /*
   * @test
   * @bug 4830803 4886934 6565620 6959267 7070436 7198195 8032446 8072600 8202771
!  *      8221431
!  * @summary  Check that the UnicodeBlock forName() method works as expected
!  *      and block ranges are correct for all Unicode characters.
!  * @library /lib/testlibrary/java/lang
   * @run main CheckBlocks
   * @author John O'Conner
   */
  
  import java.lang.Character.UnicodeBlock;
*** 274,285 ****
  
      // List of all Unicode blocks, their start, and end codepoints.
      public static HashSet<Block> blocks = new HashSet<>();
  
      private static void generateBlockList() throws Exception {
!         File blockData = new File(System.getProperty("test.src", "."),
!                 "Blocks.txt");
          try (BufferedReader f = new BufferedReader(new FileReader(blockData))) {
              String line;
              while ((line = f.readLine()) != null) {
                  if (line.length() == 0 || line.charAt(0) == '#') {
                      continue;
--- 277,287 ----
  
      // List of all Unicode blocks, their start, and end codepoints.
      public static HashSet<Block> blocks = new HashSet<>();
  
      private static void generateBlockList() throws Exception {
!         File blockData = UCDFiles.BLOCKS.toFile();
          try (BufferedReader f = new BufferedReader(new FileReader(blockData))) {
              String line;
              while ((line = f.readLine()) != null) {
                  if (line.length() == 0 || line.charAt(0) == '#') {
                      continue;