test/jdk/java/text/Normalizer/ICUBasicTest.java

rev 57619 : [mq]: 8174270

*** 1,7 ****
  /*
!  * Copyright (c) 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2019, 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.
*** 20,33 ****
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  /*
   * @test
!  * @bug  4221795 8032446
   * @summary Confirm Normalizer's fundamental behavior. Imported from ICU4J 3.2's
   * src/com/ibm/icu/dev/test and modified.
!  * @modules java.base/sun.text java.base/sun.text.normalizer
   * @library /java/text/testlib
   * @compile -XDignore.symbol.file ICUBasicTest.java
   * @run main/timeout=30 ICUBasicTest
   */
  
--- 20,33 ----
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  /*
   * @test
!  * @bug  4221795 8032446 8174270
   * @summary Confirm Normalizer's fundamental behavior. Imported from ICU4J 3.2's
   * src/com/ibm/icu/dev/test and modified.
!  * @modules java.base/sun.text java.base/jdk.internal.icu.text
   * @library /java/text/testlib
   * @compile -XDignore.symbol.file ICUBasicTest.java
   * @run main/timeout=30 ICUBasicTest
   */
  
*** 37,51 ****
   * others. All Rights Reserved.                                                *
   *******************************************************************************
   */
  
  import sun.text.Normalizer;
! import sun.text.normalizer.NormalizerBase;
! import sun.text.normalizer.NormalizerImpl;
  
  import static java.text.Normalizer.Form.*;
- import static sun.text.normalizer.NormalizerBase.Mode.*;
  
  public class ICUBasicTest extends IntlTest {
  
      public static void main(String[] args) throws Exception {
          new ICUBasicTest().run(args);
--- 37,49 ----
   * others. All Rights Reserved.                                                *
   *******************************************************************************
   */
  
  import sun.text.Normalizer;
! import jdk.internal.icu.text.NormalizerBase;
  
  import static java.text.Normalizer.Form.*;
  
  public class ICUBasicTest extends IntlTest {
  
      public static void main(String[] args) throws Exception {
          new ICUBasicTest().run(args);