test/jdk/java/util/PluggableLocale/CalendarNameProviderTest.java

*** 1,7 ****
  /*
!  * Copyright (c) 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2012, 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,38 ****
   *
   * 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 static java.util.Calendar.*;
! import sun.util.locale.provider.*;
! import sun.util.resources.*;
  import com.bar.CalendarNameProviderImpl;
  
  /**
   * Test case for CalendarNameProvider.
   *
   * Test strategy:
   * com.bar.CalendarNameProviderImpl supports only ja_JP_kids locale. It returns
--- 18,58 ----
   *
   * 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 8000986 8062588 8210406
!  * @summary CalendarNameProvider tests
!  * @library providersrc/foobarutils
!  *          providersrc/barprovider
!  * @build com.foobar.Utils
!  *        com.bar.*
!  * @run main/othervm -Djava.locale.providers=JRE,SPI CalendarNameProviderTest
   */
  
! import java.util.Calendar;
! import java.util.HashMap;
! import java.util.Locale;
! import java.util.Map;
! 
  import com.bar.CalendarNameProviderImpl;
  
+ import static java.util.Calendar.ALL_STYLES;
+ import static java.util.Calendar.DAY_OF_MONTH;
+ import static java.util.Calendar.DAY_OF_WEEK;
+ import static java.util.Calendar.DECEMBER;
+ import static java.util.Calendar.HOUR_OF_DAY;
+ import static java.util.Calendar.JANUARY;
+ import static java.util.Calendar.LONG_STANDALONE;
+ import static java.util.Calendar.MONTH;
+ import static java.util.Calendar.SATURDAY;
+ import static java.util.Calendar.SHORT_STANDALONE;
+ import static java.util.Calendar.SUNDAY;
+ 
  /**
   * Test case for CalendarNameProvider.
   *
   * Test strategy:
   * com.bar.CalendarNameProviderImpl supports only ja_JP_kids locale. It returns