test/java/util/PluggableLocale/GenericTest.java

Print this page
rev 5696 : 6336885: RFE: Locale Data Deployment Enhancements
4609153: Provide locale data for Indic locales
5104387: Support for gl_ES locale (galician language)
6337471: desktop/system locale preferences support
7056139: (cal) SPI support for locale-dependent Calendar parameters
7058206: Provide CalendarData SPI for week params and display field value names
7073852: Support multiple scripts for digits and decimal symbols per locale
7079560: [Fmt-Da] Context dependent month names support in SimpleDateFormat
7171324: getAvailableLocales() of locale sensitive services should return the actual availability of locales
7151414: (cal) Support calendar type identification
7168528: LocaleServiceProvider needs to be aware of Locale extensions
7171372: (cal) locale's default Calendar should be created if unknown calendar is specified
Summary: JEP 127: Improve Locale Data Packaging and Adopt Unicode CLDR Data (part 1 w/o packaging changes. by Naoto Sato and Masayoshi Okutsu)

*** 1,7 **** /* ! * Copyright (c) 2007, 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) 2007, 2012, 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.
*** 24,34 **** * */ import java.text.*; import java.util.*; ! import sun.util.resources.*; public class GenericTest { // test providers com.foo.BreakIteratorProviderImpl breakIP = new com.foo.BreakIteratorProviderImpl(); --- 24,34 ---- * */ import java.text.*; import java.util.*; ! import sun.util.locale.provider.*; public class GenericTest { // test providers com.foo.BreakIteratorProviderImpl breakIP = new com.foo.BreakIteratorProviderImpl();
*** 38,47 **** --- 38,48 ---- com.foo.DecimalFormatSymbolsProviderImpl decimalFSP = new com.foo.DecimalFormatSymbolsProviderImpl(); com.foo.NumberFormatProviderImpl numberFP = new com.foo.NumberFormatProviderImpl(); com.bar.CurrencyNameProviderImpl currencyNP = new com.bar.CurrencyNameProviderImpl(); com.bar.LocaleNameProviderImpl localeNP = new com.bar.LocaleNameProviderImpl(); com.bar.TimeZoneNameProviderImpl tzNP = new com.bar.TimeZoneNameProviderImpl(); + com.bar.CalendarDataProviderImpl calDataP = new com.bar.CalendarDataProviderImpl(); public static void main(String[] s) { new GenericTest(); }
*** 55,78 **** */ void availableLocalesTest() { // Check that Locale.getAvailableLocales() returns the union of the JRE supported // locales and providers' locales HashSet<Locale> result = ! new HashSet<Locale>(Arrays.asList(Locale.getAvailableLocales())); HashSet<Locale> expected = ! new HashSet<Locale>(Arrays.asList(LocaleData.getAvailableLocales())); expected.addAll(Arrays.asList(breakIP.getAvailableLocales())); expected.addAll(Arrays.asList(collatorP.getAvailableLocales())); expected.addAll(Arrays.asList(dateFP.getAvailableLocales())); expected.addAll(Arrays.asList(dateFSP.getAvailableLocales())); expected.addAll(Arrays.asList(decimalFSP.getAvailableLocales())); expected.addAll(Arrays.asList(numberFP.getAvailableLocales())); expected.addAll(Arrays.asList(currencyNP.getAvailableLocales())); expected.addAll(Arrays.asList(localeNP.getAvailableLocales())); expected.addAll(Arrays.asList(tzNP.getAvailableLocales())); if (!result.equals(expected)) { ! throw new RuntimeException("Locale.getAvailableLocales() does not return the union of locales"); } } /** * test with "xx_YY_ZZ", which is an example locale not contained --- 56,82 ---- */ void availableLocalesTest() { // Check that Locale.getAvailableLocales() returns the union of the JRE supported // locales and providers' locales HashSet<Locale> result = ! new HashSet<>(Arrays.asList(Locale.getAvailableLocales())); HashSet<Locale> expected = ! new HashSet<>(Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales())); expected.addAll(Arrays.asList(breakIP.getAvailableLocales())); expected.addAll(Arrays.asList(collatorP.getAvailableLocales())); expected.addAll(Arrays.asList(dateFP.getAvailableLocales())); expected.addAll(Arrays.asList(dateFSP.getAvailableLocales())); expected.addAll(Arrays.asList(decimalFSP.getAvailableLocales())); expected.addAll(Arrays.asList(numberFP.getAvailableLocales())); expected.addAll(Arrays.asList(currencyNP.getAvailableLocales())); expected.addAll(Arrays.asList(localeNP.getAvailableLocales())); expected.addAll(Arrays.asList(tzNP.getAvailableLocales())); + expected.addAll(Arrays.asList(calDataP.getAvailableLocales())); + expected.remove(Locale.ROOT); if (!result.equals(expected)) { ! throw new RuntimeException("Locale.getAvailableLocales() does not return the union of locales: diff=" ! + getDiff(result, expected)); } } /** * test with "xx_YY_ZZ", which is an example locale not contained
*** 87,92 **** --- 91,106 ---- String expected = localeNP.getDisplayLanguage(xx.getLanguage(), dispLocale); if (!xxname.equals(expected)) { throw new RuntimeException("Locale fallback did not perform correctly. got: "+xxname+" expected: "+expected); } } + + private static String getDiff(Set set1, Set set2) { + Set s1 = (Set)((HashSet)set1).clone(); + s1.removeAll(set2); + + Set s2 = (Set)((HashSet)set2).clone(); + s2.removeAll(set1); + s2.addAll(s1); + return s2.toString(); + } }