test/jdk/java/lang/String/UnicodeCasingTest.java

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

*** 1,7 ****
  /*
!  * Copyright (c) 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) 2018, 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
*** 23,34 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 4397357 6565620 6959267 7070436 7198195 8032446 8072600
   * @summary Confirm normal case mappings are handled correctly.
   * @run main/timeout=200 UnicodeCasingTest
   */
  
  import java.io.BufferedReader;
  import java.io.IOException;
--- 23,35 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 4397357 6565620 6959267 7070436 7198195 8032446 8072600 8221431
   * @summary Confirm normal case mappings are handled correctly.
+  * @library /lib/testlibrary/java/lang
   * @run main/timeout=200 UnicodeCasingTest
   */
  
  import java.io.BufferedReader;
  import java.io.IOException;
*** 68,79 ****
          BufferedReader in = null;
          try {
              // First, we create exlude lists of characters whose mappings exist
              // in SpecialCasing.txt and mapping rules in UnicodeData.txt aren't
              // applicable.
!             in = Files.newBufferedReader(Paths.get(System.getProperty("test.src.path"), "..", "/Character/SpecialCasing.txt")
!                      .toRealPath());
              String line;
              while ((line = in.readLine()) != null) {
                  if (line.length() == 0 || line.charAt(0) == '#') {
                      continue;
                  }
--- 69,79 ----
          BufferedReader in = null;
          try {
              // First, we create exlude lists of characters whose mappings exist
              // in SpecialCasing.txt and mapping rules in UnicodeData.txt aren't
              // applicable.
!             in = Files.newBufferedReader(UCDFiles.SPECIAL_CASING.toRealPath());
              String line;
              while ((line = in.readLine()) != null) {
                  if (line.length() == 0 || line.charAt(0) == '#') {
                      continue;
                  }
*** 86,97 ****
                  Locale locale = locales.get(l);
                  Locale.setDefault(locale);
                  defaultLang = locale.getLanguage();
  //                System.out.println("Testing on " + locale + " locale....");
                  System.err.println("Testing on " + locale + " locale....");
!                 in = Files.newBufferedReader(Paths.get(System.getProperty("test.src.path"), "..", "/Character/UnicodeData.txt")
!                      .toRealPath());
                  while ((line = in.readLine()) != null) {
                      if (line.length() == 0 || line.charAt(0) == '#') {
                          continue;
                      }
                      test(line);
--- 86,96 ----
                  Locale locale = locales.get(l);
                  Locale.setDefault(locale);
                  defaultLang = locale.getLanguage();
  //                System.out.println("Testing on " + locale + " locale....");
                  System.err.println("Testing on " + locale + " locale....");
!                 in = Files.newBufferedReader(UCDFiles.UNICODE_DATA.toRealPath());
                  while ((line = in.readLine()) != null) {
                      if (line.length() == 0 || line.charAt(0) == '#') {
                          continue;
                      }
                      test(line);