summaryrefslogtreecommitdiffstats
path: root/chrome/common/time_format_unittest.cc
diff options
context:
space:
mode:
authormunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 20:52:08 +0000
committermunjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-16 20:52:08 +0000
commit32a63d995d4cf1988fe8eb9ed84555d62ef9a40d (patch)
treeb17a8ba975363905b812dd8082354042c55de39b /chrome/common/time_format_unittest.cc
parent4b7f783f138f5ec55da9083bf31aa7d813be68e5 (diff)
downloadchromium_src-32a63d995d4cf1988fe8eb9ed84555d62ef9a40d.zip
chromium_src-32a63d995d4cf1988fe8eb9ed84555d62ef9a40d.tar.gz
chromium_src-32a63d995d4cf1988fe8eb9ed84555d62ef9a40d.tar.bz2
Augment time_format.h/.cc to format elapsed time also.
Review URL: http://codereview.chromium.org/67186 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13874 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/time_format_unittest.cc')
-rw-r--r--chrome/common/time_format_unittest.cc37
1 files changed, 18 insertions, 19 deletions
diff --git a/chrome/common/time_format_unittest.cc b/chrome/common/time_format_unittest.cc
index 56f38f3..c910209 100644
--- a/chrome/common/time_format_unittest.cc
+++ b/chrome/common/time_format_unittest.cc
@@ -32,16 +32,17 @@ TEST(TimeFormat, RelativeDate) {
}
namespace {
-void TestRemainingTime(const TimeDelta delta,
- const std::wstring& expected_short,
- const std::wstring& expected_long) {
- EXPECT_EQ(expected_short, TimeFormat::TimeRemainingShort(delta));
- EXPECT_EQ(expected_long, TimeFormat::TimeRemaining(delta));
+void TestTimeFormats(const TimeDelta delta, const std::wstring& expected) {
+ std::wstring expected_left = expected + L" left";
+ std::wstring expected_ago = expected + L" ago";
+ EXPECT_EQ(expected, TimeFormat::TimeRemainingShort(delta));
+ EXPECT_EQ(expected_left, TimeFormat::TimeRemaining(delta));
+ EXPECT_EQ(expected_ago, TimeFormat::TimeElapsed(delta));
}
} // namespace
-TEST(TimeFormat, RemainingTime) {
+TEST(TimeFormat, FormatTime) {
const TimeDelta one_day = TimeDelta::FromDays(1);
const TimeDelta three_days = TimeDelta::FromDays(3);
const TimeDelta one_hour = TimeDelta::FromHours(1);
@@ -54,17 +55,15 @@ TEST(TimeFormat, RemainingTime) {
// TODO(jungshik) : These test only pass when the OS locale is 'en'.
// We need to add SetUp() and TearDown() to set the locale to 'en'.
- TestRemainingTime(twohundred_millisecs, L"0 secs", L"0 secs left");
- TestRemainingTime(one_sec - twohundred_millisecs, L"0 secs", L"0 secs left");
- TestRemainingTime(one_sec + twohundred_millisecs, L"1 sec", L"1 sec left");
- TestRemainingTime(five_secs + twohundred_millisecs, L"5 secs",
- L"5 secs left");
- TestRemainingTime(one_min + five_secs, L"1 min", L"1 min left");
- TestRemainingTime(three_mins + twohundred_millisecs,
- L"3 mins", L"3 mins left");
- TestRemainingTime(one_hour + five_secs, L"1 hour", L"1 hour left");
- TestRemainingTime(four_hours + five_secs, L"4 hours", L"4 hours left");
- TestRemainingTime(one_day + five_secs, L"1 day", L"1 day left");
- TestRemainingTime(three_days, L"3 days", L"3 days left");
- TestRemainingTime(three_days + four_hours, L"3 days", L"3 days left");
+ TestTimeFormats(twohundred_millisecs, L"0 secs");
+ TestTimeFormats(one_sec - twohundred_millisecs, L"0 secs");
+ TestTimeFormats(one_sec + twohundred_millisecs, L"1 sec");
+ TestTimeFormats(five_secs + twohundred_millisecs, L"5 secs");
+ TestTimeFormats(one_min + five_secs, L"1 min");
+ TestTimeFormats(three_mins + twohundred_millisecs, L"3 mins");
+ TestTimeFormats(one_hour + five_secs, L"1 hour");
+ TestTimeFormats(four_hours + five_secs, L"4 hours");
+ TestTimeFormats(one_day + five_secs, L"1 day");
+ TestTimeFormats(three_days, L"3 days");
+ TestTimeFormats(three_days + four_hours, L"3 days");
}