base/i18n/time_formatting_unittest.cc - Issue 952893003: Update from https://crrev.com/317530

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: base/i18n/time_formatting_unittest.cc

Issue 952893003: Update from https://crrev.com/317530 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fix gn for nacl Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: base/i18n/time_formatting_unittest.cc

diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc

index 4739b62a740a7e91c0d74601babb3cd9b335dad5..df0c1ed5ea1ec121b7e7d77b1cfbf1e89e36f088 100644

--- a/base/i18n/time_formatting_unittest.cc

+++ b/base/i18n/time_formatting_unittest.cc

@@ -158,11 +158,11 @@ TEST(TimeFormattingTest, TimeFormatDateGB) {

EXPECT_EQ(ASCIIToUTF16("30 Apr 2011"), TimeFormatShortDate(time));

EXPECT_EQ(ASCIIToUTF16("30/04/2011"), TimeFormatShortDateNumeric(time));

- EXPECT_EQ(ASCIIToUTF16("30/04/2011 15:42:07"),

+ EXPECT_EQ(ASCIIToUTF16("30/04/2011, 15:42:07"),

TimeFormatShortDateAndTime(time));

- EXPECT_EQ(ASCIIToUTF16("30/04/2011 15:42:07 ") + GetShortTimeZone(),

+ EXPECT_EQ(ASCIIToUTF16("30/04/2011, 15:42:07 ") + GetShortTimeZone(),

TimeFormatShortDateAndTimeWithTimeZone(time));

- EXPECT_EQ(ASCIIToUTF16("Saturday, 30 April 2011 15:42:07"),

+ EXPECT_EQ(ASCIIToUTF16("Saturday, 30 April 2011 at 15:42:07"),

TimeFormatFriendlyDateAndTime(time));

EXPECT_EQ(ASCIIToUTF16("Saturday, 30 April 2011"),

TimeFormatFriendlyDate(time));

« no previous file with comments | « base/i18n/break_iterator.cc ('k') | base/ios/device_util.mm » ('j') | no next file with comments »