test/java/util/PluggableLocale/BreakIteratorProviderTest.java

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 +1,7 @@
 /*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * 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.

@@ -25,19 +25,20 @@
  */
 
 import java.text.*;
 import java.util.*;
 import sun.text.resources.*;
-import sun.util.*;
+import sun.util.locale.provider.*;
 import sun.util.resources.*;
 
 public class BreakIteratorProviderTest extends ProviderTest {
 
     com.foo.BreakIteratorProviderImpl bip = new com.foo.BreakIteratorProviderImpl();
     List<Locale> availloc = Arrays.asList(BreakIterator.getAvailableLocales());
     List<Locale> providerloc = Arrays.asList(bip.getAvailableLocales());
-    List<Locale> jreloc = Arrays.asList(LocaleData.getAvailableLocales());
+    List<Locale> jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales());
+    List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getBreakIteratorProvider().getAvailableLocales());
 
     private static final int CHARACTER_INDEX = 0;
     private static final int WORD_INDEX = 1;
     private static final int LINE_INDEX = 2;
     private static final int SENTENCE_INDEX = 3;

@@ -51,11 +52,12 @@
         objectValidityTest();
     }
 
     void availableLocalesTest() {
         Set<Locale> localesFromAPI = new HashSet<Locale>(availloc);
-        Set<Locale> localesExpected = new HashSet<Locale>(jreloc);
+        Set<Locale> localesExpected = new HashSet<Locale>(jreimplloc);
+        localesExpected.remove(Locale.ROOT);
         localesExpected.addAll(providerloc);
         if (localesFromAPI.equals(localesExpected)) {
             System.out.println("availableLocalesTest passed.");
         } else {
             throw new RuntimeException("availableLocalesTest failed");

@@ -64,14 +66,14 @@
 
     void objectValidityTest() {
 
         for (Locale target: availloc) {
             // pure JRE implementation
-            ResourceBundle rb = ResourceBundle.getBundle(
+            ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getBundle(
                         "sun.text.resources.BreakIteratorInfo", target);
             String[] classNames = rb.getStringArray("BreakIteratorClasses");
-            boolean jreSupportsLocale = jreloc.contains(target);
+            boolean jreSupportsLocale = jreimplloc.contains(target);
 
             // result object
             String[] result = new String[4];
             result[0] = BreakIterator.getCharacterInstance(target).getClass().getName();
             result[1] = BreakIterator.getWordInstance(target).getClass().getName();

@@ -89,11 +91,11 @@
 
             // JRE
             String[] jresResult = new String[4];
             if (jreSupportsLocale) {
                 for (int i = 0; i < 4; i++) {
-                    jresResult[i] = "java.text."+classNames[i];
+                    jresResult[i] = "sun.util.locale.provider."+classNames[i];
                 }
             }
 
             for (int i = 0; i < 4; i++) {
                 checkValidity(target, jresResult[i], providersResult[i], result[i], jreSupportsLocale);