changeset 17553:d55a21a736b7

8164859: Fix module dependences in java/text tests Reviewed-by: naoto
author shurailine
date Tue, 30 Aug 2016 14:30:32 -0700
parents 556549260289
children ea6b16200114
files test/java/text/Bidi/BidiConformance.java test/java/text/Bidi/BidiEmbeddingTest.java test/java/text/Bidi/Bug7042148.java test/java/text/Bidi/Bug7051769.java test/java/text/BreakIterator/NewVSOld_th_TH.java test/java/text/Collator/APITest.java test/java/text/Collator/CollationKeyTest.java test/java/text/Collator/DanishTest.java test/java/text/Collator/FinnishTest.java test/java/text/Collator/FrenchTest.java test/java/text/Collator/G7Test.java test/java/text/Collator/JapaneseTest.java test/java/text/Collator/KoreanTest.java test/java/text/Collator/Regression.java test/java/text/Collator/ThaiTest.java test/java/text/Collator/TurkishTest.java test/java/text/Collator/VietnameseTest.java test/java/text/Format/DateFormat/Bug4823811.java test/java/text/Format/DateFormat/Bug6683975.java test/java/text/Format/DateFormat/Bug8139572.java test/java/text/Format/DateFormat/ContextMonthNamesTest.java test/java/text/Format/DateFormat/DateFormatTest.java test/java/text/Format/DateFormat/LocaleDateFormats.java test/java/text/Format/DateFormat/NonGregorianFormatTest.java test/java/text/Format/DateFormat/bug4117335.java test/java/text/Format/MessageFormat/LargeMessageFormat.java test/java/text/Format/NumberFormat/Bug8132125.java test/java/text/Format/NumberFormat/CurrencyFormat.java test/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java test/java/text/Format/NumberFormat/NumberRegression.java test/java/text/Format/NumberFormat/NumberTest.java
diffstat 31 files changed, 44 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/test/java/text/Bidi/BidiConformance.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Bidi/BidiConformance.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 6850113 8032446
  * @summary confirm the behavior of new Bidi implementation. (Backward compatibility)
+ * @modules java.desktop
  */
 
 import java.awt.font.NumericShaper;
--- a/test/java/text/Bidi/BidiEmbeddingTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Bidi/BidiEmbeddingTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -28,6 +28,7 @@
  * indicate overrides, rather than using bit 7.  Also tests Bidi without loading awt classes to
  * confirm that Bidi can be used without awt. Verify that embedding level 0 is properly mapped
  * to the base embedding level.
+ * @modules java.desktop
  */
 
 import java.awt.Color;
--- a/test/java/text/Bidi/Bug7042148.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Bidi/Bug7042148.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 7042148
  * @summary verify that Bidi.baseIsLeftToRight() returns the correct value even if an incorrect position is set in the given AttributedCharacterIterator.
+ * @modules java.desktop
  */
 import java.awt.font.*;
 import java.text.*;
--- a/test/java/text/Bidi/Bug7051769.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Bidi/Bug7051769.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -26,6 +26,7 @@
  * @bug 7051769 8038092
  * @summary verify that Bidi.toString() returns the corect result.
  *     The second run is intended to test lazy SharedSectets init for 8038092
+ * @modules java.desktop
  * @run main Bug7051769
  * @run main/othervm -DpreloadBidi=true Bug7051769
  */
--- a/test/java/text/BreakIterator/NewVSOld_th_TH.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/BreakIterator/NewVSOld_th_TH.java	Tue Aug 30 14:30:32 2016 -0700
@@ -22,9 +22,10 @@
  */
 
 /*
-    @test
-    @summary test Comparison of New Collators against Old Collators in the en_US locale
-*/
+ * @test
+ * @summary test Comparison of New Collators against Old Collators in the en_US locale
+ * @modules jdk.localedata
+ */
 
 import java.io.*;
 import java.util.Enumeration;
--- a/test/java/text/Collator/APITest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/APITest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test Collation API
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
--- a/test/java/text/Collator/CollationKeyTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/CollationKeyTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -29,6 +29,7 @@
  *          RuleBasedCollationKey. This test basically tests on the two features:
  *          1. Existing code using CollationKey works (backward compatiblility)
  *          2. CollationKey can be extended by its subclass.
+ * @modules jdk.localedata
  */
 
 
--- a/test/java/text/Collator/DanishTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/DanishTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -26,6 +26,7 @@
  * @bug 4930708 4174436 5008498
  * @library /java/text/testlib
  * @summary test Danish Collation
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
--- a/test/java/text/Collator/FinnishTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/FinnishTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test Finnish Collation
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
--- a/test/java/text/Collator/FrenchTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/FrenchTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test French Collation
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
--- a/test/java/text/Collator/G7Test.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/G7Test.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test G7 Collation
+ * @modules jdk.localedata
  */
 /*
  *
--- a/test/java/text/Collator/JapaneseTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/JapaneseTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test 1.1 02/09/11
  * @bug 4176141 4655819
  * @summary Regression tests for Japanese Collation
+ * @modules jdk.localedata
  */
 
 import java.text.*;
--- a/test/java/text/Collator/KoreanTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/KoreanTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test 1.1 02/09/12
  * @bug 4176141 4655819
  * @summary Regression tests for Korean Collation
+ * @modules jdk.localedata
  */
 
 import java.text.*;
--- a/test/java/text/Collator/Regression.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/Regression.java	Tue Aug 30 14:30:32 2016 -0700
@@ -29,6 +29,7 @@
  *      4133509 4139572 4141640 4179126 4179686 4244884 4663220
  * @library /java/text/testlib
  * @summary Regression tests for Collation and associated classes
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
--- a/test/java/text/Collator/ThaiTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/ThaiTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test Thai Collation
+ * @modules jdk.localedata
  */
 /*
  * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
--- a/test/java/text/Collator/TurkishTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/TurkishTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test Turkish Collation
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996 - All Rights Reserved
--- a/test/java/text/Collator/VietnameseTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Collator/VietnameseTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -26,6 +26,7 @@
  * @bug 4932968 5015215
  * @library /java/text/testlib
  * @summary test Vietnamese Collation
+ * @modules jdk.localedata
  */
 
 /*
--- a/test/java/text/Format/DateFormat/Bug4823811.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/Bug4823811.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 4823811 8008577
  * @summary Confirm that text which includes numbers with a trailing minus sign is parsed correctly.
+ * @modules jdk.localedata
  * @run main/othervm -Duser.timezone=GMT+09:00 -Djava.locale.providers=JRE,SPI Bug4823811
  */
 
--- a/test/java/text/Format/DateFormat/Bug6683975.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/Bug6683975.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 6683975 8008577
  * @summary Make sure that date is formatted correctlyin th locale.
+ * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6683975
  */
 import java.text.*;
--- a/test/java/text/Format/DateFormat/Bug8139572.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/Bug8139572.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -26,6 +26,7 @@
  * @bug 8139572
  * @summary SimpleDateFormat parse month stand-alone format bug
  * @compile -encoding utf-8 Bug8139572.java
+ * @modules jdk.localedata
  * @run main Bug8139572
  */
 import java.text.ParseException;
--- a/test/java/text/Format/DateFormat/ContextMonthNamesTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/ContextMonthNamesTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 7079560 8008577
  * @summary Unit test for context-sensitive month names
+ * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=JRE,SPI ContextMonthNamesTest
  */
 
--- a/test/java/text/Format/DateFormat/DateFormatTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/DateFormatTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -26,6 +26,7 @@
  * @bug 4052223 4089987 4469904 4326988 4486735 8008577 8045998 8140571
  * @summary test DateFormat and SimpleDateFormat.
  * @library /java/text/testlib
+ * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=COMPAT,SPI DateFormatTest
  */
 
--- a/test/java/text/Format/DateFormat/LocaleDateFormats.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/LocaleDateFormats.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -24,6 +24,7 @@
 /**
  * @test
  * @bug 8080774
+ * @modules jdk.localedata
  * @run testng/othervm -Djava.locale.providers=JRE,CLDR LocaleDateFormats
  * @summary This file contains tests for JRE locales date formats
  */
--- a/test/java/text/Format/DateFormat/NonGregorianFormatTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/NonGregorianFormatTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4833268 6253991 8008577
  * @summary Test formatting and parsing with non-Gregorian calendars
+ * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=COMPAT,SPI NonGregorianFormatTest
  */
 
--- a/test/java/text/Format/DateFormat/bug4117335.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/DateFormat/bug4117335.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  *
  * @bug 4117335 4432617
+ * @modules jdk.localedata
  */
 
 import java.text.DateFormatSymbols ;
--- a/test/java/text/Format/MessageFormat/LargeMessageFormat.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/MessageFormat/LargeMessageFormat.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4112090 8008577
  * @summary verify that MessageFormat can handle large numbers of arguments
+ * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=COMPAT,SPI LargeMessageFormat
  */
 
--- a/test/java/text/Format/NumberFormat/Bug8132125.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/NumberFormat/Bug8132125.java	Tue Aug 30 14:30:32 2016 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -25,6 +25,7 @@
  * @test
  * @bug 8132125
  * @summary Checks Swiss' number elements
+ * @modules jdk.localedata
  */
 
 import java.text.*;
--- a/test/java/text/Format/NumberFormat/CurrencyFormat.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/NumberFormat/CurrencyFormat.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @bug 4290801 4942982 5102005 8008577 8021121
  * @summary Basic tests for currency formatting.
+ * @modules jdk.localedata
  * @run main/othervm -Djava.locale.providers=JRE,SPI CurrencyFormat
  */
 
--- a/test/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/NumberFormat/IntlTestNumberFormatAPI.java	Tue Aug 30 14:30:32 2016 -0700
@@ -25,6 +25,7 @@
  * @test
  * @library /java/text/testlib
  * @summary test International Number Format API
+ * @modules jdk.localedata
  */
 /*
 (C) Copyright Taligent, Inc. 1996, 1997 - All Rights Reserved
--- a/test/java/text/Format/NumberFormat/NumberRegression.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/NumberFormat/NumberRegression.java	Tue Aug 30 14:30:32 2016 -0700
@@ -34,6 +34,7 @@
  * @library /java/text/testlib
  * @build IntlTest HexDumpReader TestUtils
  * @modules java.base/sun.util.resources
+ *          jdk.localedata
  * @compile -XDignore.symbol.file NumberRegression.java
  * @run main/othervm -Djava.locale.providers=COMPAT,SPI NumberRegression
  */
--- a/test/java/text/Format/NumberFormat/NumberTest.java	Tue Aug 30 15:31:46 2016 +0300
+++ b/test/java/text/Format/NumberFormat/NumberTest.java	Tue Aug 30 14:30:32 2016 -0700
@@ -27,6 +27,7 @@
  * @summary test NumberFormat
  * @library /java/text/testlib
  * @modules java.base/sun.util.resources
+ *          jdk.localedata
  * @compile -XDignore.symbol.file NumberTest.java
  * @run main/othervm -Djava.locale.providers=COMPAT,SPI NumberTest
  */