Skip to content

8356040: java/util/PluggableLocale/LocaleNameProviderTest.java timed out #25009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
justin-curtis-lu wants to merge 2 commits into from
Closed

8356040: java/util/PluggableLocale/LocaleNameProviderTest.java timed out #25009

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c3e77cd
init
justin-curtis-lu May 1, 2025
579c1eb
Naoto review - update comment, isEmpty()
justin-curtis-lu May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
153 changes: 84 additions & 69 deletions test/jdk/java/util/PluggableLocale/LocaleNameProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2025, 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
Expand All @@ -23,105 +23,120 @@

/*
* @test
* @bug 4052440 8000273 8062588 8210406 8174269
* @bug 4052440 8000273 8062588 8210406 8174269 8356040
* @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=CLDR,SPI LocaleNameProviderTest
* @run junit/othervm -Djava.locale.providers=CLDR,SPI LocaleNameProviderTest
*/

import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;

import com.bar.LocaleNameProviderImpl;

import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
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();
}
private static final LocaleNameProviderImpl LNP = new LocaleNameProviderImpl();

/*
* This is not an exhaustive test. Such a test would require iterating (1000x1000)+
* inputs. Instead, we check against Japanese lang locales which guarantees
* we will run into cases where the CLDR is not preferred and the SPI has defined
Copy link
Member

@naotoj naotoj May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be helpful to mention why CLDR is not the preferred provider (as the SPI impl has variants of the Japanese locale)

* a value. See LocaleNameProviderImpl and LocaleNames ResourceBundle.
*/
@ParameterizedTest
@MethodSource
void checkAvailLocValidityTest(Locale target, Locale test, ResourceBundle rb,
boolean jreSupports, boolean spiSupports) {
// codes
String lang = test.getLanguage();
String ctry = test.getCountry();
String vrnt = test.getVariant();

// the localized name
String langresult = test.getDisplayLanguage(target);
String ctryresult = test.getDisplayCountry(target);
String vrntresult = test.getDisplayVariant(target);

// provider's name (if any)
String providerslang = null;
String providersctry = null;
String providersvrnt = null;
if (spiSupports) {
providerslang = LNP.getDisplayLanguage(lang, target);
providersctry = LNP.getDisplayCountry(ctry, target);
providersvrnt = LNP.getDisplayVariant(vrnt, target);
}

LocaleNameProviderTest() {
checkAvailLocValidityTest();
variantFallbackTest();
}
// JRE's name
String jreslang = null;
String jresctry = null;
String jresvrnt = null;
if (!lang.equals("")) {
Copy link
Member

@naotoj naotoj May 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can be replaced with isEmpty()

try {
jreslang = rb.getString(lang);
} catch (MissingResourceException mre) {}
}
if (!ctry.equals("")) {
try {
jresctry = rb.getString(ctry);
} catch (MissingResourceException mre) {}
}
if (!vrnt.equals("")) {
try {
jresvrnt = rb.getString("%%"+vrnt);
} catch (MissingResourceException mre) {}
}

void checkAvailLocValidityTest() {
LocaleNameProviderImpl lnp = new LocaleNameProviderImpl();
Locale[] availloc = Locale.getAvailableLocales();
Locale[] testloc = availloc.clone();
List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR).getLocaleNameProvider().getAvailableLocales());
List<Locale> providerloc = Arrays.asList(lnp.getAvailableLocales());
checkValidity(target, jreslang, providerslang, langresult,
jreSupports && jreslang != null);
checkValidity(target, jresctry, providersctry, ctryresult,
jreSupports && jresctry != null);
checkValidity(target, jresvrnt, providersvrnt, vrntresult,
jreSupports && jresvrnt != null);
}

for (Locale target: availloc) {
public static List<Arguments> checkAvailLocValidityTest() {
var args = new ArrayList<Arguments>();
Locale[] availloc = Locale.availableLocales()
.filter(l -> l.getLanguage().equals("ja"))
.toArray(Locale[]::new);
List<Locale> jreimplloc = Arrays.stream(LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)
.getLocaleNameProvider().getAvailableLocales())
.filter(l -> l.getLanguage().equals("ja"))
.toList();
List<Locale> providerloc = Arrays.asList(LNP.getAvailableLocales());

for (Locale target : availloc) {
// pure JRE implementation
OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getLocaleNames(target);
OpenListResourceBundle rb = ((ResourceBundleBasedAdapter) LocaleProviderAdapter.forType(LocaleProviderAdapter.Type.CLDR)).getLocaleData().getLocaleNames(target);
boolean jreSupportsTarget = jreimplloc.contains(target);

for (Locale test: testloc) {
// codes
String lang = test.getLanguage();
String ctry = test.getCountry();
String vrnt = test.getVariant();

// the localized name
String langresult = test.getDisplayLanguage(target);
String ctryresult = test.getDisplayCountry(target);
String vrntresult = test.getDisplayVariant(target);

// provider's name (if any)
String providerslang = null;
String providersctry = null;
String providersvrnt = null;
if (providerloc.contains(target)) {
providerslang = lnp.getDisplayLanguage(lang, target);
providersctry = lnp.getDisplayCountry(ctry, target);
providersvrnt = lnp.getDisplayVariant(vrnt, target);
}

// JRE's name
String jreslang = null;
String jresctry = null;
String jresvrnt = null;
if (!lang.equals("")) {
try {
jreslang = rb.getString(lang);
} catch (MissingResourceException mre) {}
}
if (!ctry.equals("")) {
try {
jresctry = rb.getString(ctry);
} catch (MissingResourceException mre) {}
}
if (!vrnt.equals("")) {
try {
jresvrnt = rb.getString("%%"+vrnt);
} catch (MissingResourceException mre) {}
}

System.out.print("For key: "+lang+" ");
checkValidity(target, jreslang, providerslang, langresult,
jreSupportsTarget && jreslang != null);
System.out.print("For key: "+ctry+" ");
checkValidity(target, jresctry, providersctry, ctryresult,
jreSupportsTarget && jresctry != null);
System.out.print("For key: "+vrnt+" ");
checkValidity(target, jresvrnt, providersvrnt, vrntresult,
jreSupportsTarget && jresvrnt != null);
boolean providerSupportsTarget = providerloc.contains(target);
for (Locale test : availloc) {
args.add(Arguments.of(target, test, rb, jreSupportsTarget, providerSupportsTarget));
}
}
return args;
}

@Test
void variantFallbackTest() {
Locale YY = Locale.of("yy", "YY", "YYYY");
Locale YY_suffix = Locale.of("yy", "YY", "YYYY_suffix");
Expand Down