--- old/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java 2018-10-16 01:12:50.359119648 -0700 +++ new/test/jdk/java/util/PluggableLocale/CollatorProviderTest.java 2018-10-16 01:12:49.943081065 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved. + * 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 @@ -20,18 +20,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + /* - * + * @test + * @bug 4052440 8062588 8210406 + * @summary CollatorProvider tests + * @library providersrc/foobarutils + * providersrc/fooprovider + * @modules java.base/sun.util.locale.provider + * java.base/sun.util.resources + * @build com.foobar.Utils + * com.foo.* + * @run main/othervm -Djava.locale.providers=JRE,SPI CollatorProviderTest */ -import java.text.*; -import java.util.*; -import sun.util.locale.provider.*; -import sun.util.resources.*; +import java.text.Collator; +import java.text.ParseException; +import java.text.RuleBasedCollator; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.MissingResourceException; +import java.util.ResourceBundle; +import java.util.Set; + +import com.foo.CollatorProviderImpl; + +import sun.util.locale.provider.AvailableLanguageTags; +import sun.util.locale.provider.LocaleProviderAdapter; +import sun.util.locale.provider.ResourceBundleBasedAdapter; public class CollatorProviderTest extends ProviderTest { - com.foo.CollatorProviderImpl cp = new com.foo.CollatorProviderImpl(); + CollatorProviderImpl cp = new CollatorProviderImpl(); List availloc = Arrays.asList(Collator.getAvailableLocales()); List providerloc = Arrays.asList(cp.getAvailableLocales()); List jreloc = Arrays.asList(LocaleProviderAdapter.forJRE().getAvailableLocales()); @@ -94,4 +116,4 @@ checkValidity(target, jresResult, providersResult, result, jreSupportsLocale); } } -} +} \ No newline at end of file