test/jdk/java/text/Normalizer/NormalizerAPITest.java

rev 57619 : [mq]: 8174270

*** 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2018, 2020, 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.
*** 21,33 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 4221795
   * @summary Confirm Normalizer's fundamental behavior
!  * @modules java.base/sun.text java.base/sun.text.normalizer
   * @library /java/text/testlib
   * @compile -XDignore.symbol.file NormalizerAPITest.java
   * @run main/timeout=30 NormalizerAPITest
   */
  
--- 21,33 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 4221795 8174270
   * @summary Confirm Normalizer's fundamental behavior
!  * @modules java.base/sun.text java.base/jdk.internal.icu.text
   * @library /java/text/testlib
   * @compile -XDignore.symbol.file NormalizerAPITest.java
   * @run main/timeout=30 NormalizerAPITest
   */
  
*** 62,73 ****
       * Option
       */
      static final int[] options = {
          0x00,
          sun.text.Normalizer.UNICODE_3_2,
!         sun.text.normalizer.NormalizerBase.UNICODE_3_2,
!         sun.text.normalizer.NormalizerBase.UNICODE_LATEST,
      };
  
      static final String nonNullStr = "testdata";
  
  
--- 62,73 ----
       * Option
       */
      static final int[] options = {
          0x00,
          sun.text.Normalizer.UNICODE_3_2,
!         jdk.internal.icu.text.NormalizerBase.UNICODE_3_2,
!         jdk.internal.icu.text.NormalizerBase.UNICODE_LATEST,
      };
  
      static final String nonNullStr = "testdata";
  
  
*** 317,338 ****
          if (!out.equals(expected.toString())) {
              errln("java.text.Normalizer.normalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
          out = sun.text.Normalizer.normalize(in, NFD,
!                              sun.text.normalizer.NormalizerBase.UNICODE_LATEST);
          if (!out.equals(expected.toString())) {
              errln("sun.text.Normalizer.normalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
  
          if (!Normalizer.isNormalized(expected, NFD)) {
              errln("java.text.Normalizer.isNormalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
          if (!sun.text.Normalizer.isNormalized(expected, NFD,
!                            sun.text.normalizer.NormalizerBase.UNICODE_LATEST)) {
              errln("sun.text.Normalizer.isNormalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
      }
  
--- 317,338 ----
          if (!out.equals(expected.toString())) {
              errln("java.text.Normalizer.normalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
          out = sun.text.Normalizer.normalize(in, NFD,
!                              jdk.internal.icu.text.NormalizerBase.UNICODE_LATEST);
          if (!out.equals(expected.toString())) {
              errln("sun.text.Normalizer.normalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
  
          if (!Normalizer.isNormalized(expected, NFD)) {
              errln("java.text.Normalizer.isNormalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
          if (!sun.text.Normalizer.isNormalized(expected, NFD,
!                            jdk.internal.icu.text.NormalizerBase.UNICODE_LATEST)) {
              errln("sun.text.Normalizer.isNormalize(" +
                    in.getClass().getSimpleName() + ") failed.");
          }
      }