test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 2007, 2013, 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, 2018, 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.
*** 18,35 ****
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
  /*
!  *
   */
  
! import java.text.*;
! import java.util.*;
! import sun.util.locale.provider.*;
! import sun.util.resources.*;
  
  public class LocaleNameProviderTest extends ProviderTest {
  
      public static void main(String[] s) {
          new LocaleNameProviderTest();
--- 18,51 ----
   *
   * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
   * or visit www.oracle.com if you need additional information or have any
   * questions.
   */
+ 
  /*
!  * @test
!  * @bug 4052440 8000273 8062588 8210406
!  * @summary LocaleNameProvider tests
!  * @library providersrc/foobarutils
!  *          providersrc/barprovider
!  * @modules java.base/sun.util.locale.provider
!  *          java.base/sun.util.resources
!  * @build com.foobar.Utils
!  *        com.bar.*
!  * @run main/othervm -Djava.locale.providers=JRE,SPI LocaleNameProviderTest
   */
  
! import java.util.Arrays;
! import java.util.List;
! import java.util.Locale;
! import java.util.MissingResourceException;
! 
! import com.bar.LocaleNameProviderImpl;
! 
! import sun.util.locale.provider.LocaleProviderAdapter;
! import sun.util.locale.provider.ResourceBundleBasedAdapter;
! import sun.util.resources.OpenListResourceBundle;
  
  public class LocaleNameProviderTest extends ProviderTest {
  
      public static void main(String[] s) {
          new LocaleNameProviderTest();
*** 39,49 ****
          checkAvailLocValidityTest();
          variantFallbackTest();
      }
  
      void checkAvailLocValidityTest() {
!         com.bar.LocaleNameProviderImpl lnp = new com.bar.LocaleNameProviderImpl();
          Locale[] availloc = Locale.getAvailableLocales();
          Locale[] testloc = availloc.clone();
          List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getLocaleNameProvider().getAvailableLocales());
          List<Locale> providerloc = Arrays.asList(lnp.getAvailableLocales());
  
--- 55,65 ----
          checkAvailLocValidityTest();
          variantFallbackTest();
      }
  
      void checkAvailLocValidityTest() {
!         LocaleNameProviderImpl lnp = new LocaleNameProviderImpl();
          Locale[] availloc = Locale.getAvailableLocales();
          Locale[] testloc = availloc.clone();
          List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getLocaleNameProvider().getAvailableLocales());
          List<Locale> providerloc = Arrays.asList(lnp.getAvailableLocales());
  
*** 119,129 ****
          } catch (RuntimeException re) {
              retVrnt = re.getMessage();
              if (YY_suffix.getVariant().equals(retVrnt)) {
                  System.out.println(message);
                  return;
! }
              message = "variantFallbackTest() failed. Returned variant: "+retVrnt;
          }
  
          throw new RuntimeException(message);
      }
--- 135,145 ----
          } catch (RuntimeException re) {
              retVrnt = re.getMessage();
              if (YY_suffix.getVariant().equals(retVrnt)) {
                  System.out.println(message);
                  return;
!             }
              message = "variantFallbackTest() failed. Returned variant: "+retVrnt;
          }
  
          throw new RuntimeException(message);
      }