test/jdk/java/text/Normalizer/ThreadSafeTest.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,34 ****
   * questions.
   */
  
  /*
   * @test
!  * @bug 4221795 8032446
!  * @summary Confirm that java.text.Normalizer and sun.text.Normalize are
   * thread-safe.
!  * @modules java.base/sun.text java.base/sun.text.normalizer
   * @compile -XDignore.symbol.file ThreadSafeTest.java
   * @run main/othervm -esa ThreadSafeTest 5 10
   */
  
  // Usage: java ThreadSafeTest [threadsFactor [duration]]
--- 21,34 ----
   * questions.
   */
  
  /*
   * @test
!  * @bug 4221795 8032446 8174270
!  * @summary Confirm that java.text.Normalizer and sun.text.Normalizer are
   * thread-safe.
!  * @modules java.base/sun.text java.base/jdk.internal.icu.text
   * @compile -XDignore.symbol.file ThreadSafeTest.java
   * @run main/othervm -esa ThreadSafeTest 5 10
   */
  
  // Usage: java ThreadSafeTest [threadsFactor [duration]]
*** 113,123 ****
                  testJavaNormalize(0, java.text.Normalizer.Form.NFKC);
                  testSunNormalize(1, java.text.Normalizer.Form.NFC,
                                   sun.text.Normalizer.UNICODE_3_2);
                  testJavaNormalize(2, java.text.Normalizer.Form.NFKD);
                  testSunNormalize(3, java.text.Normalizer.Form.NFC,
!                             sun.text.normalizer.NormalizerBase.UNICODE_LATEST);
                  testJavaNormalize(4, java.text.Normalizer.Form.NFD);
  
                  testIsNormalized(0, java.text.Normalizer.Form.NFKC);
                  testIsNormalized(2, java.text.Normalizer.Form.NFKD);
                  testIsNormalized(4, java.text.Normalizer.Form.NFD);
--- 113,123 ----
                  testJavaNormalize(0, java.text.Normalizer.Form.NFKC);
                  testSunNormalize(1, java.text.Normalizer.Form.NFC,
                                   sun.text.Normalizer.UNICODE_3_2);
                  testJavaNormalize(2, java.text.Normalizer.Form.NFKD);
                  testSunNormalize(3, java.text.Normalizer.Form.NFC,
!                             jdk.internal.icu.text.NormalizerBase.UNICODE_LATEST);
                  testJavaNormalize(4, java.text.Normalizer.Form.NFD);
  
                  testIsNormalized(0, java.text.Normalizer.Form.NFKC);
                  testIsNormalized(2, java.text.Normalizer.Form.NFKD);
                  testIsNormalized(4, java.text.Normalizer.Form.NFD);