nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1792775 - Part 11.1: Update expected test results in non-SpiderMonkey files. r=platform-i18n-reviewers,gregtatum

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D162707
This commit is contained in:
André Bargull 2022-11-23 17:56:18 +00:00
parent 5722569893
commit 86a29191ae
5 changed files with 43 additions and 28 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

28
browser/components/urlbar/tests/unit/test_unitConversion.js
View file

@ -332,15 +332,15 @@ const TEST_DATA = [
{ queryString: "0 utc in utc", expected: "00:00 UTC" },
{ queryString: "0 utc = utc", expected: "00:00 UTC" },
{ queryString: "0 UTC=UTC", expected: "00:00 UTC" },
{ queryString: "11 pm utc to utc", expected: "11:00 PM UTC" },
{ queryString: "11 am utc to utc", expected: "11:00 AM UTC" },
{ queryString: "11 pm utc to utc", expected: "11:00\u{202F}PM UTC" },
{ queryString: "11 am utc to utc", expected: "11:00\u{202F}AM UTC" },
{ queryString: "11:30 utc to utc", expected: "11:30 UTC" },
{ queryString: "11:30 PM utc to utc", expected: "11:30 PM UTC" },
{ queryString: "11:30 PM utc to utc", expected: "11:30\u{202F}PM UTC" },
{ queryString: "1 utc to idlw", expected: "13:00 IDLW" },
{ queryString: "1 pm utc to idlw", expected: "1:00 AM IDLW" },
{ queryString: "1 am utc to idlw", expected: "1:00 PM IDLW" },
{ queryString: "1 pm utc to idlw", expected: "1:00\u{202F}AM IDLW" },
{ queryString: "1 am utc to idlw", expected: "1:00\u{202F}PM IDLW" },
{ queryString: "1 utc to idlw", expected: "13:00 IDLW" },
{ queryString: "1 PM utc to idlw", expected: "1:00 AM IDLW" },
{ queryString: "1 PM utc to idlw", expected: "1:00\u{202F}AM IDLW" },
{ queryString: "0 utc to nt", expected: "13:00 NT" },
{ queryString: "0 utc to hst", expected: "14:00 HST" },
{ queryString: "0 utc to akst", expected: "15:00 AKST" },
@ -385,14 +385,14 @@ const TEST_DATA = [
{ queryString: "0 utc to nzd", expected: "13:00 NZD" },
{ queryString: "9:00 jst to utc", expected: "00:00 UTC" },
{ queryString: "8:00 jst to utc", expected: "23:00 UTC" },
{ queryString: "8:00 am jst to utc", expected: "11:00 PM UTC" },
{ queryString: "8:00 am jst to utc", expected: "11:00\u{202F}PM UTC" },
{ queryString: "9:00 jst to pdt", expected: "17:00 PDT" },
{ queryString: "12 pm pst to cet", expected: "9:00 PM CET" },
{ queryString: "12 am pst to cet", expected: "9:00 AM CET" },
{ queryString: "12:30 pm pst to cet", expected: "9:30 PM CET" },
{ queryString: "12:30 am pst to cet", expected: "9:30 AM CET" },
{ queryString: "23 pm pst to cet", expected: "8:00 AM CET" },
{ queryString: "23:30 pm pst to cet", expected: "8:30 AM CET" },
{ queryString: "12 pm pst to cet", expected: "9:00\u{202F}PM CET" },
{ queryString: "12 am pst to cet", expected: "9:00\u{202F}AM CET" },
{ queryString: "12:30 pm pst to cet", expected: "9:30\u{202F}PM CET" },
{ queryString: "12:30 am pst to cet", expected: "9:30\u{202F}AM CET" },
{ queryString: "23 pm pst to cet", expected: "8:00\u{202F}AM CET" },
{ queryString: "23:30 pm pst to cet", expected: "8:30\u{202F}AM CET" },
{
queryString: "10:00 JST to here",
timezone: "UTC",
@ -406,7 +406,7 @@ const TEST_DATA = [
{
queryString: "1 am to JST",
timezone: "UTC",
expected: "10:00 AM JST",
expected: "10:00\u{202F}AM JST",
},
{
queryString: "now to JST",

9
intl/components/gtest/TestDateIntervalFormat.cpp
View file

@ -47,7 +47,7 @@ TEST(IntlDateIntervalFormat, TryFormatDateTime)
spanResult = formatted.ToSpan();
ASSERT_TRUE(spanResult.isOk());
ASSERT_EQ(spanResult.unwrap(),
MakeStringSpan(u"01/03, 00:00 – 01/05, 00:00"));
MakeStringSpan(u"01/03, 00:00\u2009–\u200901/05, 00:00"));
}
TEST(IntlDateIntervalFormat, TryFormatCalendar)
@ -104,7 +104,7 @@ TEST(IntlDateIntervalFormat, TryFormatCalendar)
spanResult = formatted.ToSpan();
ASSERT_TRUE(spanResult.isOk());
ASSERT_EQ(spanResult.unwrap(),
MakeStringSpan(u"01/03, 00:00 – 01/05, 00:00"));
MakeStringSpan(u"01/03, 00:00\u2009–\u200901/05, 00:00"));
}
TEST(IntlDateIntervalFormat, TryFormattedToParts)
@ -123,7 +123,8 @@ TEST(IntlDateIntervalFormat, TryFormattedToParts)
ASSERT_FALSE(equal);
Span<const char16_t> formattedSpan = formatted.ToSpan().unwrap();
ASSERT_EQ(formattedSpan, MakeStringSpan(u"01/03, 00:00 – 01/05, 00:00"));
ASSERT_EQ(formattedSpan,
MakeStringSpan(u"01/03, 00:00\u2009–\u200901/05, 00:00"));
mozilla::intl::DateTimePartVector parts;
result = dif->TryFormattedToParts(formatted, parts);
@ -164,7 +165,7 @@ TEST(IntlDateIntervalFormat, TryFormattedToParts)
ASSERT_EQ(parts[6].mSource, DateTimePartSource::StartRange);
ASSERT_EQ(parts[7].mType, DateTimePartType::Literal);
ASSERT_EQ(getSubSpan(7), MakeStringSpan(u" – "));
ASSERT_EQ(getSubSpan(7), MakeStringSpan(u"\u2009–\u2009"));
ASSERT_EQ(parts[7].mSource, DateTimePartSource::Shared);
ASSERT_EQ(parts[8].mType, DateTimePartType::Month);

12
intl/components/gtest/TestDateTimeFormat.cpp
View file

@ -38,7 +38,7 @@ TEST(IntlDateTimeFormat, Style_enUS_utf8)
TestBuffer<char> buffer;
dtFormat->TryFormat(DATE, buffer).unwrap();
ASSERT_TRUE(buffer.verboseMatches("Sep 23, 2002, 8:07:30 PM"));
ASSERT_TRUE(buffer.verboseMatches("Sep 23, 2002, 8:07:30\u202FPM"));
}
TEST(IntlDateTimeFormat, Style_enUS_utf16)
@ -51,7 +51,7 @@ TEST(IntlDateTimeFormat, Style_enUS_utf16)
TestBuffer<char16_t> buffer;
dtFormat->TryFormat(DATE, buffer).unwrap();
ASSERT_TRUE(buffer.verboseMatches(u"Sep 23, 2002, 8:07:30 PM"));
ASSERT_TRUE(buffer.verboseMatches(u"Sep 23, 2002, 8:07:30\u202FPM"));
}
TEST(IntlDateTimeFormat, Style_ar_utf8)
@ -86,7 +86,7 @@ TEST(IntlDateTimeFormat, Style_enUS_fallback_to_default_styles)
TestBuffer<char> buffer;
dtFormat->TryFormat(DATE, buffer).unwrap();
ASSERT_TRUE(buffer.verboseMatches("Sep 23, 2002, 8:07:30 PM"));
ASSERT_TRUE(buffer.verboseMatches("Sep 23, 2002, 8:07:30\u202FPM"));
}
TEST(IntlDateTimeFormat, Time_zone_IANA_identifier)
@ -103,7 +103,7 @@ TEST(IntlDateTimeFormat, Time_zone_IANA_identifier)
.unwrap();
TestBuffer<char> buffer;
dtFormat->TryFormat(DATE, buffer).unwrap();
ASSERT_TRUE(buffer.verboseMatches("Sep 23, 2002, 12:07:30 PM"));
ASSERT_TRUE(buffer.verboseMatches("Sep 23, 2002, 12:07:30\u202FPM"));
}
TEST(IntlDateTimeFormat, GetAllowedHourCycles)
@ -191,7 +191,7 @@ TEST(IntlDateTimeFormat, Components)
TestBuffer<char16_t> buffer;
ASSERT_TRUE(FormatComponents(buffer, components));
ASSERT_TRUE(buffer.verboseMatches(u"9/23/2002, 8:07:30 PM"));
ASSERT_TRUE(buffer.verboseMatches(u"9/23/2002, 8:07:30\u202FPM"));
}
TEST(IntlDateTimeFormat, Components_es_ES)
@ -246,7 +246,7 @@ TEST(IntlDateTimeFormat, ComponentsHour12Default)
TestBuffer<char16_t> buffer;
ASSERT_TRUE(FormatComponents(buffer, components));
ASSERT_TRUE(buffer.verboseMatches(u"8:07 PM"));
ASSERT_TRUE(buffer.verboseMatches(u"8:07\u202FPM"));
}
TEST(IntlDateTimeFormat, ComponentsHour24)

8
intl/l10n/test/test_datetimeformat.js
View file

@ -48,7 +48,7 @@ dt-style = Style formatting: { DATETIME($dateArg, dateStyle: "short", timeStyle:
testMessage(
"dt-bare",
FIREFOX_RELEASE_TIMESTAMP,
/^The bare date is: Sep \d+, 2002, \d+:\d+:\d+ (AM|PM)$/
/^The bare date is: Sep \d+, 2002, \d+:\d+:\d+\u202f(AM|PM)$/
);
testMessage(
"dt-month-year",
@ -58,17 +58,17 @@ dt-style = Style formatting: { DATETIME($dateArg, dateStyle: "short", timeStyle:
testMessage(
"dt-bad",
FIREFOX_RELEASE_TIMESTAMP,
/^This is a bad month: Sep \d+, 2002, \d+:\d+:\d+ (AM|PM)$/
/^This is a bad month: Sep \d+, 2002, \d+:\d+:\d+\u202f(AM|PM)$/
);
testMessage(
"dt-unknown",
FIREFOX_RELEASE_TIMESTAMP,
/^Unknown: Sep \d+, 2002, \d+:\d+:\d+ (AM|PM)$/
/^Unknown: Sep \d+, 2002, \d+:\d+:\d+\u202f(AM|PM)$/
);
testMessage(
"dt-style",
FIREFOX_RELEASE_TIMESTAMP,
/^Style formatting: \d+\/\d+\/\d+, \d+:\d+ (AM|PM)$/
/^Style formatting: \d+\/\d+\/\d+, \d+:\d+\u202f(AM|PM)$/
);
// TODO - Bug 1707728

14
intl/locale/tests/gtest/TestAppDateTimeFormat.cpp
View file

@ -33,6 +33,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"January") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"12:00:00 AM") != kNotFound ||
formattedTime.Find(u"12:00:00\u202FAM") != kNotFound ||
formattedTime.Find(u"00:00:00") != kNotFound);
prExplodedTime = {0, 0, 19, 0, 1, 0, 1970, 4, 0, {(19 * 60), 0}};
@ -43,6 +44,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"January") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"12:19:00 AM") != kNotFound ||
formattedTime.Find(u"12:19:00\u202FAM") != kNotFound ||
formattedTime.Find(u"00:19:00") != kNotFound);
prExplodedTime = {0, 0, 0, 7, 1,
@ -52,6 +54,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"January") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"7:00:00 AM") != kNotFound ||
formattedTime.Find(u"7:00:00\u202FAM") != kNotFound ||
formattedTime.Find(u"07:00:00") != kNotFound);
prExplodedTime = {
@ -62,6 +65,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"January") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"11:29:00 AM") != kNotFound ||
formattedTime.Find(u"11:29:00\u202FAM") != kNotFound ||
formattedTime.Find(u"11:29:00") != kNotFound);
prExplodedTime = {0, 0, 37, 23, 31, 11, 1969, 3, 364, {-(23 * 60), 0}};
@ -71,6 +75,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"31") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1969") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"11:37:00 PM") != kNotFound ||
formattedTime.Find(u"11:37:00\u202FPM") != kNotFound ||
formattedTime.Find(u"23:37:00") != kNotFound);
prExplodedTime = {0, 0, 0, 17, 31, 11, 1969, 3, 364, {-(7 * 60 * 60), 0}};
@ -80,6 +85,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"31") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1969") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"5:00:00 PM") != kNotFound ||
formattedTime.Find(u"5:00:00\u202FPM") != kNotFound ||
formattedTime.Find(u"17:00:00") != kNotFound);
prExplodedTime = {
@ -91,6 +97,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTime)
ASSERT_TRUE(formattedTime.Find(u"31") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1969") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"2:47:00 PM") != kNotFound ||
formattedTime.Find(u"2:47:00\u202FPM") != kNotFound ||
formattedTime.Find(u"14:47:00") != kNotFound);
}
@ -163,6 +170,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Januar") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"12:00:00 AM") != kNotFound ||
formattedTime.Find(u"12:00:00\u202FAM") != kNotFound ||
formattedTime.Find(u"00:00:00") != kNotFound);
prExplodedTime = {0, 0, 19, 0, 1, 0, 1970, 4, 0, {(19 * 60), 0}};
@ -172,6 +180,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Januar") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"12:19:00 AM") != kNotFound ||
formattedTime.Find(u"12:19:00\u202FAM") != kNotFound ||
formattedTime.Find(u"00:19:00") != kNotFound);
prExplodedTime = {0, 0, 0, 7, 1,
@ -182,6 +191,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Januar") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"7:00:00 AM") != kNotFound ||
formattedTime.Find(u"7:00:00\u202FAM") != kNotFound ||
formattedTime.Find(u"07:00:00") != kNotFound);
prExplodedTime = {
@ -193,6 +203,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Januar") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1970") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"11:29:00 AM") != kNotFound ||
formattedTime.Find(u"11:29:00\u202FAM") != kNotFound ||
formattedTime.Find(u"11:29:00") != kNotFound);
prExplodedTime = {0, 0, 37, 23, 31, 11, 1969, 3, 364, {-(23 * 60), 0}};
@ -202,6 +213,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Dezember") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1969") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"11:37:00 PM") != kNotFound ||
formattedTime.Find(u"11:37:00\u202FPM") != kNotFound ||
formattedTime.Find(u"23:37:00") != kNotFound);
prExplodedTime = {0, 0, 0, 17, 31, 11, 1969, 3, 364, {-(7 * 60 * 60), 0}};
@ -211,6 +223,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Dezember") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1969") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"5:00:00 PM") != kNotFound ||
formattedTime.Find(u"5:00:00\u202FPM") != kNotFound ||
formattedTime.Find(u"17:00:00") != kNotFound);
prExplodedTime = {
@ -222,6 +235,7 @@ TEST(AppDateTimeFormat, FormatPRExplodedTimeForeign)
ASSERT_TRUE(formattedTime.Find(u"Dezember") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"1969") != kNotFound);
ASSERT_TRUE(formattedTime.Find(u"2:47:00 PM") != kNotFound ||
formattedTime.Find(u"2:47:00\u202FPM") != kNotFound ||
formattedTime.Find(u"14:47:00") != kNotFound);
}