i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DateFormatTest: fix after ICU upgrade

Browse Source 
* Timezone names have changed. Test the medium time format which doesn't
include them, as we aren't forcing a specific one.
* French date format also changed to use 4 digit year name.
This commit is contained in:
Adrien Destugues
2014-10-07 08:49:45 +02:00
parent c9f5d71c97
commit 699ddf447c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tests/kits/locale/DateFormatTest.cpp
+6 -6
View File
@@ -40,11 +40,11 @@ DateFormatTest::TestFormat()
static const Value values[] = { static const Value values[] = {
{"en", "en_US", 12345, "1/1/70", "January 1, 1970", {"en", "en_US", 12345, "1/1/70", "January 1, 1970",
"4:25 AM", "4:25:45 AM CET"}, "4:25 AM", "4:25:45 AM"},
{"fr", "fr_FR", 12345, "01/01/70", "1 janvier 1970", {"fr", "fr_FR", 12345, "01/01/1970", "1 janvier 1970",
"04:25", "04:25:45 HNEC"}, "04:25", "04:25:45"},
{"fr", "fr_FR", 12345678, "23/05/70", "23 mai 1970", {"fr", "fr_FR", 12345678, "23/05/1970", "23 mai 1970",
"22:21", "22:21:18 HNEC"}, "22:21", "22:21:18"},
{NULL} {NULL}
}; };
@@ -71,7 +71,7 @@ DateFormatTest::TestFormat()
CPPUNIT_ASSERT_EQUAL(B_OK, result); CPPUNIT_ASSERT_EQUAL(B_OK, result);
CPPUNIT_ASSERT_EQUAL(BString(values[i].shortTime), output); CPPUNIT_ASSERT_EQUAL(BString(values[i].shortTime), output);
result = timeFormat.Format(output, values[i].time, B_LONG_TIME_FORMAT); result = timeFormat.Format(output, values[i].time, B_MEDIUM_TIME_FORMAT);
CPPUNIT_ASSERT_EQUAL(B_OK, result); CPPUNIT_ASSERT_EQUAL(B_OK, result);
CPPUNIT_ASSERT_EQUAL(BString(values[i].longTime), output); CPPUNIT_ASSERT_EQUAL(BString(values[i].longTime), output);
} }