-
Notifications
You must be signed in to change notification settings - Fork 169
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
8028265: Add legacy tz tests to OpenJDK
Backport-of: 92deab546549ca549408a983fe361d9536d2cd37
- Loading branch information
1 parent
0d5ea9d
commit e2cbfd5
Showing
9 changed files
with
1,221 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* Copyright (c) 2015, 2022, 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. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* 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 8060126 | ||
* @summary Make sure that the tzdata version matches between the run-time and tests. | ||
*/ | ||
import java.time.zone.ZoneRules; | ||
import java.time.zone.ZoneRulesProvider; | ||
import java.util.NavigableMap; | ||
|
||
public class AssureTzdataVersion { | ||
public static void main(String... args) throws Exception { | ||
// get the tzdata version for the run-time | ||
NavigableMap<String, ZoneRules> map; | ||
map = ZoneRulesProvider.getVersions("America/Los_Angeles"); | ||
if (map.isEmpty()) { | ||
throw new RuntimeException("Unknown runtime tzdata version"); | ||
} | ||
String runtime = map.lastEntry().getKey(); | ||
|
||
// get the tzdata version for regression tests | ||
String testdata = null; | ||
try (TextFileReader textreader = new TextFileReader("VERSION")) { | ||
testdata = textreader.getLine().substring("tzdata".length()); | ||
} | ||
if (!testdata.equals(runtime)) { | ||
throw new RuntimeException("tzdata versions don't match: run-time=" + runtime | ||
+ ", tests=" + testdata); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,246 @@ | ||
/* | ||
* Copyright (c) 2005, 2022, 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. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* 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 6329116 6756569 6757131 6758988 6764308 6796489 6834474 6609737 6507067 | ||
* 7039469 7090843 7103108 7103405 7158483 8008577 8059206 8064560 8072042 | ||
* 8077685 8151876 8166875 8169191 8170316 8176044 | ||
* @summary Make sure that timezone short display names are idenical to Olson's data. | ||
* @library /java/text/testlib | ||
* @build Bug6329116 TextFileReader | ||
* @run main/othervm -Djava.locale.providers=COMPAT,SPI Bug6329116 | ||
*/ | ||
|
||
import java.io.*; | ||
import java.text.*; | ||
import java.util.*; | ||
|
||
public class Bug6329116 extends IntlTest { | ||
|
||
static Locale[] locales = Locale.getAvailableLocales(); | ||
static String[] timezones = TimeZone.getAvailableIDs(); | ||
|
||
public static void main(String[] args) throws IOException { | ||
if (bug6329116()) { | ||
throw new RuntimeException("At least one timezone display name is incorrect."); | ||
} | ||
} | ||
|
||
static boolean bug6329116() throws IOException { | ||
boolean err = false; | ||
|
||
HashMap<String, String> aliasTable = new HashMap<>(); | ||
HashSet<String> timezoneTable = new HashSet<>(); | ||
for (String t : timezones) { | ||
timezoneTable.add(t); | ||
} | ||
|
||
String line, key, value; | ||
StringTokenizer st; | ||
|
||
try (TextFileReader in = new TextFileReader("aliases.txt")) { | ||
while ((line = in.readLine()) != null) { | ||
st = new StringTokenizer(line); | ||
st.nextToken(); | ||
key = st.nextToken(); | ||
value = st.nextToken(); | ||
|
||
if (!value.equals("ROC")) { | ||
if (aliasTable.containsKey(key)) { | ||
aliasTable.put(key, aliasTable.get(key) + " " + value); | ||
} else { | ||
aliasTable.put(key, value); | ||
} | ||
} | ||
} | ||
} | ||
|
||
try (TextFileReader in = new TextFileReader("displaynames.txt")) { | ||
String timezoneID, expected, expected_DST, got; | ||
String[] aliases, tzs; | ||
TimeZone tz; | ||
while ((line = in.readLine()) != null) { | ||
st = new StringTokenizer(line); | ||
timezoneID = st.nextToken(); | ||
expected = st.nextToken(); | ||
if (st.hasMoreTokens()) { | ||
expected_DST = st.nextToken(); | ||
} else { | ||
expected_DST = null; | ||
} | ||
|
||
if (aliasTable.containsKey(timezoneID)) { | ||
aliases = aliasTable.get(timezoneID).split(" "); | ||
tzs = new String[1 + aliases.length]; | ||
System.arraycopy(aliases, 0, tzs, 1, aliases.length); | ||
aliasTable.remove(timezoneID); | ||
} else { | ||
tzs = new String[1]; | ||
} | ||
tzs[0] = timezoneID; | ||
|
||
for (int j = 0; j < tzs.length; j++) { | ||
tz = TimeZone.getTimeZone(tzs[j]); | ||
|
||
if (!tzs[j].equals(tz.getID())) { | ||
System.err.println(tzs[j] + " may not be a valid Timezone ID and \"" + tz.getID() + "\" was returned. Please check it."); | ||
err = true; | ||
} | ||
|
||
timezoneTable.remove(tzs[j]); | ||
|
||
for (int i = 0; i < locales.length; i++) { | ||
got = tz.getDisplayName(false, TimeZone.SHORT, locales[i]); | ||
if (!expected.equals(got) && | ||
!expected.startsWith(got + "/") && | ||
!expected.endsWith("/" + got)) { | ||
if (useLocalzedShortDisplayName(tz, locales[i], got, false)) { | ||
/* | ||
System.out.println(tzs[j] + | ||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + | ||
" seems to use a localized short display name" + | ||
": original: " + expected + | ||
": got: " + got + " for non-DST in " + | ||
locales[i] + " locale."); | ||
*/ | ||
} else { | ||
System.err.println(tzs[j] + | ||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + | ||
": expected: " + expected + | ||
": got: " + got + " for non-DST in " + | ||
locales[i] + " locale."); | ||
err = true; | ||
} | ||
} | ||
|
||
got = tz.getDisplayName(true, TimeZone.SHORT, locales[i]); | ||
if (expected_DST != null) { | ||
if (!expected_DST.equals(got) && | ||
!expected_DST.startsWith(got + "/") && | ||
!expected_DST.endsWith("/" + got)) { | ||
if (tzs[j].equals("Europe/London") && | ||
locales[i].equals(new Locale("en", "IE"))) { | ||
continue; | ||
} else if (useLocalzedShortDisplayName(tz, locales[i], got, true)) { | ||
/* | ||
System.out.println(tzs[j] + | ||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + | ||
" seems to use a localized short display name" + | ||
": original: " + expected_DST + | ||
": got: " + got + " for DST in " + | ||
locales[i] + " locale."); | ||
*/ | ||
continue; | ||
} | ||
System.err.println(tzs[j] + | ||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + | ||
": expected: " + expected_DST + | ||
": got: " + got + " for DST in " + | ||
locales[i] + " locale."); | ||
err = true; | ||
} | ||
} else { | ||
// Some timezones don't have DST display names in Olson's data, | ||
// and we created them ourselves based on non-DST display names | ||
// to prepare potential use in the future. | ||
// Because there's no expected name, we don't judge if these | ||
// DST display names are correct but just compare them with | ||
// non-DST diplay names for checking with our eyes . | ||
if (!expected.equals(got) && | ||
!expected.startsWith(got + "/") && | ||
!expected.endsWith("/" + got)) { | ||
/* | ||
System.out.println("## " + tzs[j] + | ||
((j > 0) ? "(Alias of \"" + tzs[0] + "\")" : "") + | ||
": expected: " + expected + | ||
": got: " + got + " for DST in " + | ||
locales[i] + " locale."); | ||
*/ | ||
} | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
if (!timezoneTable.isEmpty()) { | ||
System.out.println("# Timezone(s) valid in JRE but untested in this test program:"); | ||
Iterator<String> it = timezoneTable.iterator(); | ||
while (it.hasNext()) { | ||
System.out.println(it.next()); | ||
} | ||
System.out.println(); | ||
} | ||
|
||
if (!aliasTable.isEmpty()) { | ||
System.out.println("# Timezone(s) exists in Olson's data as Link but unused in JRE:"); | ||
for (Map.Entry<String, String> entry : aliasTable.entrySet()) { | ||
System.out.println(entry); | ||
} | ||
} | ||
|
||
return err; | ||
} | ||
|
||
static boolean useLocalzedShortDisplayName(TimeZone tz, | ||
Locale locale, | ||
String got, | ||
boolean inDST) { | ||
if (locale.getLanguage().equals("de")) { | ||
String name = tz.getDisplayName(inDST, TimeZone.LONG, locale); | ||
if (inDST) { | ||
if (("Mitteleurop\u00e4ische Sommerzeit".equals(name) && "MESZ".equals(got)) || | ||
("Osteurop\u00e4ische Sommerzeit".equals(name) && "OESZ".equals(got)) || | ||
("Westeurop\u00e4ische Sommerzeit".equals(name) && "WESZ".equals(got))) { | ||
return true; | ||
} | ||
} else { | ||
if (("Mitteleurop\u00e4ische Zeit".equals(name) && "MEZ".equals(got)) || | ||
("Osteurop\u00e4ische Zeit".equals(name) && "OEZ".equals(got)) || | ||
("Westeurop\u00e4ische Zeit".equals(name) && "WEZ".equals(got))) { | ||
return true; | ||
} | ||
} | ||
} else if (locale.getLanguage().equals("zh") && | ||
(locale.getCountry().equals("TW") || locale.getCountry().equals("HK"))) { | ||
String name = tz.getDisplayName(inDST, TimeZone.LONG, locale); | ||
if (inDST) { | ||
if (("\u53f0\u7063\u590f\u4ee4\u6642\u9593".equals(name) && "TDT".equals(got))) { | ||
return true; | ||
} | ||
} else { | ||
if (("\u53f0\u7063\u6a19\u6e96\u6642\u9593".equals(name) && "TST".equals(got))) { | ||
return true; | ||
} | ||
} | ||
} | ||
// If we get a TimeZone with GMT+hh:mm format, we can ignore the offset value | ||
if (tz.getDisplayName(Locale.ENGLISH).startsWith("GMT+") || tz.getDisplayName(Locale.ENGLISH).startsWith("GMT-")) { | ||
return tz.getDisplayName().substring(0, 3).equals(got.substring(0, 3)); | ||
} | ||
|
||
return false; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,94 @@ | ||
/* | ||
* Copyright (c) 2008, 2022, 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. | ||
* | ||
* This code is distributed in the hope that it will be useful, but WITHOUT | ||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
* version 2 for more details (a copy is included in the LICENSE file that | ||
* accompanied this code). | ||
* | ||
* You should have received a copy of the GNU General Public License version | ||
* 2 along with this work; if not, write to the Free Software Foundation, | ||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* 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.io.*; | ||
|
||
// This class is public so that tools can invoke. | ||
public class TextFileReader implements AutoCloseable { | ||
private BufferedReader reader; | ||
private int lineNo; | ||
|
||
public TextFileReader(String filename) throws IOException { | ||
this(new File(new File(System.getProperty("test.src", "."), | ||
"TimeZoneData"), | ||
filename)); | ||
} | ||
|
||
public TextFileReader(File file) throws IOException { | ||
InputStream is = new FileInputStream(file); | ||
reader = new BufferedReader(new InputStreamReader(is, "utf-8")); | ||
} | ||
|
||
public String readLine() throws IOException { | ||
return getLine(); | ||
} | ||
|
||
public String getLine() throws IOException { | ||
checkReader(); | ||
|
||
String line; | ||
while ((line = reader.readLine()) != null) { | ||
lineNo++; | ||
line = line.trim(); | ||
// Skip blank and comment lines. | ||
if (line.length() == 0) { | ||
continue; | ||
} | ||
int x = line.indexOf('#'); | ||
if (x == 0) { | ||
continue; | ||
} | ||
if (x > 0) { | ||
line = line.substring(0, x).trim(); | ||
} | ||
break; | ||
} | ||
return line; | ||
} | ||
|
||
public String getRawLine() throws IOException { | ||
checkReader(); | ||
|
||
String line = reader.readLine(); | ||
if (line != null) { | ||
lineNo++; | ||
} | ||
return line; | ||
} | ||
|
||
private void checkReader() throws IOException { | ||
if (reader == null) { | ||
throw new IOException("This TextFileReader has been closed."); | ||
} | ||
} | ||
|
||
@Override | ||
public void close() throws IOException { | ||
reader.close(); | ||
reader = null; | ||
} | ||
|
||
int getLineNo() { | ||
return lineNo; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
tzdata2022a |
Oops, something went wrong.
e2cbfd5
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Review
Issues