AuroraMiddleware/scuffed-code
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ICU-1847 Improve the testing coverage and error messages. Change the root yy to yyyy

Browse Source 
X-SVN-Rev: 8443
This commit is contained in:
George Rhoten 2002-04-11 18:36:11 +00:00
parent 1897c6985e
commit 0498229081
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
icu4c/source/test/intltest/dtfmrgts.cpp
View File

@ -109,18 +109,18 @@ void DateFormatRegressionTest::Test4052408(void)
{ {
DateFormat *fmt = DateFormat::createDateTimeInstance(DateFormat::SHORT, DateFormat *fmt = DateFormat::createDateTimeInstance(DateFormat::SHORT,
DateFormat::SHORT, Locale::US); DateFormat::SHORT, Locale::getUS());
UDate dt = date(97, Calendar::MAY, 3, 8, 55); UDate dt = date(97, Calendar::MAY, 3, 8, 55);
UnicodeString str; UnicodeString str;
str = fmt->format(dt, str); str = fmt->format(dt, str);
logln(str); logln(str);
if(str != "5/3/97 8:55 AM") if(str != "5/3/1997 8:55 AM")
errln("Fail: Test broken; Want 5/3/97 8:55 AM Got " + str); errln("Fail: Test broken; Want 5/3/1997 8:55 AM Got " + str);
UnicodeString expected[] = { UnicodeString expected[] = {
(UnicodeString) "", //"ERA_FIELD", (UnicodeString) "", //"ERA_FIELD",
(UnicodeString) "97", //"YEAR_FIELD", (UnicodeString) "1997", //"YEAR_FIELD",
(UnicodeString) "5", //"MONTH_FIELD", (UnicodeString) "5", //"MONTH_FIELD",
(UnicodeString) "3", //"DATE_FIELD", (UnicodeString) "3", //"DATE_FIELD",
(UnicodeString) "", //"HOUR_OF_DAY1_FIELD", (UnicodeString) "", //"HOUR_OF_DAY1_FIELD",
@ -186,7 +186,7 @@ void DateFormatRegressionTest::Test4052408(void)
if((exp.length() == 0 && str.length() == 0) || str == exp) if((exp.length() == 0 && str.length() == 0) || str == exp)
logln(" ok"); logln(" ok");
else { else {
logln(UnicodeString(" expected ") + exp); errln(UnicodeString(" expected ") + exp);
pass = FALSE; pass = FALSE;
} }
@ -206,7 +206,7 @@ void DateFormatRegressionTest::Test4056591(void)
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
//try { //try {
SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("yyMMdd"), Locale::US, status); SimpleDateFormat *fmt = new SimpleDateFormat(UnicodeString("yyMMdd"), Locale::getUS(), status);
failure(status, "new SimpleDateFormat"); failure(status, "new SimpleDateFormat");
UDate start = date(1809-1900, Calendar::DECEMBER, 25); UDate start = date(1809-1900, Calendar::DECEMBER, 25);
fmt->set2DigitYearStart(start, status); fmt->set2DigitYearStart(start, status);
@ -513,7 +513,7 @@ void DateFormatRegressionTest::Test4071441(void)
void DateFormatRegressionTest::Test4073003(void) void DateFormatRegressionTest::Test4073003(void)
{ {
//try { //try {
DateFormat *fmt = DateFormat::createDateInstance(DateFormat::SHORT, Locale::US); DateFormat *fmt = DateFormat::createDateInstance(DateFormat::SHORT, Locale::getUK());
UnicodeString tests [] = { UnicodeString tests [] = {
(UnicodeString) "12/25/61", (UnicodeString) "12/25/61",
(UnicodeString) "12/25/1961", (UnicodeString) "12/25/1961",
@ -647,7 +647,7 @@ void DateFormatRegressionTest::Test4100302(void)
void DateFormatRegressionTest::Test4101483(void) void DateFormatRegressionTest::Test4101483(void)
{ {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat *sdf = new SimpleDateFormat(UnicodeString("z"), Locale::US, status); SimpleDateFormat *sdf = new SimpleDateFormat(UnicodeString("z"), Locale::getUS(), status);
failure(status, "new SimpleDateFormat"); failure(status, "new SimpleDateFormat");
FieldPosition fp(DateFormat::TIMEZONE_FIELD); FieldPosition fp(DateFormat::TIMEZONE_FIELD);
//Date d = date(9234567890L); //Date d = date(9234567890L);
@ -680,7 +680,7 @@ void DateFormatRegressionTest::Test4103340(void)
// choose a date that is the FIRST of some month // choose a date that is the FIRST of some month
// and some arbitrary time // and some arbitrary time
UDate d = date(97, 3, 1, 1, 1, 1); UDate d = date(97, 3, 1, 1, 1, 1);
SimpleDateFormat *df = new SimpleDateFormat(UnicodeString("MMMM"), Locale::US, status); SimpleDateFormat *df = new SimpleDateFormat(UnicodeString("MMMM"), Locale::getUS(), status);
failure(status, "new SimpleDateFormat"); failure(status, "new SimpleDateFormat");
UnicodeString s; UnicodeString s;
@ -943,7 +943,7 @@ void DateFormatRegressionTest::Test4151631(void)
UnicodeString pattern = "'TO_DATE('''dd'-'MM'-'yyyy HH:mm:ss''' , ''DD-MM-YYYY HH:MI:SS'')'"; UnicodeString pattern = "'TO_DATE('''dd'-'MM'-'yyyy HH:mm:ss''' , ''DD-MM-YYYY HH:MI:SS'')'";
logln("pattern=" + pattern); logln("pattern=" + pattern);
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat *format = new SimpleDateFormat(pattern, Locale::US, status); SimpleDateFormat *format = new SimpleDateFormat(pattern, Locale::getUS(), status);
failure(status, "new SimpleDateFormat"); failure(status, "new SimpleDateFormat");
UnicodeString result; UnicodeString result;
FieldPosition pos(FieldPosition::DONT_CARE); FieldPosition pos(FieldPosition::DONT_CARE);
@ -967,7 +967,7 @@ void DateFormatRegressionTest::Test4151706(void)
{ {
UnicodeString dateString("Thursday, 31-Dec-98 23:00:00 GMT"); UnicodeString dateString("Thursday, 31-Dec-98 23:00:00 GMT");
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat fmt(UnicodeString("EEEE, dd-MMM-yy HH:mm:ss z"), Locale::US, status); SimpleDateFormat fmt(UnicodeString("EEEE, dd-MMM-yy HH:mm:ss z"), Locale::getUS(), status);
failure(status, "new SimpleDateFormat"); failure(status, "new SimpleDateFormat");
//try { //try {
UDate d = fmt.parse(dateString, status); UDate d = fmt.parse(dateString, status);
@ -994,7 +994,7 @@ DateFormatRegressionTest::Test4162071(void)
UnicodeString dateString("Thu, 30-Jul-1999 11:51:14 GMT"); UnicodeString dateString("Thu, 30-Jul-1999 11:51:14 GMT");
UnicodeString format("EEE', 'dd-MMM-yyyy HH:mm:ss z"); // RFC 822/1123 UnicodeString format("EEE', 'dd-MMM-yyyy HH:mm:ss z"); // RFC 822/1123
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat df(format, Locale::US, status); SimpleDateFormat df(format, Locale::getUS(), status);
if(U_FAILURE(status)) if(U_FAILURE(status))
errln("Couldn't create SimpleDateFormat"); errln("Couldn't create SimpleDateFormat");
@ -1017,8 +1017,8 @@ DateFormatRegressionTest::Test4162071(void)
*/ */
void DateFormatRegressionTest::Test4182066(void) { void DateFormatRegressionTest::Test4182066(void) {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
SimpleDateFormat fmt("MM/dd/yy", Locale::US, status); SimpleDateFormat fmt("MM/dd/yy", Locale::getUS(), status);
SimpleDateFormat dispFmt("MMM dd yyyy GG", Locale::US, status); SimpleDateFormat dispFmt("MMM dd yyyy GG", Locale::getUS(), status);
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
errln("Couldn't create SimpleDateFormat"); errln("Couldn't create SimpleDateFormat");
return; return;
@ -1100,8 +1100,8 @@ void
DateFormatRegressionTest::Test4210209(void) { DateFormatRegressionTest::Test4210209(void) {
UErrorCode status = U_ZERO_ERROR; UErrorCode status = U_ZERO_ERROR;
UnicodeString pattern("MMM d, yyyy"); UnicodeString pattern("MMM d, yyyy");
SimpleDateFormat sfmt(pattern, Locale::US, status); SimpleDateFormat sfmt(pattern, Locale::getUS(), status);
SimpleDateFormat sdisp("MMM dd yyyy GG", Locale::US, status); SimpleDateFormat sdisp("MMM dd yyyy GG", Locale::getUS(), status);
DateFormat& fmt = *(DateFormat*)&sfmt; // Yuck: See j25 DateFormat& fmt = *(DateFormat*)&sfmt; // Yuck: See j25
DateFormat& disp = *(DateFormat*)&sdisp; // Yuck: See j25 DateFormat& disp = *(DateFormat*)&sdisp; // Yuck: See j25
if (U_FAILURE(status)) { if (U_FAILURE(status)) {
@ -1149,7 +1149,7 @@ void DateFormatRegressionTest::Test714(void)
UDate d(978103543000.); UDate d(978103543000.);
DateFormat *fmt = DateFormat::createDateTimeInstance(DateFormat::NONE, DateFormat *fmt = DateFormat::createDateTimeInstance(DateFormat::NONE,
DateFormat::MEDIUM, DateFormat::MEDIUM,
Locale::US); Locale::getUS());
UnicodeString s; UnicodeString s;
UnicodeString tests = UnicodeString tests =
(UnicodeString) "7:25:43 AM" ; (UnicodeString) "7:25:43 AM" ;

4
icu4c/source/test/intltest/tmsgfmt.cpp
View File

@ -244,7 +244,7 @@ void TestMessageFormat::PatternTest()
"Quotes ', {, a 1 {0}", "Quotes ', {, a 1 {0}",
"Quotes ', {, a 1 {0}", "Quotes ', {, a 1 {0}",
"{1,number,#,##} #34,56", "{1,number,#,##} #34,56",
"There are 3,456 files on Disk at 1/12/70 5:46 AM.", "There are 3,456 files on Disk at 1/12/1970 5:46 AM.",
"On Disk, there are 3,456 files, with $1.00.", "On Disk, there are 3,456 files, with $1.00.",
"{1,number,percent}, 345,600%,", "{1,number,percent}, 345,600%,",
"{1,date,full}, Wednesday, December 31, 1969,", "{1,date,full}, Wednesday, December 31, 1969,",
@ -259,7 +259,7 @@ void TestMessageFormat::PatternTest()
MessageFormat *form = 0; MessageFormat *form = 0;
UErrorCode success = U_ZERO_ERROR; UErrorCode success = U_ZERO_ERROR;
UnicodeString buffer; UnicodeString buffer;
form = new MessageFormat(testCases[i], Locale::US, success); form = new MessageFormat(testCases[i], Locale::getUS(), success);
if (U_FAILURE(success)) { if (U_FAILURE(success)) {
errln("MessageFormat creation failed.#1"); errln("MessageFormat creation failed.#1");
logln(((UnicodeString)"MessageFormat for ") + testCases[i] + " creation failed.\n"); logln(((UnicodeString)"MessageFormat for ") + testCases[i] + " creation failed.\n");