Skip to content

Commit 3d0fc02

Browse files
committed
backport 1bd4abf98e26d04076f330c0b2e44f666f8c27a1
1 parent d21d952 commit 3d0fc02

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

test/jdk/java/util/PluggableLocale/TimeZoneNameProviderTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* @test
26-
* @bug 4052440 8003267 8062588 8210406
26+
* @bug 4052440 8003267 8062588 8210406 8327434
2727
* @summary TimeZoneNameProvider tests
2828
* @library providersrc/foobarutils
2929
* providersrc/barprovider
@@ -45,6 +45,7 @@
4545
import java.util.Locale;
4646
import java.util.MissingResourceException;
4747
import java.util.TimeZone;
48+
import java.util.stream.Stream;
4849

4950
import com.bar.TimeZoneNameProviderImpl;
5051

@@ -69,12 +70,12 @@ public static void main(String[] s) {
6970
}
7071

7172
void test1() {
72-
Locale[] available = Locale.getAvailableLocales();
7373
List<Locale> jreimplloc = Arrays.asList(LocaleProviderAdapter.forJRE().getTimeZoneNameProvider().getAvailableLocales());
7474
List<Locale> providerLocales = Arrays.asList(tznp.getAvailableLocales());
7575
String[] ids = TimeZone.getAvailableIDs();
7676

77-
for (Locale target: available) {
77+
// Sampling relevant locales
78+
Stream.concat(Stream.of(Locale.ROOT, Locale.US, Locale.JAPAN), providerLocales.stream()).forEach(target -> {
7879
// pure JRE implementation
7980
OpenListResourceBundle rb = ((ResourceBundleBasedAdapter)LocaleProviderAdapter.forJRE()).getLocaleData().getTimeZoneNames(target);
8081
boolean jreSupportsTarget = jreimplloc.contains(target);
@@ -111,7 +112,7 @@ void test1() {
111112
jreSupportsTarget && jresname != null);
112113
}
113114
}
114-
}
115+
});
115116
}
116117

117118
final String pattern = "z";

0 commit comments

Comments
 (0)