test/jdk/java/text/Normalizer/ConformanceTest.java

rev 57619 : [mq]: 8174270

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * 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,30 +20,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 /*
  * @test
- * @bug  4221795 6565620 6959267 7070436 7198195 8032446 8221431
+ * @bug  4221795 6565620 6959267 7070436 7198195 8032446 8174270 8221431
  * @summary Confirm Normalizer's fundamental behavior
  * @library /lib/testlibrary/java/lang
- * @modules java.base/sun.text java.base/sun.text.normalizer
+ * @modules java.base/sun.text java.base/jdk.internal.icu.text
  * @compile -XDignore.symbol.file ConformanceTest.java
  * @run main/timeout=3000 ConformanceTest
  */
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetDecoder;
 import java.util.BitSet;
 import java.util.StringTokenizer;
 
-import sun.text.normalizer.NormalizerBase;
-import sun.text.normalizer.NormalizerImpl;
+import jdk.internal.icu.text.NormalizerBase;
 
 /*
  * Conformance test for java.text.Normalizer and sun.text.Normalizer.
  */
 public class ConformanceTest {