archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6683975: [fmt-da] Regression: Java 6 returns English DateFormatPatterns for Thai locale

Browse source 
Reviewed-by: okutsu
This commit is contained in:
Yuka Kamiya 2008-10-03 15:54:41 +09:00
parent ef34d89841
commit c507643efe
2 changed files with 131 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
jdk/src/share/classes/sun/text/resources/FormatData_th.java
View file

@ -47,6 +47,19 @@ public class FormatData_th extends ListResourceBundle {
* Overrides ListResourceBundle
*/
protected final Object[][] getContents() {
String[] dateTimePatterns = new String[] {
"H' \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 'm' \u0e19\u0e32\u0e17\u0e35 'ss' \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35'", // full time pattern
"H' \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 'm' \u0e19\u0e32\u0e17\u0e35'", // long time pattern
"H:mm:ss", // medium time pattern
"H:mm' \u0e19.'", // short time pattern (modified) -- add ' \u0e19.'
// (it means something like "o'clock" in english)
"EEEE'\u0e17\u0e35\u0e48 'd MMMM G yyyy", // full date pattern
"d MMMM yyyy", // long date pattern
"d MMM yyyy", // medium date pattern
"d/M/yyyy", // short date pattern
"{1}, {0}" // date-time pattern
};
return new Object[][] {
{ "MonthNames",
new String[] {
@ -129,18 +142,10 @@ public class FormatData_th extends ListResourceBundle {
}
},
{ "sun.util.BuddhistCalendar.DateTimePatterns",
new String[] {
"H' \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 'm' \u0e19\u0e32\u0e17\u0e35 'ss' \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35'", // full time pattern
"H' \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 'm' \u0e19\u0e32\u0e17\u0e35'", // long time pattern
"H:mm:ss", // medium time pattern
"H:mm' \u0e19.'", // short time pattern (modified) -- add ' \u0e19.'
// (it means something like "o'clock" in english)
"EEEE'\u0e17\u0e35\u0e48 'd MMMM G yyyy", // full date pattern
"d MMMM yyyy", // long date pattern
"d MMM yyyy", // medium date pattern
"d/M/yyyy", // short date pattern
"{1}, {0}" // date-time pattern
}
dateTimePatterns
},
{ "DateTimePatterns",
dateTimePatterns
},
{ "DateTimePatternChars", "GanjkHmsSEDFwWxhKzZ" },
};

114
jdk/test/java/text/Format/DateFormat/Bug6683975.java Normal file
View file

@ -0,0 +1,114 @@
/*
* Copyright 2008 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/**
* @test
* @bug 6683975
* @summary Make sure that date is formatted correctlyin th locale.
*/
import java.text.*;
import java.util.*;
public class Bug6683975 {
private static boolean err = false;
private static Locale th = new Locale("th", "");
private static Locale th_TH = new Locale("th", "TH");
private static Date date = new Date(2008-1900, Calendar.OCTOBER, 1, 0, 0, 0);
private static String expected_th[] = {
"\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e04.\u0e28. 2008, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35", // 0: FULL
"30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2008, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35", // 1: LONG
"30 \u0e01.\u0e22. 2008, 8:00:00", // 2: MEDIUM
"30/9/2008, 8:00 \u0e19.", // 3: SHORT
};
private static String expected_th_TH[] = {
"\u0e27\u0e31\u0e19\u0e2d\u0e31\u0e07\u0e04\u0e32\u0e23\u0e17\u0e35\u0e48 30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 \u0e1e.\u0e28. 2551, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35 00 \u0e27\u0e34\u0e19\u0e32\u0e17\u0e35", // 0: FULL
"30 \u0e01\u0e31\u0e19\u0e22\u0e32\u0e22\u0e19 2551, 8 \u0e19\u0e32\u0e2c\u0e34\u0e01\u0e32 0 \u0e19\u0e32\u0e17\u0e35", // 1: LONG
"30 \u0e01.\u0e22. 2551, 8:00:00", // 2: MEDIUM
"30/9/2551, 8:00 \u0e19." // 3: SHORT
};
private static String stylePattern[] = {
"FULL", "LONG", "MEDIUM", "SHORT"
};
private static void test(int style) {
DateFormat df_th = DateFormat.getDateTimeInstance(style, style, th);
DateFormat df_th_TH = DateFormat.getDateTimeInstance(style, style, th_TH);
String str_th = ((SimpleDateFormat)df_th).toPattern();
String str_th_TH = ((SimpleDateFormat)df_th_TH).toPattern();
if (!str_th.equals(str_th_TH)) {
err = true;
System.err.println("Error: Pattern for th locale should be the same as pattern for th_TH locale. (" + stylePattern[style] + ")");
System.err.println("\tth: " + str_th);
System.err.println("\tth_TH: " + str_th_TH);
}
str_th = df_th.format(date);
if (!expected_th[style].equals(str_th)) {
err = true;
System.err.println("Error: Formatted date in th locale is incorrect in " + stylePattern[style] + " pattern.");
System.err.println("\tExpected: " + expected_th[style]);
System.err.println("\tGot: " + str_th);
}
str_th_TH = df_th_TH.format(date);
if (!expected_th_TH[style].equals(str_th_TH)) {
err = true;
System.err.println("Error: Formatted date in th_TH locale is incorrect in " + stylePattern[style] + " pattern.");
System.err.println("\tExpected: " + expected_th_TH[style]);
System.err.println("\tGot: " + str_th_TH);
}
}
public static void main(String[] args) {
TimeZone timezone = TimeZone.getDefault();
Locale locale = Locale.getDefault();
TimeZone.setDefault(TimeZone.getTimeZone("US/Pacific"));
Locale.setDefault(Locale.US);
try {
test(DateFormat.FULL);
test(DateFormat.LONG);
test(DateFormat.MEDIUM);
test(DateFormat.SHORT);
}
catch (Exception e) {
err = true;
System.err.println("Unexpected exception was thrown: " + e);
}
finally {
TimeZone.setDefault(timezone);
Locale.setDefault(locale);
if (err) {
throw new RuntimeException("Failed.");
} else {
System.out.println("Passed.");
}
}
}
}