rev 5856 : [mq]: 7196799

          --- old/test/java/util/Locale/LocaleProviders.java
          +++ new/test/java/util/Locale/LocaleProviders.java

   1    1  /*
   2    2   * Copyright (c) 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  import java.text.spi.DateFormatProvider;
  24   24  import java.util.Locale;
  25   25  import sun.util.locale.provider.LocaleProviderAdapter;
  26   26  
  27   27  public class LocaleProviders {
  28   28  
  29   29      public static void main(String[] args) {
  30      -        String expected = args[0];
  31      -        Locale testLocale = new Locale(args[1], args[2]);
  32      -        String preference = System.getProperty("java.locale.providers", "");
  33      -        LocaleProviderAdapter lda = LocaleProviderAdapter.getAdapter(DateFormatProvider.class, testLocale);
  34      -        LocaleProviderAdapter.Type type = lda.getAdapterType();
  35      -        System.out.printf("testLocale: %s, got: %s, expected: %s\n", testLocale, type, expected);
  36      -        if (!type.toString().equals(expected)) {
  37      -            throw new RuntimeException("Returned locale data adapter is not correct.");
       30 +        if (args.length == 0) {
       31 +            // no args indicates that the caller is asking the platform default locale.
       32 +            Locale defloc = Locale.getDefault();
       33 +            System.out.printf("%s,%s\n", defloc.getLanguage(), defloc.getCountry());
       34 +        } else {
       35 +            String expected = args[0];
       36 +            Locale testLocale = new Locale(args[1], (args.length >= 3 ? args[2] : ""));
       37 +            String preference = System.getProperty("java.locale.providers", "");
       38 +            LocaleProviderAdapter lda = LocaleProviderAdapter.getAdapter(DateFormatProvider.class, testLocale);
       39 +            LocaleProviderAdapter.Type type = lda.getAdapterType();
       40 +            System.out.printf("testLocale: %s, got: %s, expected: %s\n", testLocale, type, expected);
       41 +            if (!type.toString().equals(expected)) {
       42 +                throw new RuntimeException("Returned locale data adapter is not correct.");
       43 +            }
  38   44          }
  39   45      }
  40   46  }
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX