rev 6090 : imported patch 8001205.8001562

          --- old/test/java/util/PluggableLocale/CollatorProviderTest.java
          +++ new/test/java/util/PluggableLocale/CollatorProviderTest.java

   1    1  /*
   2    2   * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
   3    3   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4    4   *
   5    5   * This code is free software; you can redistribute it and/or modify it
   6    6   * under the terms of the GNU General Public License version 2 only, as
   7    7   * published by the Free Software Foundation.
   8    8   *
   9    9   * This code is distributed in the hope that it will be useful, but WITHOUT
  10   10   * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  11   11   * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  12   12   * version 2 for more details (a copy is included in the LICENSE file that
  13   13   * accompanied this code).
  14   14   *
  15   15   * You should have received a copy of the GNU General Public License version
  16   16   * 2 along with this work; if not, write to the Free Software Foundation,
  17   17   * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  18   18   *
  19   19   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  20   20   * or visit www.oracle.com if you need additional information or have any
  21   21   * questions.
  22   22   */
  23   23  /*
  24   24   *
  25   25   */
  26   26  
  27   27  import java.text.*;
  28   28  import java.util.*;
  29   29  import sun.util.locale.provider.*;
  30   30  import sun.util.resources.*;
  31   31  
  32   32  public class CollatorProviderTest extends ProviderTest {
  33   33  
  34   34      com.foo.CollatorProviderImpl cp = new com.foo.CollatorProviderImpl();
  35   35      List<Locale> availloc = Arrays.asList(Collator.getAvailableLocales());
  36   36      List<Locale> providerloc = Arrays.asList(cp.getAvailableLocales());
  37   37      List<Locale> jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales());
  38   38      List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getCollatorProvider().getAvailableLocales());
  39   39  

  40   40      public static void main(String[] s) {
  41   41          new CollatorProviderTest();
  42   42      }
  43   43  
  44   44      CollatorProviderTest() {
  45   45          availableLocalesTest();
  46   46          objectValidityTest();
  47   47      }
  48   48  
  49   49      void availableLocalesTest() {
  50      -        Set<Locale> localesFromAPI = new HashSet<Locale>(availloc);
  51      -        Set<Locale> localesExpected = new HashSet<Locale>(jreimplloc);
  52      -        localesExpected.remove(Locale.ROOT);
       50 +        Set<Locale> localesFromAPI = new HashSet<>(availloc);
       51 +        Set<Locale> localesExpected = new HashSet<>(jreloc);
  53   52          localesExpected.addAll(providerloc);
  54   53          if (localesFromAPI.equals(localesExpected)) {
  55   54              System.out.println("availableLocalesTest passed.");
  56   55          } else {
  57   56              throw new RuntimeException("availableLocalesTest failed");
  58   57          }
  59   58      }
  60   59  
  61   60      void objectValidityTest() {
  62   61          Collator def = Collator.getInstance(new Locale(""));

  63   62          String defrules = ((RuleBasedCollator)def).getRules();
  64   63  
  65   64          for (Locale target: availloc) {
  66   65              // pure JRE implementation
  67   66              Set<Locale> jreimplloc = new HashSet<>();
  68   67              for (String tag : ((AvailableLanguageTags)LocaleProviderAdapter.forJRE().getCollatorProvider()).getAvailableLanguageTags()) {
  69   68                  jreimplloc.add(Locale.forLanguageTag(tag));
  70   69              }
  71   70              ResourceBundle rb = LocaleProviderAdapter.forJRE().getLocaleData().getCollationData(target);
  72   71              boolean jreSupportsLocale = jreimplloc.contains(target);
  73   72  
  74   73              // result object
  75   74              Collator result = Collator.getInstance(target);
  76   75  
  77   76              // provider's object (if any)
  78   77              Collator providersResult = null;
  79   78              if (providerloc.contains(target)) {
  80   79                  providersResult = cp.getInstance(target);
  81   80              }
  82   81  
  83   82              // JRE rule
  84   83              Collator jresResult = null;
  85   84              if (jreSupportsLocale) {
  86   85                  try {
  87   86                      String rules = rb.getString("Rule");
  88   87                      jresResult = new RuleBasedCollator(defrules+rules);
  89   88                      jresResult.setDecomposition(Collator.NO_DECOMPOSITION);
  90   89                  } catch (MissingResourceException mre) {
  91   90                  } catch (ParseException pe) {
  92   91                  }
  93   92              }
  94   93  
  95   94              checkValidity(target, jresResult, providersResult, result, jreSupportsLocale);
  96   95          }
  97   96      }
  98   97  }

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX